166 commits

Author	SHA1	Message	Date
James B. Pollack	8381b1d2fd	collision shape type	2016-03-07 20:21:14 -08:00
Zach Pomerantz	32ce7c6eab	Rename light surfaceRadius->falloffRadius	2016-02-25 10:02:33 -08:00
Zach Pomerantz	c2ed5e5474	Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity	2016-02-24 16:24:09 -08:00
ericrius1	749f4478ab	Fixed bug with parsing numbers for editjs	2016-02-23 09:33:37 -08:00
Zach Pomerantz	2534bb14f3	Amend entityProperties for fixed-dec light values	2016-02-22 19:27:36 -08:00
Zach Pomerantz	dacf9f7123	Rm extra " in entityProperties	2016-02-22 15:18:45 -08:00
Zach Pomerantz	77ad4039bc	Merge branch 'master' of github.com:highfidelity/hifi into fix/light-intensity	2016-02-22 15:11:12 -08:00
Zach Pomerantz	868e2ec961	Use "number" in entityProperties	2016-02-22 15:07:10 -08:00
Zach Pomerantz	1506686b79	Expose light surface to entityProperties	2016-02-22 15:07:09 -08:00
Ryan Huffman	69a953725e	Merge pull request #7132 from imgntn/edit-precision-things ... Revert step size change in edit.js	2016-02-19 08:20:04 -08:00
Chris Collins	e3ae2baa7b	Merge pull request #7123 from ericrius1/editProps ... added collidesWith property to entities list	2016-02-18 09:11:18 -08:00
James B. Pollack	acaa824cb5	but only position	2016-02-18 09:00:39 -08:00
James B. Pollack	e6662edcb4	revert step size change	2016-02-18 08:57:06 -08:00
ericrius1	5f5af9c6a0	fixed edit bug	2016-02-17 17:45:57 -08:00
James B. Pollack	89039747a2	Update entityProperties.html ... lowercase 'static' like other props	2016-02-17 16:22:14 -08:00
ericrius1	19cd3ec152	checkboxes working	2016-02-17 13:12:17 -08:00
ericrius1	94fdf6b091	checkboxes working	2016-02-17 11:59:14 -08:00
ericrius1	f85916e808	checkbox keeps getting checked...	2016-02-17 10:27:53 -08:00
ericrius1	0f8f67ef0b	removing dynamic. need to add others	2016-02-16 19:34:32 -08:00
James B. Pollack	f2445e81e0	Merge pull request #7110 from ericrius1/particlesInEdit2 ... Particles in edit	2016-02-16 18:33:01 -08:00
ericrius1	168fb67d67	making collidesWith a checkbox	2016-02-16 18:19:12 -08:00
ericrius1	7a3443968d	added collides with property	2016-02-16 15:55:11 -08:00
ericrius1	c43500f38a	added textures field to particle explorer	2016-02-16 15:36:03 -08:00
James B. Pollack	72186f916c	more precision	2016-02-15 11:35:28 -08:00
James B. Pollack	c469fc6a29	hide hyperlink property for web entities	2016-02-12 14:30:21 -08:00
ericrius1	1387f5f322	Fixed bug where lack of 0 as prefix for numbers would throw an error	2016-02-01 16:44:55 -08:00
ericrius1	559fb9cbde	fixed merge conflicts	2016-01-29 16:42:10 -08:00
Brad Davis	c4794dd0d5	Fix entity properties HTML	2016-01-29 13:41:43 -08:00
ericrius1	6be550a144	resolved conflicts	2016-01-28 17:08:24 -08:00
James B. Pollack	96ddb9febb	Merge pull request #6970 from ericrius1/webEntityURL ... Moved source URL up to top of entity properties panel	2016-01-28 16:02:21 -08:00
ericrius1	c30109ec29	trying to sync again	2016-01-28 13:21:48 -08:00
ericrius1	98453c085b	Moved source URL up to top of entity properties panel	2016-01-28 12:08:21 -08:00
ericrius1	3fff5868e8	Fix syntax error	2016-01-28 11:57:33 -08:00
ericrius1	40c66a94be	Moves text props to top of Entity Props panel	2016-01-28 11:44:50 -08:00
ericrius1	191e6090e7	Moves zone props to top of entity props panel	2016-01-28 11:36:23 -08:00
ericrius1	cd5e81de36	Validating href for edit.js	2016-01-27 16:02:02 -08:00
Brad Davis	ae6cba85e8	More atmosphere removal	2016-01-21 15:15:16 -08:00
Andrew Meadows	7fb145e819	namechange ignoreForCollisions --> collisionless	2016-01-19 09:06:17 -08:00
Seth Alves	9428da61cf	fix property name typo	2016-01-18 14:31:55 -08:00
Andrew Meadows	c1a1cbf718	fix typo	2016-01-16 15:55:10 -08:00
Andrew Meadows	84282d0114	final repairs after rebase	2016-01-15 15:28:26 -08:00
Andrew Meadows	29a52bf0ba	namechange collisionsWillMove --> dynamic	2016-01-15 15:23:52 -08:00
Brad Davis	b6272b7824	Migrate tool window to overlay/QML	2016-01-13 15:40:37 -08:00
Anthony J. Thibault	e9f529bf12	Entities: Removed Start Automatically property from Animation Group ... There is an issue when startAutomatically was set to true and animationPlaying was set to false. This would cause clients to play the animation when they connected to the entity server, even though the server was not.	2015-12-09 17:59:56 -08:00
Seth Alves	f0fb9966ad	expose parent-joint-index to edit.js	2015-12-06 12:34:41 -08:00
Seth Alves	9548b0e138	get parent-id field working	2015-11-29 13:38:27 -08:00
Seth Alves	bbc9d5d131	add missing single-quote	2015-11-29 13:04:45 -08:00
Seth Alves	36e293608a	more adding parentID to edit.js	2015-11-26 05:31:52 -08:00
Thijs Wenker	d60661ff8a	preview camera button in edit.js script	2015-11-04 03:24:32 +01:00
Atlante45	8b46ed7dff	Check keyLight is defined	2015-10-29 16:42:48 -07:00