Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 20:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
66176 commits 71 branches 56 tags 1.2 GiB
Commit graph

66176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
18aa95e0bb New Checkout flow for updating specific Editions 2018-03-19 13:35:27 -07:00
Zach Fox
daa68768b9 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-19 12:18:10 -07:00
Cristian Luis Duarte
17fddd9e0e RenderableWebEntityItem root item check moved to hasWebSurface and buildWebSurface 2018-03-19 15:33:14 -03:00
John Conklin II
9219868406
Merge pull request #12667 from jherico/fix/web_overlay_crash 
HOTFIX RC65: Fix invalid QML surface cache interaction
 2018-03-19 10:37:48 -07:00
SamGondelman
8ddf360c79 support relative paths for material images 2018-03-19 09:59:11 -07:00
Seth Alves
af42b5e93f trying to fix expandToLocalDataAbsolutePath 2018-03-19 09:42:03 -07:00
Seth Alves
a6a2d24dda Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains 2018-03-19 09:03:26 -07:00
John Conklin II
c1f087dd81
Merge pull request #12678 from zfox23/RC65.1_editHandleFix 
RC65.1: Fix ray cast checks on tablet ID lists in edit.js
 2018-03-19 08:29:26 -07:00
Seth Alves
b33f47e540 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-18 17:33:10 -07:00
David Back
3f2a49d243 fix list of tablet IDs ray cast checks in edit.js 2018-03-17 10:59:18 -07:00
Seth Alves
a4599fe7ce Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 20:07:35 -07:00
Seth Alves
a144b738e5 fix ACs 2018-03-16 22:39:43 -04:00
John Conklin II
0934a7d467
Merge pull request #12673 from huffman/fix/ie-edge-ds-settings-failure 
Fix DS settings issues on IE and Edge
 2018-03-16 17:35:56 -07:00
Sam Gondelman
b96f398274
Merge pull request #12593 from gcalero/android_joystick_rotate_move 
Android joystick rotate move
 2018-03-16 17:24:15 -07:00
SamGondelman
06c0b3afd3 disable IK on android, input recorder doesn't do anything if off 2018-03-16 16:52:12 -07:00
SamGondelman
444534f4ff model behaves correctly if missing material 
(cherry picked from commit 1e89debc4e)
 2018-03-16 15:51:37 -07:00
Ryan Huffman
fdca6e0832 Update direct _requestHeaders access to be consistent with other reads 2018-03-16 15:28:27 -07:00
John Conklin II
1bf2da5119
Merge pull request #12670 from SamGondelman/modelCrash 
RC65 Hotfix: Model behaves correctly if missing material
 2018-03-16 15:00:29 -07:00
Brad Davis
2f59283053 Fix initialization of QML overlay surfaces 2018-03-16 14:48:08 -07:00
Stephen Birarda
debea3791d Fix DS content backups not loading on IE 
IE does not support Object.assign
 2018-03-16 14:30:03 -07:00
Ryan Huffman
3a98cf284f Fix DS not handling lowercase header keys 2018-03-16 14:30:03 -07:00
Seth Alves
7a7a9e9af0 Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains 2018-03-16 16:55:47 -04:00
Stephen Birarda
472e7c003f
Merge pull request #11860 from huffman/feat/obj-baker-update 
OBJ Baking
 2018-03-16 13:54:07 -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
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
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
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
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
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