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
ZappoMan
03f8885cad
first cut at menus JS
2014-02-24 19:09:22 -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
AndrewMeadows
cdeb6ce51d
Merge pull request #2070 from ey6es/master
...
Fix display name for own avatar, added ribbon.js example that I had lying around.
2014-02-24 14:05:46 -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
1167ecdf77
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-24 13:21:25 -08:00
Andrzej Kapolka
40d9fffb7f
Fix for warning.
2014-02-24 13:19:32 -08:00
Leonardo Murillo
9ce4e424ef
Merge pull request #2069 from birarda/master
...
fix for assignment-client scripts with multiple instances
2014-02-24 14:46:09 -06:00
Andrzej Kapolka
8cb5c639fb
Added ribbon example that I had lying around.
2014-02-24 12:22:10 -08:00
AndrewMeadows
7f07d854cf
Merge pull request #2068 from ey6es/master
...
Fixes for camera transitions, seeing inside head.
2014-02-24 12:02:08 -08:00
Stephen Birarda
9dc460bab4
make multiple instances of scripted assignment use diff UUID
2014-02-24 11:56:14 -08:00
Andrzej Kapolka
e40fe85c36
Updating the camera mode every frame screws with the scripts, so revert to
...
updating it when the menu changes.
2014-02-24 11:42:47 -08:00
Andrzej Kapolka
8efc4d52ba
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-02-24 11:34:12 -08:00
Andrzej Kapolka
d80b52dc9f
Fixes for camera mode transitions, seeing inside head.
2014-02-24 11:33:52 -08:00
ZappoMan
4fc5444628
Merge pull request #2067 from ZappoMan/scriptreload
...
fix reload of scripts
2014-02-24 10:28:04 -08:00
ZappoMan
6ea2c81e68
fix reload of scripts
2014-02-24 10:10:00 -08:00
Stephen Birarda
dbefd81ba0
Merge pull request #2066 from birarda/master
...
changes to the bot script
2014-02-24 10:04:28 -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
3d1c4251e3
Merge pull request #2064 from ZappoMan/more_edit_js
...
correctly shutdown slider
2014-02-24 09:36:54 -08:00
ZappoMan
6591a4b7fa
correctly shutdown slider
2014-02-24 09:36:18 -08:00
Philip Rosedale
907740eb8e
Merge pull request #2047 from ey6es/metavoxels
...
Another metavoxel checkpoint: more work on streaming, editable attributes, changed to use existing session code, work on "spanners" (objects that span multiple octree nodes).
2014-02-23 21:39:44 -08:00
Andrzej Kapolka
ba327232d5
Fixed another Window signed/unsigned mismatch.
2014-02-23 21:07:00 -08:00
Philip Rosedale
5cb3a77490
Merge pull request #2059 from ZappoMan/more_edit_js
...
editVoxels.js updates: clipboard support, multitouch orbit, and better support for "larger" voxels
2014-02-23 21:06:38 -08:00
Andrzej Kapolka
5cf6c43414
Fix for Windows build error.
2014-02-23 20:29:54 -08:00
Andrzej Kapolka
8745ca3139
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-02-23 20:13:23 -08:00
Andrzej Kapolka
c4befbef38
Merge pull request #2060 from ey6es/master
...
Fix for Xcode warnings.
2014-02-23 20:12:46 -08:00
Andrzej Kapolka
f5fece5eb5
Fix for Xcode warnings.
2014-02-23 20:11:46 -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
b0f3ab3ccd
Merge pull request #2057 from ey6es/master
...
I believe this is what was intended for the voxel edit orbit behavior. Yaw the body, pitch the head.
2014-02-23 17:22:07 -08:00
Philip Rosedale
1abf0926d3
Merge pull request #2051 from ey6es/bilbo
...
Simple avatar billboards distributed through avatar mixer.
2014-02-23 17:20:00 -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
ZappoMan
03d6173c90
add Voxels.getFaceVector() to JS
2014-02-23 11:38:23 -08:00
Andrzej Kapolka
7bb3ea66ac
And another one.
2014-02-21 18:32:29 -08:00
Andrzej Kapolka
68fea8de1e
More merge fixes.
2014-02-21 18:32:05 -08:00
Andrzej Kapolka
e470b1c41d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
assignment-client/src/metavoxels/MetavoxelServer.cpp
interface/src/MetavoxelSystem.cpp
2014-02-21 18:26:40 -08:00
Andrzej Kapolka
6cbf0f407a
Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo
2014-02-21 18:24:56 -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
