Commit graph

230 commits

Author SHA1 Message Date
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