Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 10:11:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
66245 commits 75 branches 59 tags 1.2 GiB
Commit graph

66245 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update 
OBJ Baking
 2018-03-16 13:54:07 -07:00
Dante Ruiz
1dcdcffa69 hopefully the last fix 2018-03-16 13:52:08 -07:00
SamGondelman
984a48316d CR 2018-03-16 13:51:29 -07:00
SamGondelman
1e89debc4e model behaves correctly if missing material 2018-03-16 13:38:45 -07:00
Triplelexx
7101a37bf9 add inspect avatars 2018-03-16 20:27:05 +00:00
Zach Fox
a792bcc3d3 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-16 13:24:17 -07:00
Zach Fox
eb8cfcd8e9 Bugfix 2018-03-16 13:13:38 -07:00
Triplelexx
563be9ab91 tidy inspect.js 2018-03-16 20:13:02 +00:00
Cristian Luis Duarte
e29fc9b461 Android - Rotate View control increased sensitivity 2018-03-16 16:28:58 -03:00
Seth Alves
50b9716a17 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 14:45:49 -04:00
Alexia Mandeville
0d6e8f3490 Revert "Update repo script with marketplace script" 
This reverts commit 5139f3f503.
 2018-03-16 11:39:02 -07:00
Zach Fox
ad33e775f1 Fix bottom anchor for listView when banner is showing 2018-03-16 11:28:03 -07:00
Cristian Luis Duarte
e6a8b322b1 Android bottom bar - remove extra semicolon 2018-03-16 15:15:00 -03:00
Brad Davis
1dfde86680 Fix typo 2018-03-16 11:11:08 -07:00
Alexia Mandeville
921b19139d Updating indentation 2018-03-16 11:09:53 -07:00
Cristian Luis Duarte
18682d854c Android bottom bar - Put height up at the top of the Item definition it's clearer where relocateAndResize gets its height from 2018-03-16 15:06:12 -03:00
Brad Davis
ca38b9fe34 Fix invalid QML surface cache interaction 2018-03-16 10:53:59 -07:00
Seth Alves
98e9f1168a allow href to be set to a serverless domain 2018-03-16 10:50:03 -07:00
John Conklin II
652ca98ebf
Merge pull request #12655 from hyperlogic/bug-fix/hand-ik-glitch 
Fix for hand IK jitter
 2018-03-16 10:43:16 -07:00
Brad Hefta-Gaub
634e642db3
Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam 
Overlays visible in 2nd cam
 2018-03-16 10:07:26 -07:00
Seth Alves
4f72503d2d put default home back to sandbox 2018-03-16 09:39:42 -07:00
Seth Alves
e3022da787 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 09:34:38 -07:00
Dante Ruiz
8cf4e653df making networktexture handled /~/ 2018-03-16 09:04:35 -07:00
Cristian Luis Duarte
79ff2df860 Android - Resize bottombar after window size changes (to always fill the screen horizontally) 2018-03-16 13:03:50 -03:00
Cristian Luis Duarte
ee6c65c1ac Android - Prevent crash when setting the url property to _webSurface. 2018-03-16 12:03:26 -03:00
John Conklin II
7789697243
Merge pull request #12658 from Atlante45/new-master 
Stable merge back into master
 2018-03-15 21:51:32 -07:00
Alexia Mandeville
74c654690f Updating image path in script for HMD 2018-03-15 16:55:41 -07:00
Alexia Mandeville
700d828b67 Updating away image and image path in away script 2018-03-15 16:46:21 -07:00
Dante Ruiz
05134dc0b9 adding content to resources 2018-03-15 16:29:14 -07:00
Stephen Birarda
283eccd043 remove unneeded ANDROID block, revert removed line in NSIS 2018-03-15 16:21:49 -07:00
SamGondelman
0fa73c73ce stats 2018-03-15 16:05:46 -07:00
Zach Fox
eb2f8aa169 New notification flow for item updates 2018-03-15 16:03:49 -07:00
Atlante45
d96f7553d9 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2018-03-15 15:22:43 -07:00
Ryan Huffman
d140ccb790 Fix constexpr compile error on Windows 2018-03-15 14:52:15 -07:00
John Conklin II
0d343ee827
Merge pull request #12522 from highfidelity/RC65 
Beta Release 65 - includes up to Developer Release 7911
 2018-03-15 14:30:55 -07:00
Stephen Birarda
f8df90e36d disable the sixense plugin by default 2018-03-15 13:53:10 -07:00
Cristian Luis Duarte
03cbadece5 Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move 2018-03-15 17:11:40 -03:00
Cristian Luis Duarte
f8f5655561 Android view control sensitivity increased. Constant replaced for a private value member. 2018-03-15 17:10:14 -03:00
Anthony J. Thibault
f6c4f6b9c4 Fix for arm IK jitter 
When in HMD mode, holding your hand controller in front of your face, would often result in a 1-2 mm pop in wrist position.
This was due to a problem in the IK elbow constraint.
When the swing rotation out of the elbow's reference frame was close to but not exactly identity it would not be properly constrainted.
But when the magnitude of that swing became big enough the constraint would engage.
This small change in swing rotation was noticable as a 1-2 mm movement in the wrist.
 2018-03-15 13:06:27 -07:00
Ryan Huffman
03c8c14f61 Fix content replacement being allowed from all URLs 2018-03-15 12:49:22 -07:00
Ryan Huffman
9275fe1f7d Update backup downloads to use .content.zip extension 2018-03-15 12:47:51 -07:00
Atlante45
bbe98f61a6 Pull GUID storage in Registry for now. 2018-03-15 12:20:19 -07:00
Stephen Birarda
499defe77e grab VS2013 redistributables that are needed by externals 2018-03-15 12:20:07 -07:00
Ryan Huffman
6552aeac4d Fix quazip not building with correct build type 2018-03-15 12:17:35 -07:00
Ryan Huffman
bee8899c46 Add support for uploading .content.zip files 2018-03-15 12:17:21 -07:00
vladest
3e00243c37 Merge branch 'master' into bubblu_button_blink_fix 2018-03-15 19:45:33 +01:00
vladest
c385bf26e9 Do not use timer for switching bubble button active state 2018-03-15 19:43:00 +01:00
Seth Alves
a64f0d2779 if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done. 2018-03-15 11:39:05 -07:00
Seth Alves
8a0b8aa034 make tablet invisible in secondary-camera if wallet passphrase page is up 2018-03-15 11:01:13 -07:00
Seth Alves
a5b94f22fa works now 2018-03-15 10:31:55 -07:00