Commit graph

60 commits

Author SHA1 Message Date
Brad Davis
de1513a6dd Turn on KHR_no_error for the quest frame player 2019-03-06 13:22:48 -08:00
amerhifi
8802eeadf6
Make CI android build signed, don't fail on quest build fails (#18)
merging build changes
2019-03-01 12:46:50 -08:00
amer cerkic
faedc61c37 removing quest-demo specific changes 2019-02-28 10:54:30 -08:00
amer cerkic
95628dfc11 removing unused imports 2019-02-27 15:36:49 -08:00
amer cerkic
a425becc8a clean up of debugging 2019-02-27 15:35:33 -08:00
amer cerkic
29ec5486f6 manual pushing args to the app. Removed some debugging printouts 2019-02-27 15:31:23 -08:00
amer cerkic
92cfa49bfb adding and testing command line parameter passing to application 2019-02-27 11:42:22 -08:00
Sam Gateau
f7e57ea56f
Merge pull request #14990 from jherico/quest/build
Case 20979: Build quest demo apk on Jenkins
2019-02-26 09:11:30 -08:00
Brad Davis
5831db3089 Build quest demo apk on Jenkins 2019-02-25 13:02:37 -08:00
amer cerkic
9097d9c57c working on pause -> away mode. Even doesn't seem to be firing. Also found a spot where I left commented out code from lifecycle testing. 2019-02-21 16:33:25 -08:00
amer cerkic
0d0acd8fb2 fixed typo 2019-02-19 16:09:16 -08:00
amer cerkic
bf69e6d672 fixing compile errors 2019-02-19 16:03:02 -08:00
Brad Davis
8eca2a2c9d Fix jenkins build failure 2019-02-19 13:09:18 -08:00
Brad Davis
44851bbf68 Quest frame player cleanup 2019-02-19 12:37:17 -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
Brad Davis
bfda7d73c1 Fix frame player 2019-02-15 16:39:36 -08:00
amer cerkic
272b941b17 removed an obselete variable 2019-02-14 17:14: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
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
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -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
Brad Davis
4dd853ddbc Cleanup from master 2019-02-12 15:14:50 -08:00
amerhifi
3cada9722c undoing some unfavorable changes 2019-02-11 15:01:22 -08:00
amerhifi
68b3ae989f removed unused activities. Fixed null refference pointer to activity.getApplicationContext() error on restart 2019-02-11 14:24:51 -08:00
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
d3301803d3 Support custom display / input plugin lists and small tweaks 2019-02-07 15:15:26 -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
Brad Davis
9714271a2a Migrate shutdown hack applied to QtActivity to InterfaceActivity 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
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
amer cerkic
d089bd5b8f missed variable declaration 2019-01-30 12:40:09 -08:00
amer cerkic
708da45ccc recreated changes due to CLA issue in previous pr. Adding args to intent so that app can parse as comamnd line args. 2019-01-30 11:47:06 -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
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
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