5305 commits

Author	SHA1	Message	Date
samcake	4dc3685e35	Cosmetic change to the ui and adding more feature to the ConfigSlider	2018-03-08 14:50:07 -08:00
samcake	87b159e491	merge with upstream, fixed a smal typo bug and clean up the ui	2018-03-07 17:30:11 -08:00
samcake	b26faf55e3	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-07 10:54:02 -08:00
samcake	4a91ac11c9	Adding controls of the regions	2018-03-06 18:19:02 -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
samcake	7cb4afc6b4	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-06 13:34:37 -08:00
samcake	b6b7cb3394	Adressing warnings issue and implementing the independent intersection test per region spheres	2018-03-06 12:39:28 -08:00
Elisa Lupin-Jimenez	15c1f5ba30	fixed log spam undefined error	2018-03-06 11:01:50 -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
Thijs Wenker	d7725f1d73	make the grabbable checkbox again, respect default true setting	2018-03-05 20:54:08 +01:00
Dante Ruiz	1997cd27bd	correctly use default values	2018-03-05 11:26:37 -08:00
samcake	0ab5fc178f	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-05 11:12:27 -08:00
samcake	7d32efb5e6	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-05 11:03:11 -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
samcake	660c4c30e9	Representing the view spheres	2018-03-02 18:22:51 -08:00
samcake	7179a31d17	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-02 17:51:19 -08:00
samcake	cc392944b5	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 17:49:10 -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
John Conklin II	7ebe3df2b1	Merge pull request #12537 from zfox23/fixJsRequest ... Fix undefined request from JS	2018-03-02 13:39:27 -08:00
Zach Fox	a5a109e4f1	Fix undefined request from JS	2018-03-02 10:05:32 -08:00
samcake	a40f8cefa2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-02 09:01:16 -08:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00
samcake	5b8e18f15d	Adding the pipeline to render the view spheres	2018-03-01 17:57:44 -08:00
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00
Zach Fox	c4e90c24eb	Fix undefined request from JS	2018-03-01 16:40:24 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
samcake	3a9a93f502	Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item	2018-03-01 13:40:58 -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