Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 06:49:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
16974 commits 25 branches 0 tags 1.1 GiB
Commit graph

944 commits

Author SHA1 Message Date
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
ZappoMan
f6adce255d more work on image overlays 2014-02-15 16:26:34 -08:00
gaitat
fcd44f5817 Fix for Worklist Job #19503 2014-02-15 08:16:05 -05:00
gaitat
eee839f423 Merge branch 'master' of github.com:highfidelity/hifi 2014-02-14 20:12:39 -05:00
ZappoMan
2eac9c293f first working version of scriptable Overlays 2014-02-14 15:37:47 -08:00
gaitat
58e773340a Worklist Job #19503 
Exposing the average audio intensity to javascript through the MyAvatar
object.
 2014-02-14 09:40:59 -05:00
Philip Rosedale
3a807c1914 comment out debugging spam, improved EditVoxels 2014-02-12 17:57:52 -08:00
Philip Rosedale
0322c8b934 Added minimum sample counting method for noise reduction 2014-02-11 23:44:22 -08:00
Philip Rosedale
1412d49a2f merge fix 2014-02-11 15:08:49 -08:00
Philip Rosedale
b6edd7be7b add Vec3::subtract in JS 2014-02-11 15:07:25 -08:00
ZappoMan
9244180cb4 removed debug 2014-02-10 20:27:39 -08:00
ZappoMan
4b2ddc9021 remove dead comment 2014-02-10 19:53:34 -08:00
ZappoMan
4b5e633258 tweaks to hydraMove.js, added scale to MyAvatar JS 2014-02-10 19:48:51 -08:00
ZappoMan
8b45e0e3a8 Merge branch 'master' of https://github.com/worklist/hifi into move_hydra_flying_to_js 2014-02-10 17:34:35 -08:00
Philip Rosedale
49292a478e EditVoxels.js: Added new voxel making in front of camera with ‘9’ 2014-02-10 17:28:24 -08:00
ZappoMan
991c72006c moving the hydra grab behavior to JS 2014-02-10 17:25:14 -08:00
Philip Rosedale
65121aefb6 EditVoxels.js: Added color changing with number keys, better audio 2014-02-10 16:42:05 -08:00
ZappoMan
3f73b61a76 renamed hydraMove.js 2014-02-10 15:38:19 -08:00
ZappoMan
8acb6d13d5 move hydra thrust and view code into JS example 2014-02-10 15:25:09 -08:00
ZappoMan
f8a24a2e99 fix crash in multiple voxel edit scripts running simultaneously 2014-02-10 12:19:46 -08:00
ZappoMan
bdf5c7a6b7 changed stopKeepLookingAt() to stopLooking() 2014-02-09 23:26:46 -08:00
ZappoMan
d5447452ae more work on lookAt behavior 2014-02-09 21:06:32 -08:00
ZappoMan
a457ccf933 simple example of Camera.lookAt() 2014-02-09 16:25:18 -08:00
ZappoMan
fe1a6b8f29 improvements to rotating gesture detection 2014-02-09 12:29:57 -08:00
ZappoMan
dca0b05927 added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties 2014-02-09 12:08:17 -08:00
ZappoMan
3bf8dd87e8 Merge branch 'master' of https://github.com/worklist/hifi into more_events 2014-02-09 10:32:14 -08:00
ZappoMan
70c5e674e9 add rotating detection to touch events 2014-02-09 02:54:12 -08:00
ZappoMan
d2b3e74f5d added isPinching and isPinchOpening to touch events 2014-02-09 02:02:42 -08:00
ZappoMan
120807f9ba add touch event radius 2014-02-09 01:31:48 -08:00
ZappoMan
02e6a3336d added several new JS events attributes 2014-02-09 01:05:27 -08:00
Philip Rosedale
cfa7f5e6ca Add drag to add more voxels, turn off hover orbit voxels until in the script as function key 2014-02-08 23:17:04 -08:00
Philip Rosedale
6b0c31e6e9 Script for editing voxels with mouse clicks 2014-02-08 20:47:02 -08:00
Philip Rosedale
c6bf11361e Merge branch 'master' of https://github.com/worklist/hifi 2014-02-08 16:52:28 -08:00
ZappoMan
e9070b1d70 add an example of adding a voxel when clicking on a voxel 2014-02-07 15:48:46 -08:00
ZappoMan
ac05c6d4c3 add example code 2014-02-07 15:21:16 -08:00
Philip Rosedale
8ca7a60927 Merge branch 'master' of https://github.com/worklist/hifi 2014-02-07 11:21:26 -08:00
ZappoMan
2157349804 added Camera.computePickRay() 2014-02-07 09:40:52 -08:00
ZappoMan
41f6650b20 implement movable independent camera with hydra 2014-02-07 01:23:30 -08:00
Philip Rosedale
a9b330baff Merge branch 'master' of https://github.com/worklist/hifi 2014-02-06 07:46:26 -08:00
ZappoMan
3e08a0b48b fix spacebar capture 2014-02-05 13:26:46 -08:00
Philip Rosedale
d88d598e2b Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 21:29:38 -08:00
ZappoMan
5afe184c3b removed debug 2014-02-04 21:16:07 -08:00
ZappoMan
7ffe73bf6e added the cannon as voxels 2014-02-04 21:14:49 -08:00
ZappoMan
15be49cb8d latest changes to space invaders 2014-02-04 21:08:12 -08:00
ZappoMan
758c1e0817 add examples for setting model scale and translation 2014-02-04 20:28:11 -08:00
Philip Rosedale
7935e68e7a Merge branch 'master' of https://github.com/worklist/hifi 2014-02-04 14:33:33 -08:00
ZappoMan
785e76102f change game at for space invaders to be close to avatar 2014-02-04 14:22:22 -08:00
ZappoMan
461a600d7f add sounds to space invaders 2014-02-04 14:04:33 -08:00
ZappoMan
2b429ba2d3 downward motion to space invaders 2014-02-04 13:18:19 -08:00
Philip Rosedale
5b709aa60c merge fix 2014-02-03 16:09:53 -08:00
Philip Rosedale
3f5aa083d7 improved bird behavior 2014-02-03 16:08:59 -08:00
AndrewMeadows
6dc959f780 Merge pull request #1831 from ZappoMan/scripting 
More scripting work
 2014-02-03 12:43:56 -08:00
ZappoMan
f33f4e9cc2 change invaders to use absolute positions 2014-02-03 11:09:30 -08:00
ZappoMan
f41d2a3c02 change Agent to Script 2014-02-03 10:35:25 -08:00
Stephen Birarda
e2842ab7a4 stop timers when the script does, add cleanup methods 2014-02-03 10:10:58 -08:00
ZappoMan
906d913d71 added more examples, updated lookWithMouse.js to support alwaysLook 2014-02-03 10:05:07 -08:00
Stephen Birarda
9dd8c11e1e change script timer setup to match HTML dom standard 2014-02-03 09:59:16 -08:00
Stephen Birarda
d9cfaec4f0 Merge branch 'master' of https://github.com/highfidelity/hifi into script-timer 2014-02-03 09:32:13 -08:00
Stephen Birarda
a7f2406505 add an example timer script 2014-01-31 16:40:24 -08:00
Stephen Birarda
dba7fbceac remove extra Script and commented out line 2014-01-31 15:00:35 -08:00
Stephen Birarda
9015b24aa5 update the script examples for new nomenclature 2014-01-31 14:41:24 -08:00
ZappoMan
da5e0f55b6 add easier support for key codes in JS by adding text property and auto-detecting isShifted 2014-01-30 12:26:50 -08:00
ZappoMan
01c369716e implement a basic exampple of ride along with a particle 2014-01-29 20:55:12 -08:00
ZappoMan
a048799367 fix header comment 2014-01-29 20:54:22 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
ecd2477007 adding lookWithMouse.js example that uses mouse instead of multi-touch to add the look around feature 2014-01-29 01:01:41 -08:00
ZappoMan
a73733e57b controller scripting example 2014-01-28 19:48:06 -08:00
ZappoMan
64afd17d14 include particle radius in model scaling 2014-01-28 11:49:11 -08:00
ZappoMan
bd0631838d example of setting particle model with JS 2014-01-28 11:19:04 -08:00
ZappoMan
13a92bc3c9 tweaks to editParticle example 2014-01-27 11:11:20 -08:00
Philip Rosedale
56e90323f9 merge fix 2014-01-25 09:42:36 -08:00
ZappoMan
afb7ab07da added new example of particle bird 2014-01-24 15:35:21 -08:00
ZappoMan
2720b98d57 fix comment 2014-01-24 13:00:54 -08:00
ZappoMan
c5dd94f0cf add example 2014-01-24 13:00:01 -08:00
Philip Rosedale
b0e1018771 Add particle-based bird 2014-01-24 11:01:09 -08:00
Philip Rosedale
5d1a320dd0 fixed merge 2014-01-23 13:50:44 -08:00
ZappoMan
d2bf3a2a5d set default particle lifetime to 10 seconds, make sure lifetime is always honored 2014-01-23 13:46:12 -08:00
Philip Rosedale
86e37f8fc2 new sounds for drumsticks 2014-01-23 11:53:46 -08:00
Brad Hefta-Gaub
aacad00791 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	interface/src/Application.cpp
 2014-01-22 11:16:21 -08:00
Brad Hefta-Gaub
c3b681786a make particles and voxels JS APIs all operate on meters not domain units 2014-01-22 11:12:52 -08:00
Brad Hefta-Gaub
1b5938d0af new toyball script that is DRY-er 2014-01-22 09:48:04 -08:00
Brad Hefta-Gaub
64940a04ff latest toyball script 2014-01-22 09:18:01 -08:00
Philip Rosedale
6ba5daad0c better comments in script 2014-01-22 08:44:43 -08:00
Philip Rosedale
5d9cf23ac5 Added drumSticks example script 2014-01-22 08:38:45 -08:00
Brad Hefta-Gaub
cefac50100 adding toyball script 2014-01-21 20:05:41 -08:00
Brad Hefta-Gaub
eb1e72b838 fix a bug where x was only attribute being copied for vec3s WHT 2014-01-21 16:40:03 -08:00
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
1c5e32fcb1 add example of new particle edit JS api 2014-01-21 14:08:19 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
ZappoMan
17abbc4715 Merge pull request #1586 from PhilipRosedale/master 
Clap script and better bird sounds
 2014-01-20 09:06:28 -08:00
Philip Rosedale
618c324e82 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 20:29:24 -08:00
Philip Rosedale
4547f07739 added fountain script 2014-01-17 17:10:15 -08:00
Philip Rosedale
5abf612990 new sounds for voxelBird, clap scripts 2014-01-17 16:43:43 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
Brad Hefta-Gaub
785d84d0ca added count example 2014-01-17 09:55:34 -08:00
Philip Rosedale
7f09aff297 Added voxelBird example script 2014-01-14 17:12:14 -08:00
Philip Rosedale
8efd09befa bullets smaller and slower 2014-01-05 16:40:02 -08:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Philip Rosedale
a2c33aadba two script example files 2014-01-03 17:58:00 -08:00
ZappoMan
32ec15beb7 added comments to example scripts 2013-12-31 12:24:37 -08:00
ZappoMan
8f9a99e1f4 add example scripts 2013-12-31 12:13:06 -08:00