amer cerkic
7a4401276c
moving qt shutdown and resetting qtactivity to onstop
2019-02-01 11:38:34 -08:00
Brad Davis
c46d73128b
Merge branch 'feature/quest_frame_player' into feature/quest
2019-01-30 16:16:51 -08:00
Brad Davis
04b164fd24
Migrate shutdown hack applied to QtActivity to InterfaceActivity
2019-01-30 15:33:47 -08:00
Bradley Austin Davis
f45166f508
Fix mac frame player
2019-01-30 14:45:31 -08:00
Bradley Austin Davis
c2dca9d0e8
Fix entities cmakelists.txt
2019-01-30 14:45:06 -08:00
Brad Davis
c34106e771
Update dockerfile
2019-01-30 13:27:52 -08:00
Brad Davis
07d6e0a116
Fix signing configs
2019-01-30 13:21:38 -08:00
Brad Davis
6cea0d9012
Quest frame player
2019-01-30 13:15:23 -08:00
Brad Davis
f490a6c231
GPU tweaks
2019-01-30 13:15:23 -08:00
Brad Davis
1dfdf220c0
GL helpers cleanup
2019-01-30 13:15:23 -08:00
Brad Davis
85d2ae567d
Expose current android app name to source code
2019-01-30 13:15:23 -08:00
Brad Davis
1526387933
EGL and Oculus depedency macros
2019-01-30 13:15:23 -08:00
Brad Davis
20eec33b8b
CMake cleanup and modernization
2019-01-30 13:15:23 -08:00
Brad Davis
a310eec41e
Support relative paths in serialized frames
2019-01-30 13:15:23 -08:00
Brad Davis
b8d8079590
Enable transforming a frame to use only relative paths
2019-01-30 13:15:23 -08:00
Brad Davis
2f92e10142
Support using prefering mobile compressed textures on desktop
2019-01-30 13:15:22 -08:00
Brad Davis
ab9a4a55f8
Allow movement in frameplayer app
2019-01-30 13:15:22 -08:00
Brad Davis
2446080a23
Removing dead code
2019-01-30 13:15:22 -08:00
Brad Davis
10a7403d44
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-30 10:19:46 -08:00
Brad Davis
f146c9fe77
Quest frame player work
2019-01-30 10:17:57 -08:00
Ryan Huffman
9c8e21ec6b
Merge pull request #14806 from thoys/fix/create/mismatchingEntityHostTypeChildren
...
MS20893 [CreateApp] Ignore children of mismatching entityHostTypes
2019-01-30 09:55:39 -08:00
Jeff Clinton
3b84580e88
Merge pull request #14794 from SamGondelman/colors
...
Case 20888: Fix color space
2019-01-30 09:09:07 -08:00
Sam Gateau
d418fa282a
Merge pull request #14801 from SamGondelman/transparent
...
Case 20867: Fix translucent textures not getting reset
2019-01-30 08:54:48 -08:00
Jeff Clinton
0def57f2c8
Merge pull request #14805 from danteruiz/fix-qml-rendering
...
Case 20902: Give SendAsset.qml a background color
2019-01-30 08:54:03 -08:00
Thijs Wenker
132d293c3c
skip child entities of mismatching entityHostType when copy/delete/duplication of entities
2019-01-30 03:15:32 +01:00
Dante Ruiz
ccf02d8b65
fix SendAssets.qml
2019-01-29 17:16:27 -08:00
Jamil Akram
cc38a96bff
Merge pull request #14415 from Atlante45/feat/rc-branch-script
...
RC branch script
2019-01-29 16:32:49 -08:00
Shannon Romano
4c4a2036c7
Merge pull request #14791 from SimonWalton-HiFi/pal_username_update
...
Don't update PAL namecard with empty strings
2019-01-29 15:41:31 -08:00
SamGondelman
56096708d3
one more try
2019-01-29 15:26:49 -08:00
SamGondelman
e41f5617e9
fix color space
2019-01-29 14:52: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
SamGondelman
5be6a31b6c
possible fix for transparency
2019-01-29 12:20:46 -08:00
Simon Walton
e45634d4ea
Merge remote-tracking branch 'upstream/master' into pal_username_update
2019-01-29 11:55:39 -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
Simon Walton
d2af7eed3d
Don't update PAL namecard with empty strings
2019-01-28 17:44:04 -08:00
luiscuenca
70d0ebfbec
Optimization
2019-01-28 18:39:16 -07:00