1668 commits

Author	SHA1	Message	Date
Stephen Birarda	336f28e014	repair to places array length	2015-01-15 15:00:42 -08:00
Stephen Birarda	00f4e92e06	fix places array grab	2015-01-15 14:58:49 -08:00
Stephen Birarda	e538669343	resolve conflicts on merge with upstream	2015-01-15 13:12:05 -08:00
Brad Hefta-Gaub	d5d4b4ee18	Merge pull request #4113 from huffman/edit-entity-click ... Update editEntities to do an accurate pick when the mouse is idle	2015-01-15 11:04:34 -08:00
Brad Hefta-Gaub	fbc040759e	Merge pull request #4112 from cozza13/20270 ... CR for Job #20270 - Change reference of global.js	2015-01-15 11:03:52 -08:00
Ryan Huffman	bf6d63cf0c	Make accurateRay parameter required	2015-01-15 10:59:24 -08:00
Ryan Huffman	dcb4d9f02d	Update editEntities to do accurate pick on mouse idle	2015-01-15 10:57:35 -08:00
Ryan Huffman	1b9b7b6797	Merge branch 'master' of github.com:highfidelity/hifi into update-properties-layout ... Conflicts: examples/html/entityProperties.html	2015-01-15 10:53:07 -08:00
Chris Collins	d6a3b94c73	Changed references of global.js to a var ... Changed references of global.js to a var	2015-01-15 10:48:31 -08:00
Ryan Huffman	dbb978e278	Update style and layout of entity properties window	2015-01-15 10:22:39 -08:00
Stephen Birarda	79d214619d	update lobby for new places API	2015-01-14 18:18:26 -08:00
Thijs Wenker	80a81043ed	Merge branch 'master' of https://github.com/highfidelity/hifi into 20216 ... Conflicts: interface/src/Menu.cpp	2015-01-15 02:28:31 +01:00
Brad Hefta-Gaub	89967fbe7a	Merge pull request #4104 from AndrewMeadows/inertia ... store density in EntityItem instead of mass	2015-01-14 17:17:45 -08:00
Philip Rosedale	fead12acca	Merge pull request #4102 from cozza13/20268 ... CR for Job #20268 - Change hands for gun scripts	2015-01-14 15:52:04 -08:00
Ryan Huffman	10f8e54903	Update style of properties windows	2015-01-14 15:50:42 -08:00
Clément Brisset	ce12e61a27	Merge pull request #4101 from huffman/fix-rotation-image ... Fix rotation handles not showing up	2015-01-14 15:49:09 -08:00
Andrew Meadows	f90b128ac3	use density instead of mass in scripts/UI	2015-01-14 15:48:05 -08:00
Chris Collins	6ce71d9655	Fix library and placement reference ... Fix library reference and switch the gun hand.	2015-01-14 13:54:34 -08:00
Ryan Huffman	e7eb12202a	Fix rotation handles not showing up	2015-01-14 09:41:34 -08:00
Brad Hefta-Gaub	7e55d79ab7	Merge pull request #4099 from huffman/update-entity-properties ... Add missing model properties to entity property window	2015-01-13 17:12:06 -08:00
Clément Brisset	3034b8f733	Merge pull request #4091 from ctrlaltdavid/20229 ... CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript	2015-01-13 17:07:17 -08:00
Andrew Meadows	26ab79e840	Merge pull request #4097 from huffman/update-camera-hud ... Enable and update camera tool	2015-01-13 17:07:04 -08:00
Andrew Meadows	b4ee7b684c	Merge pull request #4070 from cozza13/20259 ... CR for Job #20259 - Fix up bad links on bot scripts	2015-01-13 17:06:36 -08:00
Ryan Huffman	00f7bf7efe	Remove 'Edit Properties...' in favor of properties window	2015-01-13 10:12:15 -08:00
Ryan Huffman	96f75df831	Add missing model properties to entity property window	2015-01-13 10:09:05 -08:00
Ryan Huffman	0c58572d32	Reduce size of camera tool cubes	2015-01-13 08:45:11 -08:00
Ryan Huffman	e873df9680	Remove mode buttons from camera tool and increase size	2015-01-13 08:39:59 -08:00
Ryan Huffman	aad49e4404	Update camera tool to only show when edit entities is enabled	2015-01-13 08:26:32 -08:00
Ryan Huffman	80351a768e	Enable camera tool	2015-01-13 08:26:11 -08:00
Atlante45	2b48d31cbb	Move scripts to correct directory	2015-01-12 17:48:54 -08:00
Clément Brisset	10331c52a8	Merge pull request #4094 from birarda/master ... repairs to AudioScriptingInterface playSound	2015-01-12 16:18:41 -08:00
Stephen Birarda	661221a189	repairs to AudioScriptingInterface playSound	2015-01-12 16:04:00 -08:00
Stephen Birarda	208af5cbca	Revert "don't play muzak from lobby to avoid error" ... This reverts commit 69f5c769b8.	2015-01-12 15:14:49 -08:00
Chris Collins	8f3aba3585	Removing double entry of gun.js ... Removing double entry of gun.js	2015-01-12 14:39:13 -08:00
Andrew Meadows	22d500bd54	Merge pull request #4074 from huffman/rescale-properties ... Add rescale button to edit properties window	2015-01-12 14:22:45 -08:00
Andrew Meadows	9f1a612865	Merge pull request #4073 from Atlante45/editModels ... editModels => hydraGrab	2015-01-12 14:21:02 -08:00
Stephen Birarda	69f5c769b8	don't play muzak from lobby to avoid error	2015-01-12 10:07:20 -08:00
Ryan Huffman	8d8352946b	Add rescale button to edit properties window	2015-01-09 10:01:58 -08:00
Atlante45	5ab0df3288	removed editModels	2015-01-08 18:31:10 -08:00
Atlante45	22e7c6d507	Merge branch 'master' of https://github.com/highfidelity/hifi into editModels ... Conflicts: examples/editModels.js	2015-01-08 18:30:38 -08:00
Chris Collins	9ca0df0796	Small fixes to scripts ... -merge duplicate gun scripts -fix url of sit	2015-01-08 16:05:32 -08:00
Atlante45	a46080cbf2	editModels > hydraGrab	2015-01-08 11:24:02 -08:00
Philip Rosedale	a04ce68fba	Merge pull request #4063 from ZappoMan/restoreLookAt ... restore camera lookAt and keepLookingAt features	2015-01-07 16:31:07 -08:00
ZappoMan	806e691bbf	restore camera lookAt and keepLookingAt features	2015-01-07 13:41:07 -08:00
Chris Collins	d15ae92e1e	Guitar fix ... Guitar position fix	2015-01-07 13:40:36 -08:00
Brad Hefta-Gaub	23559743d9	Merge pull request #4060 from PhilipRosedale/gun ... Added improved gun to /examples	2015-01-07 13:16:09 -08:00
Brad Hefta-Gaub	49508733aa	Merge pull request #4053 from cozza13/20254 ... CR for Job #20254 - Additional Script updates	2015-01-07 13:14:34 -08:00
Philip Rosedale	9bf56516e0	Added improved gun to /examples	2015-01-07 13:02:00 -08:00
Chris Collins	3a75a6f920	Minor typo fix ... Minor typo fix	2015-01-07 12:57:40 -08:00
Ryan Huffman	eafe1ae951	Update position of grid-to-avatar to be at the left foot	2015-01-07 12:15:36 -08:00