Commit graph

177 commits

Author SHA1 Message Date
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
Philip Rosedale
26541e12b6 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 21:08:54 -08:00
Philip Rosedale
7f2fe14565 add mouseWheel to change voxel edit size 2014-02-23 20:23:31 -08:00
ZappoMan
766a922fb3 add work around for voxel add of larger voxel on top of smaller voxels 2014-02-23 19:02:10 -08:00
ZappoMan
dad97cd52e removed accidental code 2014-02-23 18:54:15 -08:00
ZappoMan
5b8d6ea314 removed unneeded code 2014-02-23 18:52:15 -08:00
ZappoMan
43f63781fc removed files we don't need 2014-02-23 18:35:39 -08:00
ZappoMan
24a5cbfbfd Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js
Conflicts:
	examples/editVoxels.js
2014-02-23 18:32:53 -08:00
Philip Rosedale
9b463dd8cf Merge branch 'master' of https://github.com/worklist/hifi 2014-02-23 17:26:23 -08:00
Philip Rosedale
566670fb78 Adding mouse wheel sizing voxel 2014-02-23 17:26:09 -08:00
ZappoMan
892cc01dd9 added Voxels.getVoxelAt() to inspect local tree 2014-02-23 13:18:36 -08:00
ZappoMan
a8b34ae756 removed some debug settings 2014-02-23 12:58:20 -08:00
ZappoMan
78de562f41 added clipboard support to editVoxels.js 2014-02-23 12:52:41 -08:00
ZappoMan
f1577d12a0 make changes to local tree in Voxels JS interface 2014-02-23 12:36:38 -08:00
ZappoMan
9831fb5797 fix calculateVoxelFromIntersection() in editVoxels.js to work same as C++ code for voxel sizes larger than intersecting voxel 2014-02-23 12:09:53 -08:00
Andrzej Kapolka
6f8f15018c Allow setting the combined head orientation, which changes the body yaw and
applies the rest to the head.  Closes #2050.
2014-02-21 17:52:20 -08:00
Atlante45
6fb2d57e40 Add clipboardOverlay example to OverlaysExample 2014-02-21 16:04:15 -08:00
Stephen Birarda
060e5f8c67 updates to bot script for more bot styles 2014-02-21 13:52:54 -08:00
ZappoMan
4e28a8c312 Merge branch 'master' of https://github.com/worklist/hifi into more_edit_js 2014-02-21 10:48:00 -08:00
Andrzej Kapolka
d8321bd419 Merge pull request #2034 from birarda/master
fixes for scripted avatars
2014-02-21 10:14:41 -08:00
ZappoMan
8dac269c3c added selectable tools to the tool palette 2014-02-21 00:27:40 -08:00
ZappoMan
fb06512e67 improve z fighting adjust for preview voxels and highlights 2014-02-20 23:47:46 -08:00
ZappoMan
7026436dee first cut at touch support for orbit and pan, skeleton support for pan 2014-02-20 17:32:59 -08:00