83 commits

Author	SHA1	Message	Date
Atlante45	178f845ad0	Rescale import when using keys +/-	2014-04-18 16:40:13 -07:00
Atlante45	7782e53363	Restored scale copy	2014-04-18 16:26:10 -07:00
Atlante45	c4102e3af0	Improved scale selector, changed first swatch behaviours, improved placement tool	2014-04-18 16:04:20 -07:00
Atlante45	01fe3f45c5	Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool	2014-04-18 10:23:01 -07:00
Atlante45	dcccd66c51	Changed sound files to raw	2014-04-16 17:49:35 -07:00
Atlante45	1c89d8f3ed	editVoxels reformat	2014-04-16 17:33:15 -07:00
Atlante45	c323249039	Remove bad change	2014-04-15 10:38:28 -07:00
Atlante45	08b24343e5	Added sounds provided by grayson and randomized their use.	2014-04-15 10:34:18 -07:00
Stephen Birarda	71c3443614	mass replacement of js of hifi with examples	2014-04-08 17:56:56 -07:00
Brad Hefta-Gaub	8e097be28d	Merge pull request #2614 from Atlante45/undo_redo_system ... Undo redo system	2014-04-08 08:30:29 -10:00
Atlante45	d213cd7840	More work on Undo/Redo	2014-04-07 17:10:15 -07:00
Atlante45	56b0583600	Fix for editVoxels/inspect conflict	2014-04-07 14:42:35 -07:00
Philip Rosedale	0b13a7173c	disable wheel for size scaling	2014-03-26 23:24:36 -07:00
ZappoMan	d8bf5be68b	fix audio position in editVoxles.js	2014-03-25 08:43:56 -07:00
Brad Hefta-Gaub	c8ef3489d2	Merge pull request #2438 from Atlante45/inspect_js_fix ... Inspect js fix	2014-03-21 15:27:04 -07:00
Brad Hefta-Gaub	c06caa4a4e	Merge pull request #2422 from PhilipRosedale/master ... Bots can see voxels and move joints, fix drag bug in editVoxels	2014-03-21 14:31:55 -07:00
Atlante45	53eaea6a22	Removed rest of orbit/pan code in editVoxels.js	2014-03-21 14:30:57 -07:00
Atlante45	9f96129fb1	Fixed #2379	2014-03-21 14:22:26 -07:00
ZappoMan	939265356b	fix editVoxels.js mouse clicking	2014-03-21 10:03:01 -07:00
Philip Rosedale	f72061801c	Merge branch 'master' of https://github.com/worklist/hifi	2014-03-20 17:21:31 -07:00
Atlante45	6b118939fd	Removed orbit from editVoxels.js so there is no conflict with inspect.js	2014-03-20 16:09:25 -07:00
Philip Rosedale	24c779e551	Fix bug in extrusion deleting first voxel made	2014-03-18 22:05:51 -07:00
Atlante45	9402a5852c	Fixed review comments	2014-03-12 12:20:43 -07:00
Atlante45	1c4051b288	Added importBoundaries	2014-03-12 10:35:22 -07:00
Atlante45	03d7fb147c	Fixed spaces added everywhere	2014-03-11 18:15:04 -07:00
Atlante45	6fcb802a94	Added preview deplacement + fixed locking issue	2014-03-11 18:01:38 -07:00
Clement	dcaef45f2e	More work on editVoxel.js	2014-03-11 16:01:21 -07:00
Clement	ca0cd2d9d0	Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels	2014-03-11 13:46:48 -07:00
ZappoMan	06a0332fd5	remove space bar behavior from editrVoxels.js	2014-03-10 16:44:33 -07:00
stojce	dbef17db59	code style	2014-03-06 22:42:34 +01:00
stojce	26fb2ed85d	Merge branch 'master' of https://github.com/worklist/hifi into editVoxels	2014-03-06 21:54:17 +01:00
Philip Rosedale	828159cdcb	Merge pull request #2204 from ZappoMan/flocking_birds ... Flocking birds & more	2014-03-05 18:01:41 -08:00
stojce	438b072907	editVoxels - importing voxels	2014-03-06 02:29:12 +01:00
ZappoMan	c34f76620f	fix failed create voxel with key press 0 at startup of editVoxels.js	2014-03-05 10:52:46 -08:00
ZappoMan	374af9eeb5	first cut at flocking birds, change willEmitVisualCallback to update	2014-03-04 14:40:49 -08:00
ZappoMan	1eeb2a5594	fix bug in editVoxels.js that wasn't deleting menus	2014-03-03 12:03:23 -08:00
ZappoMan	011bc4f6cb	slightly less code to get it done	2014-03-03 01:11:03 -08:00
ZappoMan	d8d61c7361	move hydra finger painting from c++ to js	2014-03-03 01:06:48 -08:00
stojce	ae78cac78b	removed some magic numbers	2014-02-28 00:05:46 +01:00
stojce	7d67b8e60d	fixed vertical thumb placement on window resize	2014-02-27 23:28:23 +01:00
stojce	5c22376312	editVoxels new layout / assets	2014-02-27 23:20:40 +01:00
Philip Rosedale	220f9fda76	Merge branch 'master' of https://github.com/worklist/hifi	2014-02-25 22:09:08 -08:00
Philip Rosedale	4da6af96bb	Bots will move	2014-02-25 22:08:56 -08:00
ZappoMan	869b35a7aa	remove old c++ implementation of voxel tools	2014-02-25 21:38:10 -08:00
ZappoMan	73b0a5b359	switch to numbered swatches	2014-02-25 13:32:09 -08:00
ZappoMan	4d0a25b6ea	add menus to editVoxels.js	2014-02-25 13:05:58 -08:00
Philip Rosedale	f4b485eb84	Updated color pallete for Grayson, pick random 1 of 3 add voxel sounds	2014-02-24 18:00:58 -08:00
Philip Rosedale	fffd45019d	Added new sounds, default tool ON	2014-02-24 17:17:15 -08:00
Philip Rosedale	3a4ebe878b	don’t drag avatar along during orbit, yet.	2014-02-24 17:03:14 -08:00
Philip Rosedale	fa3b109e1d	Merge branch 'master' of https://github.com/worklist/hifi	2014-02-24 16:43:39 -08:00