441 commits

Author	SHA1	Message	Date
amer cerkic	272b941b17	removed an obselete variable	2019-02-14 17:14:28 -08:00
amer cerkic	165ec3feca	removing unused reference no longer reachable	2019-02-14 16:41: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	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	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	ef655cd243	removed junk	2019-02-11 10:38:10 -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
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
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
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
Sam Gondelman	f68706e72f	Merge pull request #14252 from gcalero/enable_aec_by_default ... Enabled AEC by default (bug 19210)	2018-11-12 16:15:33 -08:00
sabrina-shanman	753557736e	Merge branch 'master' into hfm_library	2018-11-12 15:03:30 -08:00
Gabriel Calero	0aaf92ce79	Fix UI issue: login confirmation sometimes does not appear	2018-11-12 19:51:28 -03:00
Gabriel Calero	90295a06ba	Handle empty oauth redirect url	2018-11-12 16:26:01 -03:00
Gabriel Calero	4f4239f3c9	Send state parameter to oauth server to redirect to steam login	2018-11-09 16:12:18 -03:00
Gabriel Calero	7687eb9948	Revert "Test redirect to steam" ... This reverts commit 729a0b6a59.	2018-11-09 13:10:22 -03:00
Gabriel Calero	d9f68af634	Code review + minor ui fixes	2018-11-09 12:49:02 -03:00
Gabriel Calero	729a0b6a59	Test redirect to steam	2018-11-09 11:00:40 -03:00
Gabriel Calero	c1174ad1ef	Set dimensions for android devices thinner than 385dp	2018-11-08 20:04:59 -03:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Gabriel Calero	79a71d26b3	Fix webview in android	2018-11-08 15:33:49 -03:00
Gabriel Calero	1d059d9650	Fix NullPointerException and bug in login menu navigation	2018-11-08 14:51:42 -03:00
Gabriel Calero	ccd0d8299f	Change oauth parameter to env variables	2018-11-07 19:56:41 -03:00
sabrina-shanman	906fc1a425	Fix Android build not linking hfm library	2018-11-06 16:38:36 -08:00
Gabriel Calero	611881e002	Mute when entering a domain	2018-11-05 18:35:57 -03:00
Gabriel Calero	9ed4374470	Move oauth client id & token from env vars to gradle properties	2018-11-05 17:17:27 -03:00
Gabriel Calero	db45aced6e	Mute when entering a domain	2018-11-05 16:53:03 -03:00
Gabriel Calero	58c135a74d	Merge remote-tracking branch 'upstream/master' into enable_aec_by_default	2018-11-05 11:25:09 -03:00
Gabriel Calero	6a3ccbbe02	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-11-02 17:08:55 -03:00
Gabriel Calero	160e633af5	Implement login through oauth for steam login button	2018-11-02 17:08:19 -03:00
Gabriel Calero	a1221ebd69	Add Keep me logged in option	2018-10-26 17:17:03 -03:00
Gabriel Calero	3d677d8e5a	Allow cancelling ongoing signup or login	2018-10-26 13:04:34 -03:00
Gabriel Calero	11d82e0ad0	New login + signup	2018-10-25 19:12:51 -03:00
Brad Davis	c8e664a0a1	New SPIRV Shader toolchain	2018-10-23 10:40:12 -07:00
Gabriel Calero	5a8a5bbc55	Set AEC enabled by default	2018-10-22 18:18:16 -03:00
Gabriel Calero	a9b9f48335	Setup a higher memory limit for android build	2018-10-18 17:20:30 -03:00
Gabriel Calero	42285245d5	Fix gradle script	2018-10-06 00:43:19 -03:00
Gabriel Calero	1719f4a474	Build libplugins_libhifiCodec.so	2018-10-05 23:49:06 -03:00
Gabriel Calero	13e2b99dfa	Merge remote-tracking branch 'upstream/master' into android_signup	2018-10-02 09:24:09 -03:00
John Conklin II	dd5cd5de82	Merge pull request #14091 from gcalero/fix-case-18465 ... Fix case 18465: redirect to domain after login	2018-10-01 16:48:27 -07:00
Brad Hefta-Gaub	a3310be3fe	Merge pull request #14013 from gcalero/fix_android_login ... Fix android login infinite loading (case 18459)	2018-10-01 16:13:29 -07:00
Gabriel Calero	c0c95a1d33	Fix flickering between login and signup screens	2018-09-28 13:53:18 -03:00
Gabriel Calero	0d40d78343	Expand clic area for forget password	2018-09-28 12:04:05 -03:00
Gabriel Calero	5fc24b2587	UI fixes in login and signup for S8 and S9 aspect ratio	2018-09-27 19:20:38 -03:00
Gabriel Calero	fba3b48923	Merge remote-tracking branch 'upstream/master' into android_signup	2018-09-27 11:38:52 -03:00