Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-17 02:40:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73755 commits 25 branches 0 tags 1.1 GiB
Commit graph

73755 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Prat
be7806644a Removed ternary operators with mix (try to limit branching) 2018-11-08 17:29:00 +01:00
Olivier Prat
87e6bffc46 Added sampler2Darray precision for GLES 2018-11-08 14:28:00 +01:00
Olivier Prat
d64127aa9c Android shader compilation fix 2018-11-08 13:48:19 +01:00
Olivier Prat
829e5ff44f Same android problem fix, but elsewhere 2018-11-08 13:37:22 +01:00
Olivier Prat
09b26db650 Shader fix for android... <sigh> 2018-11-08 13:19:42 +01:00
Olivier Prat
40b7b42f5b Bis 2018-11-08 12:29:01 +01:00
Olivier Prat
cd89ce5388 Another stupid android shader compilation error fix 2018-11-08 12:07:17 +01:00
Olivier Prat
de2f1c52cc Another android shader compilation fix 2018-11-08 11:44:47 +01:00
Olivier Prat
05ac2fccb6 Still android fixes 2018-11-08 11:24:46 +01:00
Olivier Prat
851cfff960 Again, android shader compilatio fix 2018-11-08 11:06:28 +01:00
Olivier Prat
c79c403a52 More android shader compilation fixes 2018-11-08 10:47:24 +01:00
Olivier Prat
7e93d91bfa Fixed android shader compilation 2018-11-08 09:29:02 +01:00
Olivier Prat
9d5dcec0a0 Merge from master 2018-11-08 09:14:42 +01:00
David Rowe
371919b923 Fix mini tablet always displaying if start up in HMD mode 2018-11-08 17:47:02 +13:00
David Rowe
e5fe2622ae Merge branch 'master' into M19768 2018-11-08 17:13:02 +13:00
Clement
ef54a63de6 Use uint8_t instead of bool on the wire 2018-11-07 17:54:49 -08:00
Clement
8f763dfd50 Fix bug and crash in solo logic 2018-11-07 17:46:18 -08:00
Sam Gateau
4489efa58b
Merge pull request #14346 from AndrewMeadows/fix-crash-19654 
Case 19654: fix crash in btCollisionWorld::updateSingleAabb()
 2018-11-07 16:09:36 -08:00
David Back
0597d15771 tabs 2018-11-07 16:06:18 -08:00
David Back
708f6a9402 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns 2018-11-07 16:02:33 -08:00
David Back
f0c2ec1fa4 entity list data-driven resizable addable/removable columns 2018-11-07 16:02:15 -08:00
Shannon Romano
7e96ceb222
Merge pull request #14254 from samcake/black-bis 
Case 19140: Clean up Luci ui to aggregate more tools
 2018-11-07 15:10:48 -08:00
Zach Fox
cee1454f6e CR feedback - thanks Ken! 2018-11-07 15:09:53 -08:00
SamGondelman
d316fe15ce fix tablet culling 2018-11-07 15:02:32 -08:00
Zach Fox
48d3450c5a Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech 2018-11-07 14:59:23 -08:00
Zach Fox
3cbaec818d
Merge pull request #14360 from zfox23/MS19743_updateCheckoutBug 
Fix MS19743: Fix case where user couldn't update certain items
 2018-11-07 14:57:35 -08:00
Gabriel Calero
ccd0d8299f Change oauth parameter to env variables 2018-11-07 19:56:41 -03:00
Jeff Clinton
e507e91bfd
Merge pull request #14227 from ElderOrb/FB19396 
FB19396 - QML warning qrc:///qml/hifi/tablet/WindowRoot.qml:132: Type…
 2018-11-07 13:36:41 -08:00
sam gateau
c40ded598d REmoving any attempt to fix anything in this pr 2018-11-07 12:18:52 -08:00
sam gateau
9ada9a7ad3 Merge branch 'master' of github.com:highfidelity/hifi into black-bis 2018-11-07 12:07:15 -08:00
sabrina-shanman
4d9c20343a Link shared library in hfm 2018-11-07 11:44:58 -08:00
Clement
65a83cb026 Resend solo nodes on mixer reconnect 2018-11-07 11:41:04 -08:00
Jeff Clinton
63bf077776
Merge pull request #14263 from ElderOrb/better_imports_for_controls_and_styles 
Better imports for controls and styles
 2018-11-07 11:19:55 -08:00
Sam Gateau
e6cd9a4ffa
Merge pull request #14301 from NissimHadar/fixPath 
case 19636 - Make path to VCPKG relative  to ENV variable
 2018-11-07 10:58:56 -08:00
Sam Gateau
e28560a9c7
Merge pull request #14311 from SamGondelman/interstitial 
Case 19682: Disable interstitial on android
 2018-11-07 10:47:31 -08:00
Sam Gateau
d15c8a8854
Merge pull request #14313 from SamGondelman/macFix 
Case 19686: Possibly fix mac debug deferred issue
 2018-11-07 10:33:41 -08:00
Sam Gateau
8cda3f729b
Merge pull request #14316 from AndrewMeadows/workload-views-include-MyAvatar 
Case 19394: always keep entities near MyAvatar in physics simulation
 2018-11-07 10:26:47 -08:00
Sam Gateau
5d0be31fe7
Merge pull request #14354 from SamGondelman/deadlock 
Case 19735: Fix ResourceCache mutex issues
 2018-11-07 09:55:41 -08:00
sabrina-shanman
2c94d1f620 Fix hfm not linking in script-engine for Android build 2018-11-07 09:24:42 -08:00
David Rowe
28097933ed Add setting to enable/disable the mini tablet 2018-11-07 14:39:06 +13:00
Simon Walton
f88168bdfb Send avatar-joint translations at world scale 2018-11-06 17:29:02 -08:00
sabrina-shanman
8b37133875 Remove unnecessary draco dependency from hfm library 2018-11-06 17:10:44 -08:00
sabrina-shanman
906fc1a425 Fix Android build not linking hfm library 2018-11-06 16:38:36 -08:00
SamGondelman
887c4f108f high detail not low 2018-11-06 16:34:16 -08:00
Roxanne Skelly
cef7000a72 Case 19754 - Remove logging URLs and related file locations. 
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
 2018-11-06 16:24:32 -08:00
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage" 2018-11-06 16:10:49 -08:00
SamGondelman
e20aeb28eb force low detail on oculus first run 2018-11-06 15:58:35 -08:00
Zach Fox
f22bbff505 Fix MS19743: Fix case where user couldn't update certain items 2018-11-06 15:47:47 -08:00
Zach Fox
e80468e423 Remove URL logging from JS and QML 2018-11-06 15:09:24 -08:00
sabrina-shanman
e654ff9bbc Remove forward declaration in HFM.h so ModelPackager and other things can use it instead 2018-11-06 14:53:23 -08:00