Stephen Birarda
|
71c3443614
|
mass replacement of js of hifi with examples
|
2014-04-08 17:56:56 -07:00 |
|
Stephen Birarda
|
5b822dc57c
|
inital licensing fixes for JS headers
|
2014-04-08 17:54:54 -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 |
|
Brad Hefta-Gaub
|
db1a622040
|
Merge pull request #2612 from Atlante45/fix_editVoxels_inspect_conflict
Fix for editVoxels/inspect conflict
|
2014-04-08 07:24:51 -10:00 |
|
Atlante45
|
174f37f531
|
Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system
|
2014-04-08 10:20:58 -07:00 |
|
Brad Hefta-Gaub
|
2988239aed
|
Merge pull request #2615 from ey6es/master
Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).
|
2014-04-08 07:20:00 -10:00 |
|
Andrzej Kapolka
|
fa05a48270
|
Provide a means of supplying the joint mappings in the FST file so that agent
scripts can address joints by name. Closes #2526.
|
2014-04-07 17:55:36 -07: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 |
|
Andrew Meadows
|
d902580d6f
|
Add Collision metatype to JS script system
|
2014-04-07 10:03:10 -07:00 |
|
ZappoMan
|
d198b04daf
|
lots of knobs and dials
|
2014-04-04 17:29:50 -07:00 |
|
Andrew Meadows
|
f6c98a1cc2
|
fix bug in gun.js: unplayed target delete sound
|
2014-04-04 10:40:55 -07:00 |
|
Philip Rosedale
|
3babb5e0bf
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-31 07:25:46 -07:00 |
|
Stephen Birarda
|
0c28907609
|
fix the hydraMove script to pull you based on head orientation, not body
|
2014-03-28 10:08:00 -07:00 |
|
Philip Rosedale
|
41e9017953
|
more audio level meter work, improved gun
|
2014-03-27 15:14:38 -07:00 |
|
Philip Rosedale
|
0b13a7173c
|
disable wheel for size scaling
|
2014-03-26 23:24:36 -07:00 |
|
Philip Rosedale
|
ff8d154412
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-26 22:38:35 -07:00 |
|
Stephen Birarda
|
28f962ea2b
|
fix for AudioMixer kill and re-add and no sound load in bot
|
2014-03-26 13:19:20 -07:00 |
|
Stephen Birarda
|
d61c5bb38b
|
add two missing commas to bot script
|
2014-03-26 13:00:09 -07:00 |
|
Stephen Birarda
|
e9cbdbb904
|
cleanup sound loading in bot script
|
2014-03-26 12:57:10 -07:00 |
|
Philip Rosedale
|
5cce4b3c03
|
added more movement
|
2014-03-26 12:14:03 -07:00 |
|
Philip Rosedale
|
61bfc77c06
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-25 14:23:27 -07:00 |
|
ZappoMan
|
9a3533a38f
|
added inspect.js to defaultScripts.js
|
2014-03-25 12:59:57 -07:00 |
|
ZappoMan
|
4df277829b
|
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
|
2014-03-25 12:56:16 -07:00 |
|
ZappoMan
|
a256473ac5
|
fixed lookWithTouch.js to not reset
|
2014-03-25 12:55:50 -07:00 |
|
Philip Rosedale
|
70a26ff895
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-25 11:51:20 -07:00 |
|
Philip Rosedale
|
925f8241e5
|
adding joint animation
|
2014-03-25 11:48:46 -07:00 |
|
ZappoMan
|
d8bf5be68b
|
fix audio position in editVoxles.js
|
2014-03-25 08:43:56 -07:00 |
|
ZappoMan
|
7b50e6d4ef
|
added hydraMove.js to default scripts
|
2014-03-25 01:02:50 -07:00 |
|
ZappoMan
|
14fcbb01a6
|
Merge branch 'master' of https://github.com/worklist/hifi into scripting_improvements
|
2014-03-25 01:01:55 -07:00 |
|
ZappoMan
|
55622d5f23
|
add stub of default script
|
2014-03-25 00:46:07 -07:00 |
|
ZappoMan
|
a613da8032
|
add Script.include()
|
2014-03-24 21:25:59 -07:00 |
|
ZappoMan
|
547ea047e3
|
cleanup extra debug
|
2014-03-24 16:33:12 -07:00 |
|
ZappoMan
|
03c2ec9376
|
add example of selecting the audio device from a menu
|
2014-03-24 16:28:45 -07:00 |
|
ZappoMan
|
778209ffe4
|
fix bug in Menu.removeMenu() for trees of menus
|
2014-03-24 16:28:07 -07:00 |
|
ZappoMan
|
c623d8e9ac
|
tweak example script
|
2014-03-24 13:07:42 -07:00 |
|
ZappoMan
|
7ef1fe3a74
|
add support for listing all audio devices and default device in JS
|
2014-03-24 09:15:03 -07:00 |
|
ZappoMan
|
55b844ed6a
|
add sample scripts
|
2014-03-23 11:27:06 -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
|
3721ce8e43
|
Added boundaries to altitude and changed radius rate
|
2014-03-21 14:30:12 -07:00 |
|
Atlante45
|
c10d78c397
|
Fixed bug when mouse leaves window.
|
2014-03-21 14:29:19 -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
|
a30c4268da
|
wave work for bot
|
2014-03-20 15:47:42 -07:00 |
|
Atlante45
|
4604f5333d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js
|
2014-03-20 12:15:55 -07:00 |
|
Atlante45
|
a95befb02e
|
Added new script inspect.js
|
2014-03-20 12:15:38 -07:00 |
|
Philip Rosedale
|
c778794a4c
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-20 08:54:21 -07:00 |
|
Philip Rosedale
|
3ab0288c4f
|
testing numbered joint movement
|
2014-03-20 08:54:12 -07:00 |
|
Stephen Birarda
|
cbbe4af65f
|
fix crash in bot.js with incorrect playSound
|
2014-03-19 17:17:52 -07:00 |
|
Philip Rosedale
|
774b99d868
|
merge fix
|
2014-03-19 17:14:03 -07:00 |
|
Philip Rosedale
|
22048aaba5
|
Merge pull request #2392 from birarda/audio-scaling
allow Agents to send microphone audio using Sound objects
|
2014-03-19 17:00:46 -07:00 |
|
Philip Rosedale
|
527c0f5a73
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-19 16:27:39 -07:00 |
|
Philip Rosedale
|
69a83ee94d
|
add bots able to see voxels
|
2014-03-19 16:27:27 -07:00 |
|
Stephen Birarda
|
dd9c4aa854
|
changes to bot.js for new Agent microphone audio
|
2014-03-19 16:18:44 -07:00 |
|
Philip Rosedale
|
c26ed77931
|
merge fix
|
2014-03-19 09:16:52 -07:00 |
|
Philip Rosedale
|
83026fa2ca
|
added skeet to gun, display joint names to log in crazy legs
|
2014-03-18 22:22:40 -07:00 |
|
Philip Rosedale
|
24c779e551
|
Fix bug in extrusion deleting first voxel made
|
2014-03-18 22:05:51 -07:00 |
|
ZappoMan
|
59b272d8db
|
make seeing voxels less noisy and more random
|
2014-03-17 13:47:46 -07:00 |
|
ZappoMan
|
f8e38382a8
|
Merge branch 'master' of https://github.com/worklist/hifi into experimental_scaling
|
2014-03-16 19:37:41 -07:00 |
|
Brad Hefta-Gaub
|
6588002c8b
|
Merge pull request #2317 from ey6es/master
Return the legs to the default position when we stop "crazylegs."
|
2014-03-14 17:25:56 -07:00 |
|
Andrzej Kapolka
|
608fa5869d
|
Return the legs to the default position when we stop the script.
|
2014-03-14 14:51:33 -07:00 |
|
Philip Rosedale
|
85cc04f172
|
merge with upstream/master
|
2014-03-14 14:35:48 -07:00 |
|
Brad Hefta-Gaub
|
8f200e917b
|
fix JS radians vs degrees issues
|
2014-03-14 13:03:14 -07:00 |
|
ZappoMan
|
8afbcae365
|
tweak to seeing load test
|
2014-03-14 00:43:11 -07:00 |
|
Philip Rosedale
|
88a0aa4221
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-13 21:37:40 -07:00 |
|
Philip Rosedale
|
902112437a
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-12 15:49:56 -05: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 |
|
Philip Rosedale
|
2582b0007e
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-03-07 16:50:14 -06:00 |
|
Atlante45
|
045f0d5f21
|
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
|
2014-03-07 14:33:37 -08:00 |
|
Andrzej Kapolka
|
44374732fa
|
Further joint bits.
|
2014-03-06 19:30:24 -08: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
|
d455c192e6
|
merge fix
|
2014-03-05 18:20:38 -08:00 |
|
Philip Rosedale
|
655eb2658c
|
Adding scoring, throwing targets
|
2014-03-05 18:18:57 -08:00 |
|
ZappoMan
|
a54e401377
|
Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration
Conflicts:
libraries/script-engine/src/Vec3.cpp
|
2014-03-05 18:04:57 -08: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
|
d89cb2bf5e
|
added penetration support to particle collisions JS callbacks
|
2014-03-05 15:03:54 -08: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
|
15b5bb4385
|
Merge branch 'master' of https://github.com/worklist/hifi into flocking_birds
Conflicts:
examples/bot.js
|
2014-03-05 02:21:40 -08:00 |
|
ZappoMan
|
161e04f1a8
|
flocking bird JS
|
2014-03-05 02:20:03 -08:00 |
|
ZappoMan
|
2e3e699e31
|
Merge pull request #2199 from PhilipRosedale/master
Adjustable bot pelvis height
|
2014-03-04 18:47:01 -08:00 |
|
Philip Rosedale
|
2c27c6b8c1
|
adjustable height of bot avatars
|
2014-03-04 15:03:30 -08:00 |
|
ZappoMan
|
374af9eeb5
|
first cut at flocking birds, change willEmitVisualCallback to update
|
2014-03-04 14:40:49 -08:00 |
|
Atlante45
|
894f85fcb5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-03-04 10:49:26 -08:00 |
|
Philip Rosedale
|
028b816e5b
|
smaller damage
|
2014-03-03 22:17:55 -08:00 |
|
Philip Rosedale
|
897c2b8267
|
Add sounds for gun, reticle, mouse look firing
|
2014-03-03 22:14:59 -08:00 |
|
Atlante45
|
de679b20ad
|
Removed deadlock from merge
|
2014-03-03 18:48:11 -08:00 |
|
Atlante45
|
357d71e637
|
Added stuff to localVoxelsExample.js
|
2014-03-03 17:52:49 -08:00 |
|
Atlante45
|
f1ce034c35
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-03-03 16:47:42 -08:00 |
|
Atlante45
|
ef9ff0fa74
|
Put initialization and deletion of localVoxelSystems on render thread
|
2014-03-03 16:46:25 -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 |
|
Atlante45
|
2ee7974fa8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-02-27 17:53:59 -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 |
|
Atlante45
|
b033432684
|
Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels
|
2014-02-27 14:36:44 -08: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 |
|
Atlante45
|
878259de48
|
Added example file for LocalVoxels use
|
2014-02-25 16:30:01 -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 |
|
Stephen Birarda
|
2626d7db8c
|
add a bot example script
|
2014-02-20 11:14:50 -08:00 |
|
ZappoMan
|
d04166811e
|
wired up voxel size slider to actually change voxel size
|
2014-02-20 02:24:26 -08:00 |
|
ZappoMan
|
7cab5013cc
|
more work to wire up voxel size slider and +/- keys
|
2014-02-20 01:20:56 -08:00 |
|
ZappoMan
|
66d757863c
|
adding first cut at voxel size slider to editVoxels.js
|
2014-02-19 23:52:29 -08:00 |
|
ZappoMan
|
546ab51ed5
|
add click support to color swatchs in editVoxels.js
|
2014-02-19 22:37:43 -08:00 |
|
ZappoMan
|
cbacf5f328
|
correctly draw tools when in orbit mode
|
2014-02-19 22:30:28 -08:00 |
|
ZappoMan
|
61d9ea44af
|
add tool palette and eye dropper mode
|
2014-02-19 22:17:19 -08:00 |
|
ZappoMan
|
cbf1b09552
|
fix small bug in line preview mode
|
2014-02-19 21:07:52 -08:00 |
|
ZappoMan
|
f506c21590
|
add line preview mode to editVoxels.js and make that the default mode
|
2014-02-19 20:57:58 -08:00 |
|
ZappoMan
|
0e8cab7349
|
added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs
|
2014-02-19 20:09:35 -08:00 |
|
ZappoMan
|
91d79f65f2
|
fix crash on import from JS
|
2014-02-19 17:57:28 -08:00 |
|
ZappoMan
|
7662264af8
|
more work on clipboard example
|
2014-02-19 17:48:38 -08:00 |
|
ZappoMan
|
2a57080191
|
add clipboard example
|
2014-02-19 15:06:10 -08:00 |
|
ZappoMan
|
baa1762056
|
added support for overlays to editVoxels.js
|
2014-02-18 16:23:34 -08:00 |
|
ZappoMan
|
b8673db9aa
|
remove unneeded example
|
2014-02-18 09:58:14 -08:00 |
|
ZappoMan
|
5cf0ad46e7
|
Merge pull request #2000 from gaitat/master
Worklist Job #19503
|
2014-02-18 09:47:26 -08:00 |
|
ZappoMan
|
78f4df912d
|
added 3D line overlay support
|
2014-02-16 13:25:49 -08:00 |
|
ZappoMan
|
6b410253d4
|
update comments in example
|
2014-02-16 12:42:26 -08:00 |
|
ZappoMan
|
7c350b3acb
|
add 3D sphere overlay support
|
2014-02-16 12:30:15 -08:00 |
|
gaitat
|
03d3a535f8
|
Fix for Worklist Job #19503
Added random sound trigger to the examples
|
2014-02-16 14:50:50 -05:00 |
|
ZappoMan
|
5abf908874
|
added 3D cube overlay support
|
2014-02-16 11:36:06 -08:00 |
|
ZappoMan
|
ef11865d24
|
implement text overlay support
|
2014-02-15 21:13:44 -08:00 |
|
gaitat
|
e30cf33a03
|
Fix for Worklist Job #19503
Formatting errors
|
2014-02-15 23:04:58 -05:00 |
|
ZappoMan
|
37bb85fca6
|
tweaks to overlays
|
2014-02-15 19:15:30 -08:00 |
|
ZappoMan
|
f7f695d145
|
add support for detecting clicked on overlays
|
2014-02-15 17:45:42 -08:00 |
|