3938 commits

Author	SHA1	Message	Date
NissimHadar	05e9aa52c9	Moved can-cast-shadow checkbox to behaviour section.	2018-03-06 16:22:54 -08:00
NissimHadar	dbf1be5de3	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-06 15:22:40 -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
NissimHadar	1eb0dde3d2	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-05 11:36:39 -08:00
Dante Ruiz	1997cd27bd	correctly use default values	2018-03-05 11:26:37 -08:00
Dante Ruiz	654770af51	fix controller dispatacher error	2018-03-05 09:39:26 -08:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
NissimHadar	8536b44c61	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 16:09:06 -08:00
John Conklin II	ed07b3c28b	Merge pull request #12531 from AndrewMeadows/use-pick-not-raypick ... Purge RayPick and LaserPointers from default scripts	2018-03-02 14:59:32 -08:00
Dante Ruiz	d12a4f0c18	little change	2018-03-02 14:30:02 -08:00
Dante Ruiz	5dc336bfae	remove dead code and eslint files	2018-03-02 14:23:35 -08:00
Dante Ruiz	05fb3cfd9a	fixing hyper link for entities	2018-03-02 14:03:24 -08:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
John Conklin II	1e1836c009	Merge pull request #12502 from elisa-lj11/2dimages-update ... Image entity has correct orientation and is collisionless	2018-03-01 09:57:08 -08:00
Andrew Meadows	27c6e7915e	purge LaserPointers refs from scripts that don't use it	2018-03-01 08:43:30 -08:00
Andrew Meadows	b4f941af03	finish purge of RayPick from grab.js	2018-03-01 08:42:08 -08:00
Andrew Meadows	181944d5db	fix bugs in controllerDispatcher.js	2018-03-01 08:41:13 -08:00
Elisa Lupin-Jimenez	061a189e9f	Merge pull request #12520 from elisa-lj11/selection_tool_log_spam ... Fixed log spam undefined error	2018-02-28 09:37:17 -08:00
Thijs Wenker	6bf1c9878f	Merge pull request #12473 from misslivirose/fix-log-spam ... Logspam fix for editing in HMD mode	2018-02-28 01:59:25 +01:00
Elisa Lupin-Jimenez	b8fd640ddf	fixed log spam undefined error	2018-02-27 16:44:45 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
Howard Stearns	0e4f3460b3	Merge pull request #12497 from howard-stearns/end-seeding ... End seeding	2018-02-27 13:18:13 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Elisa Lupin-Jimenez	b56c78d36c	image has correct orientation and is collisionless	2018-02-26 14:44:46 -08:00
Zach Fox	0802bd2c21	Fix going to marketplace main page from WalletChoice	2018-02-26 14:27:59 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
howard-stearns	a5cedde3c8	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-26 10:33:03 -08:00
John Conklin II	3201d2ba21	Merge pull request #12407 from NissimHadar/shadowControlsOffZvork ... Shadow control for zones, models and shapes	2018-02-26 10:13:40 -08:00
John Conklin II	c227c11aa2	Merge pull request #12475 from ElderOrb/FB12518 ... fix for 'help icon in toolbar does not highlight when help window is open'	2018-02-26 09:35:56 -08:00
howard-stearns	30a6cca4b3	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-26 09:26:09 -08:00
howard-stearns	8b46bdd9a1	make bank link testable in staging	2018-02-25 15:17:28 -08:00
Zach Fox	fe515e949b	New UI for new HFC users	2018-02-23 16:36:20 -08: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
Zach Fox	f14673bc50	Fixup Checkout for apps	2018-02-22 16:38:38 -08:00
Zach Fox	10fa3fa346	It's working!	2018-02-22 16:09:01 -08:00
NissimHadar	bb04f3f533	CR corrections.	2018-02-22 13:57:46 -08:00
Zach Fox	4d2d7fa51f	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
NissimHadar	c6580f642a	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-22 13:45:00 -08:00
Alexander Ivash	c15cf33ca1	12518 - Help icon in toolbar does not highlight when help window is open	2018-02-23 00:36:00 +03:00
Liv Erickson	269d8312e2	wrap selection print in wantDebug to avoid spamming logs in HMD	2018-02-22 13:03:16 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
Seth Alves	c534e3a6e4	Merge pull request #12356 from ctrlaltdavid/21742 ... Handle tablet entities and overlays not being available	2018-02-22 08:48:13 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
tapalisa	1f958c247f	Merge pull request #12391 from 1P-Cusack/FogBugz/Case_4315_colorpreview_final ... [Case 4315] Fixes ColorPicker Color Preview functionality	2018-02-21 16:09:47 -08:00
Nissim Hadar	b519ebd6f1	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-21 12:36:56 -08:00