199 commits

Author	SHA1	Message	Date
Philip Rosedale	897c2b8267	Add sounds for gun, reticle, mouse look firing	2014-03-03 22:14:59 -08:00
ZappoMan	0285fe51e8	Merge branch 'master' of https://github.com/worklist/hifi into bugfixes	2014-03-03 12:14:11 -08:00
ZappoMan	1eeb2a5594	fix bug in editVoxels.js that wasn't deleting menus	2014-03-03 12:03:23 -08:00
Philip Rosedale	b845845af1	added rectangular range limits	2014-03-03 11:42:24 -08:00
ZappoMan	37472c201c	added voxelDrumming as JS	2014-03-03 04:06:47 -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
Philip Rosedale	3cfada1a1b	avatar billboards match body/head	2014-02-28 17:14:18 -08:00
Philip Rosedale	3dd51db477	Added timer so one bot doesn’t talk twice at same time	2014-02-28 17:02:40 -08:00
Philip Rosedale	e35e06c0de	Added Freddy’s 50 cocktail party clips	2014-02-28 13:59:34 -08:00
ZappoMan	0530a73175	Merge pull request #2134 from stojce/19513 ... Code Review for Job #19513	2014-02-27 16:30:54 -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
ZappoMan	8d53fc9671	Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels	2014-02-27 01:05:20 -08:00
ZappoMan	2832c33482	fixed div by zero	2014-02-26 21:38:28 -08:00
Stephen Birarda	88b46acdeb	repair for wrong body on bots < 20	2014-02-26 16:17:51 -08:00
ZappoMan	d361c75b50	more work on seeing voxels	2014-02-26 14:16:22 -08:00
ZappoMan	08b7b86c3e	next pass at seeing voxels	2014-02-26 13:55:16 -08:00
Philip Rosedale	0a1e840d10	Bot.js NPCs wander around and make sounds	2014-02-26 13:50:04 -08: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
Stephen Birarda	bf3b5c07d5	Merge pull request #2093 from ZappoMan/menu_js ... Adds support for editing application Menus to JS	2014-02-25 17:40:39 -08:00
Stephen Birarda	937768ae51	add option for fake billboard from URL, closes #2087	2014-02-25 13:51:48 -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
ZappoMan	263d682fb9	Merge branch 'master' of https://github.com/worklist/hifi into menu_js	2014-02-25 12:20:15 -08:00
ZappoMan	0048099ff5	implement support for menu item positioning	2014-02-25 12:19:30 -08:00
ZappoMan	0b6e81b8a6	remove more cruft	2014-02-25 10:31:29 -08:00
ZappoMan	74d48ab239	added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement	2014-02-25 10:23:59 -08:00
ZappoMan	cb01c1ee10	add separator support	2014-02-24 23:53:26 -08:00
ZappoMan	374b12980b	added checkable menus and sub menus	2014-02-24 23:42:05 -08:00
ZappoMan	a3d0c20516	better support for shortcuts	2014-02-24 20:49:06 -08:00
Philip Rosedale	c783036fcc	Merge pull request #2083 from ZappoMan/hideavatar ... add support for hiding local rendering of avatar	2014-02-24 19:52:27 -08:00
ZappoMan	76355dc1a8	add support for hiding local rendering of avatar	2014-02-24 19:24:45 -08:00
ZappoMan	03f8885cad	first cut at menus JS	2014-02-24 19:09:22 -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
Stephen Birarda	4dea4b586b	Merge pull request #2072 from birarda/master ... tweaks to bot script	2014-02-24 14:35:05 -08:00
Stephen Birarda	3a90e175e0	tweaks to bot script	2014-02-24 14:34:13 -08:00
Andrzej Kapolka	2cea83a599	Proper header on ribbon.js, show display name for own avatar.	2014-02-24 13:36:43 -08:00
Andrzej Kapolka	40d9fffb7f	Fix for warning.	2014-02-24 13:19:32 -08:00
Andrzej Kapolka	8cb5c639fb	Added ribbon example that I had lying around.	2014-02-24 12:22:10 -08:00
Stephen Birarda	6cef72473d	changes to the bot script	2014-02-24 10:04:08 -08:00
Stephen Birarda	5b83b7c434	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-24 09:58:32 -08:00
ZappoMan	6591a4b7fa	correctly shutdown slider	2014-02-24 09:36:18 -08:00
Philip Rosedale	a9849c131f	EditVoxels: avatar follows orbit, mousewheel updates selection	2014-02-23 22:48:35 -08:00