186 commits

Author	SHA1	Message	Date
David Rowe	a863e37eb5	Communicate VR edit enabled state to hand controller script	2017-06-30 12:11:06 +12:00
David Rowe	513e0cd232	Fix import of JSON with parent-child relationships	2017-06-20 16:44:25 +12:00
Anthony Thibault	0d46b78bff	Merge pull request #10541 from Menithal/21324 ... Reworked Particle Editor UI	2017-06-13 13:00:54 -07:00
Menithal	c2c1e607c0	Formating	2017-06-13 20:31:41 +03:00
Menithal	00701eb5c7	Merge remote-tracking branch 'origin/master' into 21324	2017-06-13 19:08:37 +03:00
Vladyslav Stelmakhovskyi	b7f8cc7f0b	Fix intendantion	2017-06-08 22:58:40 +02:00
Vladyslav Stelmakhovskyi	dc2c79baab	Merge with master	2017-06-08 21:10:30 +02:00
Seth Alves	dcbd279bd8	Merge pull request #10589 from vladest/create_in_landscape ... Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]	2017-06-05 12:46:03 -07:00
Menithal	4842de8f07	Fixed issue with orientation	2017-06-04 00:03:14 +03:00
Vladyslav Stelmakhovskyi	4dbe646c17	Set ective button property isActive before Home menu redraw. Makes sure redraw will read proper value of isActive property	2017-06-03 15:40:25 +02:00
Clément Brisset	5f91d2dcb7	Merge pull request #10569 from ctrlaltdavid/21312 ... Improve positioning of assets when added / imported	2017-06-02 15:45:18 -07:00
Vladyslav Stelmakhovskyi	0f80a8b7af	On create button, switch Tablet to landscape mode	2017-05-30 16:51:04 +02:00
David Rowe	f5066aac51	Don't adjust position of imported entities of particular types	2017-05-30 15:53:03 +12:00
David Rowe	1e8698aee1	Snap imported JSON to grid	2017-05-30 15:23:18 +12:00
David Rowe	e02021bddf	Tidying	2017-05-30 14:38:59 +12:00
David Rowe	b176dbe544	Refactoring	2017-05-30 14:35:59 +12:00
David Rowe	4c0296daaa	Reposition imported JSON entities so that they start at import distance	2017-05-30 14:29:10 +12:00
David Rowe	18558dd795	Make JSON import distance 2m	2017-05-30 13:34:17 +12:00
David Rowe	6c890d90ef	Adjust position of model after its been resized	2017-05-29 17:48:01 +12:00
David Rowe	f0785cd39e	Adjust creation position so that bounding box is creation distance away	2017-05-29 13:52:36 +12:00
David Rowe	9b679325ff	Don't raise creation position if in independent or entity view mode	2017-05-29 13:35:54 +12:00
David Rowe	508dee4580	Increase entity creation distance to 2m	2017-05-29 13:35:18 +12:00
Vladyslav Stelmakhovskyi	bcee25acc7	Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated	2017-05-28 19:54:41 +02:00
Menithal	4e97f8ad9c	Removed stray print	2017-05-27 16:21:25 +03:00
Menithal	a3fc87fb23	Removed straggling print	2017-05-24 21:27:47 +03:00
Menithal	3f9b306c7f	Finalized UI changes doing final tests	2017-05-24 21:23:30 +03:00
Menithal	255540d0f8	Reverted a few files	2017-05-24 10:16:46 +03:00
Menithal	674f1f5f3a	Trying to hunt down a specific issue	2017-05-24 09:53:01 +03:00
Menithal	42bb5fa8e9	Part. Tab now only appears if selected ... - Particle Tab now only appears if a Particle Entity is selected	2017-05-20 13:47:24 +03:00
Triplelexx	c678fd67ed	change default particle texture to production	2017-05-17 14:52:11 +01:00
Triplelexx	5a742002e2	change default particle values	2017-05-16 23:39:38 +01:00
Triplelexx	7edda87330	change default particle to wispy smoke	2017-05-11 01:21:42 +01:00
Triplelexx	fae51c5c46	change default particle texture to production	2017-05-06 20:12:09 +01:00
Triplelexx	0d21d7108e	change default particle properties	2017-05-04 19:27:43 +01:00
Vladyslav Stelmakhovskyi	1916eafc41	Trigger rebuild	2017-04-27 16:02:47 +02:00
Vladyslav Stelmakhovskyi	0d53b82326	Renamed EDIT to CREATE	2017-04-27 09:30:00 +02:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
Triplelexx	e295ab2778	change location of menu item Create Entities As Grabbable	2017-04-26 21:13:39 +01:00
Triplelexx	06b3b84145	changes from CR	2017-04-26 18:50:15 +01:00
Triplelexx	01b11022e3	add menu item to control grabbable setting on newly created entites	2017-04-26 07:26:00 +01:00
Triplelexx	d689a43678	changes from CR	2017-04-24 22:07:51 +01:00
Triplelexx	d63c4d11c7	enable grabbable property for all newly created entities	2017-04-24 21:33:08 +01:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Andrew Lowry	ecf3826050	Always show hand lasers when in edit mode.	2017-04-24 13:35:37 -04:00
Andrew Lowry	8479d835b2	Adds laser selection of particle systems while in edit mode in HMD.	2017-04-24 13:35:37 -04:00
David Rowe	6a23f3a59b	Remove some dead code noticed in passing	2017-04-01 11:25:42 +13:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Triplelexx	a964edee91	change all references of Quat.getFront to Quat.getForward in scripts directory	2017-03-21 22:25:30 +00:00
Seth Alves	04a334fd07	unmangle merge	2017-03-21 11:02:18 -08:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00