Brad Davis
f146c9fe77
Quest frame player work
2019-01-30 10:17:57 -08:00
Brad Davis
efff296398
Master merge cleanup
2019-01-29 14:45:05 -08:00
Brad Davis
60912b7c76
Updated controller API
2019-01-29 14:23:12 -08:00
Brad Davis
0d34030135
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-29 14:13:11 -08:00
Antonina Savinova
5d49a3f6df
Merge pull request #14732 from kencooke/audio-distattn-improvements
...
Bug fixes and improvements to audio distance attenuation
2019-01-29 14:02:29 -08:00
Shannon Romano
ce0334d10b
Merge pull request #14793 from jherico/fix/container_build_gradle_failures
...
79.0/master: Fix errors and intermittent failures in Android gradle builds in containers
2019-01-29 13:32:30 -08:00
Shannon Romano
2dbc4ff2a0
Merge pull request #14798 from jherico/fix/jenkins_toolchain_error
...
79.0/master: Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins
2019-01-29 13:32:08 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Jeff Clinton
08a3e65f66
Merge pull request #14789 from danteruiz/recenter-hmd-log-window
...
Case 20771: Make sure that the script log is in the correct location when switching to and from HMD
2019-01-29 13:03:43 -08:00
Brad Davis
8411640ab0
Fix erroneous 'CMAKE_TOOLCHAIN_FILE has changed' errors on Jenkins
2019-01-29 11:53:13 -08:00
Ken Cooke
b0f8afa772
CR: don't expose "position" when not set
2019-01-29 11:21:17 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
Jeff Clinton
654712cfad
Merge pull request #14757 from gcalero/display_name_and_avatar
...
Choose avatar and set display name
2019-01-29 10:45:11 -08:00
Jamil Akram
f4ead69549
Merge pull request #14722 from luiscuenca/multiSphereAvatar04
...
Multi-sphere avatar detailed collisions
2019-01-29 10:10:04 -08:00
Brad Davis
ee79ee8ed9
Fix errors and intermittent failures in Android gradle builds in container
2019-01-29 09:26:55 -08:00
Sam Gondelman
faeb5b36dc
Merge pull request #14764 from SamGondelman/NOverlays12
...
Case 20722: Ring Gizmo Entities to replace Circle Overlays
2019-01-28 18:09:23 -08:00
luiscuenca
70d0ebfbec
Optimization
2019-01-28 18:39:16 -07:00
luiscuenca
a6dce5dd84
Merge branch 'master' into multiSphereAvatar04
2019-01-28 17:48:22 -07:00
luiscuenca
fced9e2814
Review fixes
2019-01-28 17:43:51 -07:00
Shannon Romano
607ce00713
Merge pull request #14766 from AndrewMeadows/grab-it
...
case 20701: fixes for grab
2019-01-28 15:57:36 -08:00
Amer Cerkic
3ab86cfafa
removed duplicated code and type redefinition
2019-01-28 15:52:36 -08:00
Brad Davis
f1d3fc36e5
Cleaning up pre-master merge
2019-01-28 15:52:36 -08:00
Brad Davis
b1e4e17f47
Santa Cruz
2019-01-28 15:52:36 -08:00
Brad Davis
1d93b6ada0
Support gpu timing on systems with disjoint timer extension
2019-01-28 15:52:21 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization
...
case 20883: GPU frame serialization and related tools
2019-01-28 15:47:55 -08:00
Wayne Chen
0cbaea4e27
callback return upon request if not running
2019-01-28 14:46:50 -08:00
Wayne Chen
28ab4096d0
optimizing ctor/dtor
2019-01-28 14:44:00 -08:00
Wayne Chen
e4c3011a0b
only init platform if oculus store is running
2019-01-28 14:37:18 -08:00
Wayne Chen
0f1aebea82
adding init/shutdown for plugin init
2019-01-28 14:35:41 -08:00
Wayne Chen
c06f2f337e
adding code for if oculus is running
2019-01-28 14:20:03 -08:00
Shannon Romano
1aa6221f57
Merge pull request #14779 from thoys/fix/create/AddMissingMaterialTooltips
...
MS20333: [CreateApp] add missing Material Entity tooltips
2019-01-28 14:18:46 -08:00
luiscuenca
1b75f569b3
fix jsdoc
2019-01-28 15:02:10 -07:00
Dante Ruiz
20d933ce6e
recenter log window when enter and exiting hmd mode
2019-01-28 13:58:29 -08:00
Jeff Clinton
e51d23117e
Merge pull request #14767 from jherico/fix/open_mp_dep
...
Switch to nvtt with no openmp dependency (remove vcomp140.dll dependency)
2019-01-28 12:42:56 -08:00
Jeff Clinton
9b09c09aeb
Merge pull request #14770 from sabrina-shanman/hfm_prep_tangents
...
(case 20822) Add normal/tangent generation to HFM preparation step
2019-01-28 12:41:55 -08:00
Gabriel Calero
1d1ae90e8e
Merge remote-tracking branch 'upstream/master' into display_name_and_avatar
2019-01-28 17:39:59 -03:00
luiscuenca
2a1f1a4855
Remove debug logging
2019-01-28 12:55:36 -07:00
John Conklin II
c95b681092
Merge pull request #14696 from thoys/feat/create/showZonesInCreate
...
MS20292 - [CreateApp] Make it easier to see zones while you're editing them
2019-01-28 11:41:42 -08:00
Jeff Clinton
9d09c777d2
Merge pull request #14778 from thoys/fix/create/ignoreScriptedKeyEventsFromJSONEditor
...
MS20501 [CreateApp/Properties] ignore scripted key events from the JSON Editors
2019-01-28 11:40:48 -08:00
SamGondelman
13cb70a6a5
Merge remote-tracking branch 'upstream/master' into NOverlays12
2019-01-28 11:37:15 -08:00
Thijs Wenker
b75c4ae3b6
fix spelling
2019-01-28 20:26:04 +01:00
Wayne Chen
09770920a8
only initialize plugin if oculus store starting
2019-01-28 11:12:12 -08:00
luiscuenca
cc73649ef8
Merge branch 'master' into multiSphereAvatar04
2019-01-28 11:57:04 -07:00
luiscuenca
49659f0039
Fix error on exit and jointsToFilter param removed
2019-01-28 11:55:53 -07:00
Jeff Clinton
b5a1dc599b
Merge pull request #14725 from SamGondelman/NOverlays11
...
Case 20700: Add missing pulse properties to certain Entity types
2019-01-28 10:51:00 -08:00
Jeff Clinton
f9b63b975d
Merge pull request #14781 from danteruiz/script-print-log
...
Case: 20770 allow debug prints in the log by default
2019-01-28 10:49:18 -08:00
Jamil Akram
bcaad3092b
Merge pull request #14695 from amantley/trumpFix
...
Fixed Sinking Trump Avatar Bug: Stops unnecessary vertical re-centering with big-headed avatar
2019-01-28 10:12:55 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop
...
case 20705: Allow log window to stay on top
2019-01-28 10:05:48 -08:00
Jeff Clinton
a80d842107
Merge pull request #14777 from thoys/fix/create/entityListColumnSortOrder
...
MS19766: [CreateApp/Entity List] Default column order, always move empty values to bottom on initial sort of column
2019-01-28 09:25:33 -08:00
