Olivier Prat
4e89e9ed2a
Fixed draw / do_draw in GLBackends
2018-11-09 09:58:17 +01:00
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
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
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
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
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
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
Zach Fox
8776028259
Prepend "root" to "currentUpdatesPage"
2018-11-06 16:10:49 -08:00
Zach Fox
f22bbff505
Fix MS19743: Fix case where user couldn't update certain items
2018-11-06 15:47:47 -08:00
SamGondelman
1444b3a186
resource mutex issues
...
(cherry picked from commit 750629a6194ec98534746a377b3ba027c1dcc20e)
(cherry picked from commit fc5ab3289a5f88f245c2825edd085532bd4c97ca)
2018-11-06 11:57:57 -08:00
Alexander Ivash
a3dfc873b7
rsolve rebase conflict
2018-11-06 14:21:14 +05:30
Alexander Ivash
4c6700b497
remove deprecations warnings
2018-11-06 14:21:14 +05:30
Alexander Ivash
9623753416
change imports (how could I miss this place?)
2018-11-06 14:21:14 +05:30
Alexander Ivash
fe4e4cfbd4
return controls-uit & styles-uit folders to preserve backward-compatibility
2018-11-06 14:21:14 +05:30
Alexander Ivash
f7d9bafc7d
add FilterBar & ScrollBar to qmldir
2018-11-06 14:21:14 +05:30
Alexander Ivash
82313f9464
update imports for utilities / all other qml files found
2018-11-06 14:21:14 +05:30
Alexander Ivash
c6764c6244
cherry-picking
2018-11-06 14:21:14 +05:30
Wayne Chen
2296848fcb
Adding potential fix for showing audio stats - depends on PR#13401
2018-11-06 14:21:14 +05:30
Alexander Ivash
d0ac5128b0
repurpose qmlscratch into 'controls gallery' launcher
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-11-06 14:21:14 +05:30
Howard Stearns
5e01314d85
Merge pull request #14319 from howard-stearns/tabless
...
Remove tabs from oculus store inventory, and rename to match
2018-11-05 18:05:02 -08:00
Howard Stearns
89656ea3f6
activity notifications also change ASSETS to INVENTORY
2018-11-05 16:43:06 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591
...
Don't attempt purchase of sold out items
2018-11-05 16:20:02 -08:00
Howard Stearns
b54b5082ee
Merge branch 'master' of github.com:highfidelity/hifi into tabless
2018-11-05 16:14:49 -08:00
Howard Stearns
a99facb793
Merge pull request #14261 from howard-stearns/oculus-store-commerce
...
Oculus store commerce
2018-11-05 16:13:04 -08:00
Howard Stearns
335947598f
Merge branch 'oculus-store-commerce' of github.com:howard-stearns/hifi into tabless
2018-11-05 15:48:52 -08:00
Zach Fox
5b042ec3df
My items to my submissions
2018-11-05 15:23:25 -08:00
John Conklin II
4d74f7a0da
Merge pull request #14338 from sabrina-shanman/hfm_geo2model
...
(case 19302) Rename HFMGeometry to HFMModel and adjust related variables
2018-11-05 15:00:06 -08:00
Zach Fox
3631e304ba
Acquisition
2018-11-05 14:58:12 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
