4010 commits

Author	SHA1	Message	Date
Liv Erickson	9dd91ea31e	style fixes and fix for grid color changes not applying	2018-03-23 11:39:44 -07:00
Howard Stearns	113670e33b	Merge pull request #12638 from zfox23/commerce_upgrades_1 ... Commerce: Item Updates!	2018-03-22 15:40:22 -07:00
Clément Brisset	feec59655c	Merge pull request #12692 from highfidelity/stable ... Merge stable back into master	2018-03-22 15:08:30 -07:00
Zach Fox	daa68768b9	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-19 12:18:10 -07:00
David Back	3f2a49d243	fix list of tablet IDs ray cast checks in edit.js	2018-03-17 10:59:18 -07:00
Sam Gondelman	b96f398274	Merge pull request #12593 from gcalero/android_joystick_rotate_move ... Android joystick rotate move	2018-03-16 17:24:15 -07:00
Zach Fox	a792bcc3d3	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-16 13:24:17 -07:00
Zach Fox	eb2f8aa169	New notification flow for item updates	2018-03-15 16:03:49 -07:00
Cristian Luis Duarte	03cbadece5	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-15 17:11:40 -03:00
Seth Alves	a64f0d2779	if tablet wasn't visible when wallet passphrase screen hid it, don't show it when passphrase page is done.	2018-03-15 11:39:05 -07:00
Seth Alves	8a0b8aa034	make tablet invisible in secondary-camera if wallet passphrase page is up	2018-03-15 11:01:13 -07:00
Zach Fox	74e24ec289	Final touches?	2018-03-14 10:58:18 -07:00
Gabriel Calero	884da98466	Change default mode to My View (android)	2018-03-14 14:50:44 -03:00
Zach Fox	98cdbbb3e6	Small update to dot before merging in filterBar	2018-03-14 09:45:42 -07:00
Zach Fox	e2326a3733	Initial work for 'messages waiting' light	2018-03-13 17:05:16 -07:00
Zach Fox	7b6b08fd26	Upgrade specific edition	2018-03-13 13:51:10 -07:00
Zach Fox	f42255f46b	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-13 13:42:42 -07:00
Cristian Luis Duarte	9e429e9f03	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-12 15:51:46 -03:00
Cristian Luis Duarte	ce0d76be2b	Merge remote-tracking branch 'hifi/master' into android_joystick_rotate_move	2018-03-09 20:51:21 -03:00
Cristian Luis Duarte	3d933e1810	Android - Joystick hidden when opening login and shown after Cancel.	2018-03-09 17:41:05 -03:00
NissimHadar	317d9a8dbc	Correct can cast shadow flag being visible on entities that can't cast shadows.	2018-03-09 11:45:39 -08:00
Brad Hefta-Gaub	8e44b429d8	Merge pull request #12472 from 1P-Cusack/FogBugz/Case_4315_VFXTabSupport ... [Case 4315] Resolves Particle Tab Color Picker visual inconstency	2018-03-09 08:49:07 -08:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
John Conklin II	cad53a0203	Merge pull request #12585 from druiz17/small-tablet-changes ... tablet scale and position changes	2018-03-08 15:36:06 -08:00
Cristian Luis Duarte	4c3ee195de	Android - hide joystick when opening the Avatar window and disable it in cases is hidden (it was working with ui windows in front).	2018-03-08 19:58:15 -03:00
Zach Fox	4df58f1e67	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-08 12:58:08 -08:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
Sam Gondelman	1e9cfe29f2	Merge pull request #12388 from highfidelity/android ... Android Tip	2018-03-08 10:18:35 -08:00
David Back	554c37d14b	removed undefined event checks in scaling	2018-03-07 19:34:08 -08:00
David Back	9681f0eb77	restore old scale math, disable avatar collisions while scaling	2018-03-07 18:20:26 -08:00
Zach Fox	08b2be85d2	Don't pass isUpdating around	2018-03-07 11:44:54 -08:00
Zach Fox	d07d02b2bc	Take certID from backend instead of query params; Better loading; Uninstall app before updating	2018-03-07 11:10:47 -08:00
David Back	2047437893	Merge branch 'RC65' of https://github.com/highfidelity/hifi into RC65	2018-03-07 10:30:18 -08:00
Zach Fox	91e0af9b46	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-07 10:16:10 -08:00
Dante Ruiz	2d448d7208	tablet scale and position changes	2018-03-07 10:02:35 -08:00
Cristian Luis Duarte	4f0cecefc3	Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed	2018-03-06 22:03:39 -03:00
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
Gabriel Calero	243e79df4a	Fix merge of radar.js	2018-03-06 21:59:59 -03:00
NissimHadar	d72f46ec3e	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 16:24:53 -08:00
NissimHadar	05e9aa52c9	Moved can-cast-shadow checkbox to behaviour section.	2018-03-06 16:22:54 -08:00
Zach Fox	04a230c20f	Merge pull request #12491 from ElderOrb/FB12523 ... fix for not re-enabling preview on leaving security-sensitive pages in marketplace	2018-03-06 16:19:39 -08:00
Atlante45	edeed95ccc	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-06 15:33:12 -08:00
NissimHadar	dbf1be5de3	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 15:22:40 -08:00
David Back	47e8e26255	CR indent fixes	2018-03-06 14:05:24 -08:00
Gabriel Calero	069d3e40bc	Merge branch 'android' into android_bubble_fix	2018-03-06 18:58:49 -03:00
David Back	b74be92fd8	redo scale handles to fix scaling into avatar collision causing chaos	2018-03-06 12:27:51 -08:00
Zach Fox	ee28983334	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-06 11:13:40 -08:00
Elisa Lupin-Jimenez	15c1f5ba30	fixed log spam undefined error	2018-03-06 11:01:50 -08:00
Zach Fox	35b23cc954	It's working!	2018-03-05 15:54:17 -08:00
John Conklin II	16bb992d8d	Merge pull request #12557 from druiz17/correctly-use-defaults-values ... correctly use default values and don't delete userData in entitiesProperties.js	2018-03-05 13:15:23 -08:00