1973 commits

Author	SHA1	Message	Date
Ryan Huffman	0638459052	Add permission-checking to edit entities	2015-03-02 09:51:41 -08:00
Ryan Huffman	a48c428f42	Update highlighted handle color	2015-02-27 15:29:00 -08:00
Ryan Huffman	dc2cb93cce	Add degrees symbol to rotation degrees text	2015-02-27 15:11:43 -08:00
Ryan Huffman	a0d9e92c64	Update size of rotation overlay	2015-02-27 15:11:23 -08:00
Ryan Huffman	4f4ab144b2	Update handle colors and up/down arrow image	2015-02-27 15:10:56 -08:00
Ryan Huffman	cd3281521c	Update size of rotation degrees text	2015-02-27 15:08:29 -08:00
Ryan Huffman	3ffd47a0b0	Update editEntities rotation arrows	2015-02-27 15:08:13 -08:00
Brad Hefta-Gaub	addc729654	Merge pull request #4350 from huffman/multi-select ... Multi select properties for edit entities	2015-02-27 10:54:42 -08:00
Brad Hefta-Gaub	08dc883b0e	Merge pull request #4351 from huffman/update-light-properties ... Update light properties (primarily for editEntities.js)	2015-02-27 10:54:19 -08:00
Brad Hefta-Gaub	e78b2ced4a	Merge pull request #4349 from huffman/no-nearby-entities-msg ... Add message to edit entities list for when no entities are nearby	2015-02-27 10:53:17 -08:00
Sam Gateau	c7eeebe52c	and fixing a bug with shadowing of lightmapped surface	2015-02-26 18:07:43 -08:00
Sam Gateau	74f0d98fd6	REfining the naming and introducing an orientation offset	2015-02-26 17:44:04 -08:00
Sam Gateau	f6a9bd1870	REfining the naming and introducing an orientation offset	2015-02-26 17:26:41 -08:00
Ryan Huffman	74bc48ce55	Add message to edit entities list for when no entities are nearby	2015-02-26 14:34:32 -08:00
Ryan Huffman	ecc003c5e1	Adjust colors for disabled input elements	2015-02-26 14:23:25 -08:00
Ryan Huffman	3c5f11e6ed	Add initial support for multi-selection in properties window	2015-02-26 14:23:11 -08:00
Sam Gateau	96d5a2ab42	fixing tab maybe	2015-02-26 12:10:08 -08:00
Sam Gateau	bc8d688cde	fixing tab maybe	2015-02-26 12:04:33 -08:00
Ryan Huffman	c3a7257439	Remove unused light properties from entity properties window	2015-02-26 11:03:06 -08:00
Sam Gateau	fcb293d0b2	CLean up before pr	2015-02-26 10:45:00 -08:00
Sam Gateau	a757229c0e	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-02-25 19:18:01 -08:00
Sam Gateau	b4cb5ca9d1	add an example script to control the sun light	2015-02-25 19:09:18 -08:00
Brad Hefta-Gaub	8c26be49d7	Merge pull request #4330 from huffman/edit-off-on-domain-change ... Turn editEntities off on domain change	2015-02-24 20:11:39 -08:00
Brad Hefta-Gaub	9ded2699e2	Merge pull request #4327 from thoys/20364 ... CR for Job #20364 - Add toggle to turn off sounds in notifications.js	2015-02-24 20:06:57 -08:00
Philip Rosedale	573390b429	fix dice for collision shapes, add angular velocity	2015-02-24 11:55:41 -08:00
Philip Rosedale	9d021a1a1e	remove unused line	2015-02-24 11:49:12 -08:00
Philip Rosedale	7489b468f3	give angular velocity to the thrown ball	2015-02-24 11:48:35 -08:00
Ryan Huffman	c9818c184a	Update editEntities to turn off when switching domains	2015-02-24 10:47:55 -08:00
Thijs Wenker	793116b90c	ability to mute all notifications or just certain types	2015-02-23 21:00:26 +01:00
Andrew Meadows	f2fc781523	change shapeType to use strings in billiards.js	2015-02-23 11:42:36 -08:00
Andrew Meadows	456acd8833	merge upstream/master into andrew/bispinor	2015-02-23 11:41:40 -08:00
Andrew Meadows	d5733f3782	Merge pull request #4318 from PhilipRosedale/master ... Billiard balls are now textured models	2015-02-20 17:59:33 -08:00
Andrew Meadows	27e6f99deb	use strings for shapeType for JS Entity properties	2015-02-20 16:54:58 -08:00
Ryan Huffman	cf0b13f869	Update notifications.js audio to be local-only	2015-02-20 14:22:59 -08:00
Brad Hefta-Gaub	5d6d9bb1d4	Merge pull request #4320 from huffman/fix-camera-move-on-mirror ... Fix entity camera tool from taking over in mirror mode	2015-02-20 10:40:03 -08:00
Brad Hefta-Gaub	32bbc8d551	Merge pull request #4317 from birarda/master ... dynamically grab animation URL as model URL from model	2015-02-20 10:39:30 -08:00
Ryan Huffman	c665a3873d	Fix entity camera tool from taking over in mirror mode	2015-02-20 10:11:55 -08:00
Philip Rosedale	66d1eeb327	Add textured models as balls	2015-02-19 21:11:51 -08:00
Stephen Birarda	51ad631c54	dynamically grab animation URL as model URL from model	2015-02-19 13:14:46 -08:00
David Rowe	a947cda0b2	Update SVG URL to Amazon S3	2015-02-18 13:02:37 -08:00
Clément Brisset	87f4ae2425	Merge pull request #4304 from thoys/20245 ... CR for Job #20245 - Implement UI sounds for virtualKeyboard & notifications	2015-02-18 09:55:34 -08:00
Thijs Wenker	d10f37291b	check if sounds are downloaded before play thanks @Atlante45	2015-02-18 18:25:16 +01:00
Clément Brisset	7183400e43	Merge pull request #4305 from ctrlaltdavid/20308 ... CR for Job #20308 - Refine progress.js	2015-02-18 08:10:57 -08:00
Andrew Meadows	1c8f1bbcdd	Merge pull request #4299 from talentraspel/20338 ... removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMou…	2015-02-17 17:47:47 -08:00
Thijs Wenker	96b3114a36	style	2015-02-17 23:37:37 +01:00
Thijs Wenker	4d12a6d81c	Merge branch 'master' of https://github.com/worklist/hifi into 20245 ... Conflicts: examples/notifications.js	2015-02-17 23:30:58 +01:00
Kai Ludwig	4048627de7	2n try: removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.	2015-02-17 18:50:20 +01:00
Kai Ludwig	fa1bcc43e6	removed "Script.scriptEnding.connect(scriptEnding);" from lookWithMouse.js, because the function scriptEnding it is no longer available in that script.	2015-02-17 18:40:20 +01:00
Andrew Meadows	5cd1950bed	Merge pull request #4297 from huffman/fix-mouse-look-clash ... Fix mouse look clash	2015-02-17 09:33:50 -08:00
Andrew Meadows	d896f3a811	Merge pull request #4252 from thoys/20224 ... CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads	2015-02-17 09:03:17 -08:00