246 commits

Author	SHA1	Message	Date
Clément Brisset	40baca6ee1	Merge pull request #11756 from ctrlaltdavid/21592 ... Fix import from URL adding multiple copies of imported entities	2017-11-08 18:01:48 -08:00
David Rowe	fadbf09cdd	Avoid potentially slow entity list refresh upon deleting entities	2017-11-07 18:10:10 +13:00
David Rowe	b272b2e6c8	Fix import from URL adding multiple copies of imported entities	2017-11-07 11:28:35 +13:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster ... Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
Zach Fox	8cb60fc62c	Small edit.js changes	2017-10-26 16:44:21 -07:00
Zach Fox	7998984d8e	Missed tons of spots!	2017-10-24 14:30:47 -07:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
Melissa Brown	1a3821e984	Merge pull request #11591 from ctrlaltdavid/21568 ... Add some Quat and Uuid JavaScript helper properties	2017-10-18 22:07:06 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
David Rowe	5b6d33bcb2	Missing semicolon	2017-10-18 20:29:34 +13:00
David Rowe	f74c33f597	Fix importing entities from URL	2017-10-18 17:44:36 +13:00
Zach Fox	f3b641a833	Edit.js caused a testing fail :(	2017-10-17 11:30:15 -07:00
David Rowe	fc4e440dc4	Update system scripts to use new properties	2017-10-14 08:32:14 +13:00
David Rowe	105457b388	Don't unbusubscribe from possibly shared channel	2017-10-06 13:27:08 +13:00
David Rowe	75365847a1	Merge branch 'master' into vr-edit-a	2017-09-30 09:30:38 +13:00
Thijs Wenker	cabd68a63a	Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import.	2017-09-28 16:03:09 -07:00
David Rowe	30c4a22441	Merge branch 'master' into vr-edit-a	2017-09-28 16:10:26 +13:00
druiz17	38096b48d9	fixing entitySelectionTool	2017-09-27 10:52:56 -07:00
David Rowe	6b3b2beae0	Merge branch 'master' into vr-edit-a	2017-09-27 15:34:52 +13:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
vladest	c17ca955db	Listener disconnects in C++ now	2017-09-20 20:03:53 +02:00
Daniela	8144841258	Add Edit.js Entities spawn up according to the orientation of the avatar.	2017-09-20 09:21:16 -07:00
David Rowe	c56fda88fa	Merge branch 'master' into vr-edit-a	2017-09-19 16:17:04 +12:00
vladest	5585265349	Merge branch 'master' into modal_dialogs_async	2017-09-16 22:06:49 +02:00
vladest	de4f34aacb	Add resizable flag. Use the flag for Create only	2017-09-15 21:49:38 +02:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
David Rowe	269f1769be	Merge branch 'master' into vr-edit-a	2017-09-01 14:45:59 +12:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
David Rowe	cddb054066	Merge branch 'master' into vr-edit-h ... # Conflicts: # libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp # scripts/system/controllers/handControllerGrab.js	2017-08-20 18:41:29 +12:00
vladest	15f8bc0141	Keep old function names for compatibility	2017-08-16 22:17:34 +02:00
vladest	4e5c650621	Modified some usecases for async dialogs	2017-08-16 21:41:18 +02:00
vladest	273261ee57	Reworked WindowScriptingInterface browse method for async methods	2017-08-15 23:12:35 +02:00
vladest	8afdb27c1b	Reworked WindowScriptingInterface save method for async methods	2017-08-15 22:55:44 +02:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
David Rowe	5d1732c5aa	Merge branch 'master' into vr-edit-a	2017-08-05 20:45:12 +12:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays ... Context Overlays	2017-08-03 16:28:14 -07:00
David Rowe	e2dccc1420	Merge branch 'master' into vr-edit-a	2017-08-04 07:33:18 +12:00
vladest	2d4396ac8e	Merge branch 'master' into fix_toolbar_apps_switch	2017-08-02 16:34:49 +02:00
vladest	4330e31212	Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create	2017-08-02 16:32:09 +02:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Menithal	6020154867	Removed some whitespaces to trigger new build	2017-07-31 22:49:11 +03:00
Matti Lahtinen	5fab6c37a3	Removed stray variable test	2017-07-31 08:56:04 +03:00
Menithal	734330dc06	Fixed Particle Editor Update event ... Particle Editor was agressively refreshing when ever a particle was be ing up dated Added a flag check to make sure the particle was always using the latest version	2017-07-29 15:48:31 +03:00
David Rowe	52bb4a0f77	Merge branch 'master' into vr-edit-a	2017-07-27 20:37:46 +12:00
Chris Collins	ef67029837	Merge pull request #10912 from amvmoody/21374 ... WL 21374: Allow lights/particles to be dragged by icon	2017-07-26 22:07:36 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
utkarshgautamnyu	65192aa620	added additional collision types to asset browser and new model dialog	2017-07-25 17:12:13 -07:00
Mike Moody	a4585b9400	Merge branch 'master' of git://github.com/highfidelity/hifi into 21374	2017-07-24 13:31:27 -07:00
David Kelly	b7be727b4c	turn off ContextOverlay for pal, edit. Improve clicks too	2017-07-20 11:30:55 -07:00