464 commits

Author	SHA1	Message	Date
Cristian Luis Duarte	bde2ba9272	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:02:23 -03:00
Brad Davis	9e8368e50e	Disable virtual trackpad rendering on non-Android builds	2018-03-02 11:12:44 -08:00
Cristian Luis Duarte	55d52f92df	Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)	2018-02-28 15:55:50 -03:00
Cristian Luis Duarte	428f4b7b9d	Android - Make the virtual pad (joystick) position fixed. Change assets.	2018-02-27 21:24:21 -03:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
Brad Davis	1f2760c4b7	Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into android	2018-02-12 12:39:40 -08:00
Bradley Austin Davis	fd007e845d	Squashed scribe changes	2018-02-07 10:29:29 -08:00
Bradley Austin Davis	0455fb37b6	Merge remote-tracking branch 'upstream/master' into fix/shader_length	2018-02-06 15:55:01 -08:00
Andrew Meadows	96c97547f9	Merge pull request #12205 from jherico/no_widgets ... Remove some unneeded Qt dependencies	2018-02-05 15:32:54 -08:00
Olivier Prat	92279b5939	Merged with master	2018-02-05 18:24:05 +01:00
samcake	f044cf76d6	add the count of compilations of shaders to avoid recompiling them if ot needed	2018-01-30 18:31:30 -08:00
samcake	f078ff611a	Refining the declaraion signatures and adding the binary capture	2018-01-30 15:10:52 -08:00
Gabriel Calero	a5a36b4b8f	Don't show help on android. Hide menu bar	2018-01-30 14:48:37 -03:00
Olivier Prat	5e6300ce46	Merged with master	2018-01-30 09:52:30 +01:00
Brad Davis	0781d8eaf0	Remove some unneeded Qt dependencies	2018-01-28 22:18:24 -08:00
Brad Davis	361b767586	Merge branch 'fix/render_config' into android	2018-01-25 14:50:41 -08:00
ZappoMan	cb01bd14b9	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -08:00
Olivier Prat	95882e0cde	Merged with master	2018-01-24 10:51:54 +01:00
ZappoMan	027a1e69f4	some settings cleanup, adding description to Send Data	2018-01-20 00:08:06 -08:00
Brad Davis	3e7872637d	Merge branch 'android' into android_new	2018-01-19 14:40:01 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
Gabriel Calero	970ca5e08f	Add virtual pad for android	2018-01-17 15:00:43 -03:00
Olivier Prat	efa6a8c0b5	Merged with master	2018-01-17 15:49:46 +01:00
Olivier Prat	49549ced17	Fixed compilation with new shader system	2018-01-17 10:52:58 +01:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Olivier Prat	3911ce59cc	Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code	2018-01-16 19:02:12 +01:00
humbletim	08ccda9cfc	rename libraries/model(src/model) -> libraries/graphics(src/graphics)	2018-01-16 12:44:44 -05:00
Brad Davis	db30e9c45f	Fixing PR builds	2018-01-15 09:47:31 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Olivier Prat	814de4ab81	Scribe now outputs shaders as cpp files.	2018-01-12 11:59:19 +01:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Brad Hefta-Gaub	7a3835eb33	Merge pull request #11945 from jherico/android_nov ... Updating android toolchain for QML	2018-01-05 13:34:03 -08:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
Brad Davis	829e521320	Merge remote-tracking branch 'upstream/master' into HEAD	2018-01-02 11:37:33 -08:00
Andrew Meadows	5c84c5f845	measure average time of 'present'	2017-12-20 17:41:08 -08:00
Brad Davis	c6bc6f6ef2	Merge remote-tracking branch 'upstream/master' into android_nov	2017-12-16 16:20:16 -08:00
SamGondelman	3477aa57a8	remove extra recycle	2017-12-15 16:36:07 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
SamGondelman	d4a4c8902a	fix reticle depth at different scales and x button click on mouse press	2017-11-27 17:46:19 -08:00
Seth Alves	66e38af1b3	Merge pull request #11671 from ElderOrb/case8553 ... 8380 Mouse Disappears when switching between HMD and Desktop Mode while in Create	2017-10-25 10:31:31 -07:00
beholder	39b2c0f83a	fix for FB 8553 & FB 8380	2017-10-25 01:59:56 +03:00
SamGondelman	046e5ca716	fix backwards HUD in mirror mode	2017-10-24 13:24:09 -07:00
SamGondelman	3acbd7820b	build error	2017-10-09 11:48:54 -07:00
SamGondelman	e95ecc3f27	fix missing sensorToWorld matrix	2017-10-06 15:37:23 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00