Commit graph

376 commits

Author SHA1 Message Date
amerhifi
e6366eaf02 consolidated the OculusAcitivity into OCulusMobilieAcitivity to reduce amount of back and forth between super and base as well as remove reduntant calls to native. Moved setcontentView on the native callback becuase it was blocking QtActivity from finishing its initialization 2019-02-11 09:46:06 -08:00
amerhifi
e8a35c63c7 moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread. 2019-02-08 13:45:53 -08:00
amerhifi
8848d0210a stuff 2019-02-08 00:27:25 -08:00
amerhifi
dade8e9e7a moving all the qtactivity code to OculusActivity due to lost reference when switching from MAin to Quest 2019-02-07 23:22:15 -08:00
Brad Davis
3331a8ad43 Removing signing configs for frame player apps 2019-02-06 13:00:49 -08:00
Brad Davis
19be752361 Merge remote-tracking branch 'origin/feature/quest_frame_player' into feature/quest 2019-02-06 10:29:07 -08:00
amer cerkic
7a4401276c moving qt shutdown and resetting qtactivity to onstop 2019-02-01 11:38:34 -08:00
Brad Davis
9714271a2a Migrate shutdown hack applied to QtActivity to InterfaceActivity 2019-01-30 16:23:22 -08:00
Brad Davis
3866c7568c Update dockerfile 2019-01-30 16:23:22 -08:00
Brad Davis
eb0566b94e Fix signing configs 2019-01-30 16:23:22 -08:00
Brad Davis
67cf08e8ae Quest frame player 2019-01-30 16:23:22 -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
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
2446080a23 Removing dead code 2019-01-30 13:15:22 -08:00
Brad Davis
f146c9fe77 Quest frame player work 2019-01-30 10:17:57 -08:00
Brad Davis
0d34030135 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-01-29 14:13:11 -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
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
Brad Davis
ee79ee8ed9 Fix errors and intermittent failures in Android gradle builds in container 2019-01-29 09:26:55 -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
Gabriel Calero
3a3bd5922a Bugfix: fragment title remains as Avatar after closing it 2019-01-25 16:01:21 -03:00
Gabriel Calero
4a345a5559 Change default avatar name to Wooden Mannequin 2019-01-24 18:53:15 -03:00
Gabriel Calero
68feea23cb Add the wooden mannequin as an eligible avatar 2019-01-24 16:21:38 -03:00
Brad Davis
e18e3fc138 Gpu Frame serialization 2019-01-23 13:21:34 -08:00
Gabriel Calero
618b27c952 Add missing json 2019-01-22 18:04:54 -03:00
Gabriel Calero
455d27aeb3 Fix merge 2019-01-22 16:18:00 -03:00
Gabriel Calero
f67d98f296 Merge remote-tracking branch 'upstream/master' into display_name_and_avatar 2019-01-22 14:17:52 -03:00
Gabriel Calero
6c431996c7 Allow to set a display name and choose an avatar 2019-01-22 12:21:06 -03:00
NissimHadar
4edd072b3b Removed whitespace 2019-01-21 16:49:54 -08:00
NissimHadar
084d55a414 Gabriel Calero's fix. 2019-01-21 13:26:44 -08:00
NissimHadar
a693e0b6f9 Gabriel Calero's fix. 2019-01-21 13:08:37 -08:00
NissimHadar
fb09856c11 Gabriel Calero's fix. 2019-01-21 12:56:13 -08:00
Brad Davis
a3e9ad9bc2 Revert target SDK to 26 due to splash screen bug: https://tinyurl.com/yb9ll4cd 2019-01-18 10:30:02 -08:00
Brad Davis
f552f8d78a Working on fixing build problems 2019-01-17 15:48:30 -08:00
Brad Davis
1879cd3b3c Fixing repository order 2019-01-17 11:11:07 -08:00
Brad Davis
0bd6f9e26b Fix JNI signature 2019-01-16 12:03:56 -08:00
Brad Davis
61ea0de742 Update build files based on move 2019-01-15 15:16:14 -08:00
Brad Davis
b11afa48f8 Move files to new location 2019-01-15 15:16:14 -08:00
Brad Davis
2355499ae1 Fix version code for android APKs 2018-12-27 18:47:14 -08:00
Brad Davis
5cc00be801 Switch to shell script for docker encapsulation, forward env variables 2018-12-10 13:17:06 -08:00
Brad Davis
8504619067 Dockerized build, updated build script, ndk18 2018-12-10 11:33:41 -08:00
Brad Davis
79d89d823e Fixes for building with Android NDK 18 2018-12-10 11:32:14 -08:00
Brad Davis
ef8b605e69 Add gradle wrapper to remove dependency on installed gradle 2018-12-10 11:32:14 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
Gabriel Calero
e9fe0c85f2 Fix merge 2018-11-13 11:03:46 -03:00
Gabriel Calero
3d4893aba2 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-11-13 10:43:36 -03:00