2027 commits

Author	SHA1	Message	Date
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
Gabriel Calero	476e1cf7ae	Adjust UI with pixel perfect precision. Support devices with on-screen bars.	2018-04-12 17:59:38 -03:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
John Conklin II	213c35dab4	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage ... Bugfix for #12759 Overlays.editOverlay not applying subImage property	2018-04-12 10:34:17 -07:00
Gabriel Calero	865e3a05f1	Move jump button to the right. Adjust position of buttons	2018-04-11 19:33:43 -03:00
Gabriel Calero	8010fd2420	New view selector behaviour. Update icons	2018-04-11 18:43:39 -03:00
Gabriel Calero	578012b662	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-11 16:30:53 -03:00
Zach Fox	0c9d65bc15	Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError ... Commerce: Fix Certificate Info error	2018-04-11 09:38:43 -07:00
Clément Brisset	c62a701a2d	Merge pull request #12838 from highfidelity/RC66 ... RC66 merge back to master	2018-04-09 13:17:12 -07:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Alexander Ivash	faddc556d7	FB14015 - Go To app does not close when selecting forward and back arrows on desktop	2018-04-07 17:57:22 +03:00
Zach Fox	0c48ccefa4	Clean up failResponse to make it better	2018-04-06 11:41:17 -07:00
Zach Fox	af5a68b282	Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError	2018-04-06 10:58:32 -07:00
Gabriel Calero	15163f5e87	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 19:25:20 -03:00
WolfGang	787127b149	move subImage recalculation to it's own method	2018-04-04 22:10:54 +01:00
Howard Stearns	3a428bc44f	Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 ... Fix 'Private' HMD preview texture enable/disable...again	2018-04-04 10:03:18 -07:00
WolfGang	f9bcd23463	make subimage update the image anchors	2018-04-04 17:28:55 +01:00
Seth Alves	2df334c50e	Merge pull request #12663 from ElderOrb/FB12870 ... Fix for not updating checkbox state on 'baking' / 'unbaking'.	2018-04-04 09:03:03 -07:00
Zach Fox	f20eddefc8	Fix 'Private' HMD preview texture enable/disable...again	2018-04-03 13:46:02 -07:00
Gabriel Calero	78c50410b3	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-04-03 14:37:19 -03:00
Zach Fox	5441767442	Better cert display	2018-04-02 12:22:41 -07:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
Zach Fox	32e5e9986f	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-30 10:10:43 -07:00
Alexander Ivash	814cfa4587	fix TabletAssetServer	2018-03-30 00:09:28 +03:00
Alexander Ivash	e5da59a62f	FB12870 - Tablet UI ->Asset Browser unresponsive when enabling/disabling "use baked version"	2018-03-29 23:01:59 +03:00
Liv Erickson	387ff680d5	support deleted scenario	2018-03-28 18:12:30 -07:00
Liv Erickson	b78f00342e	Merge branch 'master' of github.com:highfidelity/hifi into feat/disable-add-without-url	2018-03-28 17:53:42 -07:00
vladest	70ce1b2bf7	Fix invalid scrolling detection	2018-03-28 21:48:44 +02:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Zach Fox	0175028a88	Ensure location is correctly updated when replacing set from Checkout page	2018-03-28 11:31:51 -07:00
vladest	001b6d23ff	Merge branch 'master' into move_to_qqc2	2018-03-28 20:16:26 +02:00
Zach Fox	ca2fba675d	Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation	2018-03-28 10:28:32 -07:00
John Conklin II	586fb4829c	Merge pull request #12637 from druiz17/fix-asset-server-qml ... Fix asset server qml sorting	2018-03-28 09:35:53 -07:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Dante Ruiz	ad9ca0da20	fix tablet version	2018-03-27 16:03:06 -07:00
John Conklin II	a258a330d3	Merge pull request #12676 from druiz17/fix-keyboard ... fixing AddressManager keyboard when switching domains	2018-03-27 15:34:23 -07:00
vladest	096b56395e	Fix crash on startup	2018-03-27 18:22:56 +02:00
Zach Fox	db2f3451bd	Support .content.zip content sets	2018-03-26 16:20:29 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
Zach Fox	a588776b47	Fix infinite loading when authing wallet during Checkout	2018-03-26 13:19:40 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
vladest	56150f8962	Merge branch 'master' into move_to_qqc2	2018-03-24 15:34:49 +01:00
vladest	aefda9ef71	Merge branch 'master' into move_to_qqc2	2018-03-24 15:32:04 +01:00
Cristian Luis Duarte	686af4ff77	Clean code that manually checked for windows coordinates to disable radar touch	2018-03-23 20:02:51 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00