Brad Davis
|
0ddb4ecd7c
|
Allow per-machine customization of which android projects are loaded
|
2019-02-19 12:10:26 -08:00 |
|
Bradley Austin Davis
|
b1a120cdfa
|
Merge pull request #14954 from amerhifi/feature/quest
Feature/quest
|
2019-02-19 09:44:39 -08:00 |
|
amer cerkic
|
ae796c2484
|
rerouted the intent back to interfaceActivity since its back and registered in manifest
|
2019-02-19 07:42:35 -08:00 |
|
amer cerkic
|
9a0078a216
|
fixing compile errors.
|
2019-02-19 07:32:05 -08:00 |
|
amerhifi
|
04b5877da9
|
Merge pull request #10 from highfidelity/feature/quest
Feature/quest
|
2019-02-15 17:29:30 -08:00 |
|
Brad Davis
|
bfda7d73c1
|
Fix frame player
|
2019-02-15 16:39:36 -08:00 |
|
Brad Davis
|
02a95b599d
|
fix extra shadergen args
|
2019-02-15 15:57:19 -08:00 |
|
amerhifi
|
6ea941e4a8
|
Merge pull request #8 from highfidelity/feature/quest
Feature/quest
|
2019-02-15 14:40:45 -08:00 |
|
Brad Davis
|
00ed86d1cf
|
fixing typo
|
2019-02-15 14:34:40 -08:00 |
|
Brad Davis
|
f896623404
|
Fix prebuild crash if can't find git binary (such as when running under Android Studio)
|
2019-02-15 14:30:54 -08:00 |
|
amerhifi
|
0fa0b07577
|
Merge pull request #7 from highfidelity/feature/quest
Feature/quest
|
2019-02-15 14:26:44 -08:00 |
|
Brad Davis
|
51884155ee
|
Support Android app-specific extensions in shaders
|
2019-02-15 14:16:58 -08:00 |
|
Brad Davis
|
578bc4fc89
|
Suppress logspam with missing Controller in QML
|
2019-02-15 14:15:24 -08:00 |
|
Brad Davis
|
5030bbd2cf
|
Update Oculus platform SDK
|
2019-02-15 14:12:52 -08:00 |
|
Brad Davis
|
78be935e1a
|
Consolidating differences from master
|
2019-02-15 14:12:37 -08:00 |
|
Brad Davis
|
4409e59682
|
Add per-android-app preprocessor macros
|
2019-02-15 14:11:26 -08:00 |
|
Brad Davis
|
a5f84ab51a
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 11:37:13 -08:00 |
|
John Conklin II
|
7008330641
|
Merge pull request #14921 from NissimHadar/fixMacError
Compilation error on Qt 5.12
|
2019-02-15 11:28:55 -08:00 |
|
David Back
|
158e255319
|
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
|
2019-02-15 11:25:42 -08:00 |
|
John Conklin II
|
5f0db88a20
|
Merge pull request #14914 from raveenajain/gltf_tangents
Case 21165: tangent attribute
|
2019-02-15 11:24:21 -08:00 |
|
Sam Gateau
|
5e9eeccb95
|
Merge pull request #14930 from NissimHadar/fixCMake
Case 21241: Fix CMake problem for ubuntu build of nitpick
|
2019-02-15 11:23:58 -08:00 |
|
Sam Gondelman
|
9aa99f24f0
|
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
|
2019-02-15 11:21:51 -08:00 |
|
Clément Brisset
|
3c60aaff96
|
Merge pull request #14922 from AndrewMeadows/avoid-entity-update-storm
Case 21232: avoid entity update storm from entity-server
|
2019-02-15 11:01:08 -08:00 |
|
Brad Davis
|
0b171ffe13
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 10:31:04 -08:00 |
|
David Back
|
af25a7bf6e
|
Merge pull request #14919 from dback2/selectAllClearAll
Case 19930: Entity List - add select/clear all to entity type dropdown
|
2019-02-15 10:12:30 -08:00 |
|
NissimHadar
|
b77f40d300
|
Revert due to stable build problem on Ubuntu.
|
2019-02-15 09:52:57 -08:00 |
|
Anthony Thibault
|
702f1c8e74
|
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization
Revert anim pose optimization
|
2019-02-15 09:42:27 -08:00 |
|
Simon Walton
|
748747da2d
|
Merge pull request #14864 from SimonWalton-HiFi/pal-sort-loudness-persist
Case 19724: If sorting PAL by loudness re-sort upon loudness updates
|
2019-02-15 09:24:34 -08:00 |
|
amerhifi
|
78c4679f71
|
Merge pull request #4 from highfidelity/feature/quest
Merge pull request #14924 from amerhifi/feature/quest
|
2019-02-15 08:55:11 -08:00 |
|
NissimHadar
|
8b2d9c36af
|
Adding client profile combo.
|
2019-02-15 08:39:29 -08:00 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -08:00 |
|
David Back
|
e944e284a6
|
design feedback
|
2019-02-14 17:37:58 -08:00 |
|
Shannon Romano
|
3b5b077a3e
|
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
Case 21066: restore shape caching in ShapeManager
|
2019-02-14 17:33:33 -08:00 |
|
David Back
|
f6baa2432a
|
design feedback
|
2019-02-14 17:27:05 -08:00 |
|
Sam Gateau
|
0d6bf79139
|
Merge pull request #14924 from amerhifi/feature/quest
Case 21032: Quest lifecycle start/stop fix. Partial fix to pause/resume
|
2019-02-14 17:19:19 -08:00 |
|
amer cerkic
|
272b941b17
|
removed an obselete variable
|
2019-02-14 17:14:28 -08:00 |
|
Anthony Thibault
|
a3407b96b0
|
Merge branch 'master' into bug-fix/revert-anim-pose-optimization
|
2019-02-14 16:56:17 -08:00 |
|
Sam Gateau
|
6168001ad4
|
Merge pull request #14909 from AndrewMeadows/update-collision-group-after-grab-80
Case 21159: fixes for more grab bugs
|
2019-02-14 16:52:03 -08:00 |
|
amer cerkic
|
165ec3feca
|
removing unused reference no longer reachable
|
2019-02-14 16:41:28 -08:00 |
|
amer cerkic
|
72200618d9
|
cleanup of my debugging items
|
2019-02-14 16:38:15 -08:00 |
|
amer cerkic
|
7037e14d09
|
merging from upstream
|
2019-02-14 16:31:04 -08:00 |
|
David Back
|
46ff3a8405
|
add select/clear all buttons to entity type dropdown
|
2019-02-14 16:16:33 -08:00 |
|
Anthony Thibault
|
39b4eaac34
|
Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
|
2019-02-14 16:13:00 -08:00 |
|
Anthony Thibault
|
f0e163b4df
|
Revert "AnimPose::inverse() optimization"
This reverts commit 5c7e81584c.
|
2019-02-14 16:10:26 -08:00 |
|
Ryan Huffman
|
e800a6e030
|
Update hard-coded vec3 zero with Vec3.ZERO
|
2019-02-14 15:56:17 -08:00 |
|
Simon Walton
|
75901a1e37
|
Merge pull request #14853 from SimonWalton-HiFi/installer-removes
Case 20496: Windows (NSIS) installer shouldn't remove unselected component upon reinstall
|
2019-02-14 15:41:25 -08:00 |
|
Andrew Meadows
|
b94655260d
|
don't traverse for fullUpdate on changed view
|
2019-02-14 14:54:10 -08:00 |
|
amer cerkic
|
8d522d9ce7
|
fixed issues with pause/resume and start/stop. still issues with input after resume
|
2019-02-14 14:48:56 -08:00 |
|
Shannon Romano
|
453c081d9b
|
Merge pull request #14901 from huffman/fix/dropdown-close-on-click
Case 19999: Update edit.js to auto close dropdowns when clicking outside
|
2019-02-14 14:48:03 -08:00 |
|
raveenajain
|
01def37efd
|
spacing
|
2019-02-14 14:22:43 -08:00 |
|