Brad Davis
|
578bc4fc89
|
Suppress logspam with missing Controller in QML
|
2019-02-15 14:15:24 -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 |
|
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 |
|
Brad Davis
|
0b171ffe13
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-15 10:31:04 -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 |
|
Shannon Romano
|
f267043953
|
Merge pull request #14838 from SamGondelman/billboardMode
Case 20962: Billboard mode improvements
|
2019-02-14 17:44:48 -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 |
|
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 |
|
Anthony Thibault
|
39b4eaac34
|
Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
|
2019-02-14 16:13:00 -08:00 |
|
Bradley Austin Davis
|
d45d87031d
|
Merge pull request #14782 from SamGondelman/NOverlaysFinal
Case 20723, Case 20334: Internally, replace all overlays with local entities
|
2019-02-14 13:49:47 -08:00 |
|
Brad Davis
|
292602afd7
|
Resolving more master differences
|
2019-02-14 12:55:28 -08:00 |
|
Brad Davis
|
0f4d1f073b
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-14 12:49:56 -08:00 |
|
Sam Gateau
|
969c62d0df
|
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac
Case 21157: Fix Desktop.qml crash on local mac build
|
2019-02-14 12:15:50 -08:00 |
|
Sam Gateau
|
384d4fb959
|
Merge pull request #14809 from highfidelity/commandLineAndroid
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
|
2019-02-14 12:10:08 -08:00 |
|
SamGondelman
|
13ece79476
|
merge with master
|
2019-02-13 16:30:22 -08:00 |
|
SamGondelman
|
3f8bfc5475
|
CR and fix deadlock
|
2019-02-13 16:19:39 -08:00 |
|
danteruiz
|
562e159ab4
|
the proper fix for browser qml issues
|
2019-02-13 10:45:07 -08:00 |
|
Shannon Romano
|
8a07e2b31a
|
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
|
2019-02-13 10:35:00 -08:00 |
|
Andrew Meadows
|
c79e3e5a6d
|
add some trace contexts for easier debugging
|
2019-02-13 10:02:58 -08:00 |
|
Andrew Meadows
|
152edd477c
|
change trace context to rendering
|
2019-02-13 10:00:51 -08:00 |
|
danteruiz
|
a111aa1724
|
fix blocks app
|
2019-02-12 16:45:45 -08:00 |
|
Andrew Meadows
|
8bdac589b8
|
use RingBuffer for gradual garbage collection
|
2019-02-12 15:37:09 -08:00 |
|
Brad Davis
|
4dd853ddbc
|
Cleanup from master
|
2019-02-12 15:14:50 -08:00 |
|
Shannon Romano
|
10e5e9e0c3
|
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix
Fixed MS21059: Avatar App Keyboard Raise in Desktop
|
2019-02-12 15:02:28 -08:00 |
|
Brad Davis
|
db121957d2
|
Merge remote-tracking branch 'upstream/master' into feature/quest
|
2019-02-12 15:00:03 -08:00 |
|
Andrew Meadows
|
ed8481ead9
|
fix grab bugs
|
2019-02-12 14:04:56 -08:00 |
|
Shannon Romano
|
7e643fcc19
|
Merge pull request #14893 from SimonWalton-HiFi/inventory-confirmation-message
Adjust Inventory's send-to-trash confirm message
|
2019-02-12 14:04:10 -08:00 |
|
Dante Ruiz
|
5e9b63b352
|
fix-qml-crash-on-mac
|
2019-02-12 13:56:56 -08:00 |
|
Shannon Romano
|
e8c70cc782
|
Merge pull request #14897 from danteruiz/fix-soft-entity
Case 21142: Wearer and observer disagree on whether a worn item is correctly placed
|
2019-02-12 13:56:47 -08:00 |
|
Sam Gateau
|
a10cf9b620
|
Merge pull request #14883 from amerhifi/feature/quest
case:21032 Fixing Lifecycle of the android app
|
2019-02-12 12:32:38 -08:00 |
|
danteruiz
|
fdfb9196d3
|
comments explaining horrible code
|
2019-02-12 11:45:08 -08:00 |
|
Brad Davis
|
a6f23f48d6
|
Merge branch 'feature/quest_custom_plugins' into feature/quest
|
2019-02-12 09:53:12 -08:00 |
|
Mark
|
9d81ace243
|
Fixed MS21059: Avatar App Keyboard Raise in Desktop
|
2019-02-12 09:45:51 -08:00 |
|
Simon Walton
|
73296aa986
|
Change update rate to 1 Hz
|
2019-02-11 16:59:18 -08:00 |
|
danteruiz
|
50dd865bdc
|
fix spatially nestable parent overwrite
|
2019-02-11 16:48:34 -08:00 |
|
SamGondelman
|
77a8ddb3f0
|
Merge remote-tracking branch 'upstream/master' into materialMapping
|
2019-02-11 16:35:05 -08:00 |
|
Brad Davis
|
e534270f9a
|
Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins
|
2019-02-11 15:41:32 -08:00 |
|
SamGondelman
|
96f32a9f72
|
fix keyboard focus thing
|
2019-02-11 15:17:32 -08:00 |
|
SamGondelman
|
f53ccf7363
|
fix create, working on mini tablet
|
2019-02-11 14:54:53 -08:00 |
|
David Rowe
|
5428bb19dc
|
Add "Avatar Script" JSDoc API classification
|
2019-02-12 11:49:49 +13:00 |
|
Simon Walton
|
4f2223ced3
|
Change max update to 10 Hz
|
2019-02-11 14:17:55 -08:00 |
|
Simon Walton
|
44c163b7cc
|
Tweak inventory-delete message to be more accurate
|
2019-02-11 10:30:51 -08:00 |
|
SamGondelman
|
d988de4a17
|
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
|
2019-02-11 10:27:12 -08:00 |
|
Brad Hefta-Gaub
|
a23f436a9f
|
Merge pull request #14880 from kencooke/audio-meter-improvements
Case 21091: Improved audio metering
|
2019-02-08 19:08:31 -08:00 |
|
Roxanne Skelly
|
74f8615fb7
|
Merge pull request #14876 from roxanneskelly/QmlMarketplace
Case 20653: QmlMarketplace - disable links if 3dhtml surfaces are not available
|
2019-02-08 15:04:35 -08:00 |
|
Sabrina Shanman
|
baf72eaae0
|
Merge pull request #14802 from sabrina-shanman/hfm_prep_joints
Case 20887: Move FST joint property handling to the model preparation step
|
2019-02-08 15:02:23 -08:00 |
|