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
|
1fca763b9d
|
removed whitespace to get build to run
|
2014-02-11 12:43:48 -08:00 |
|
ZappoMan
|
991c72006c
|
moving the hydra grab behavior to JS
|
2014-02-10 17:25:14 -08:00 |
|
ZappoMan
|
0c547a8160
|
added Quat.safeEulerAngles() for JS
|
2014-02-10 15:37:49 -08:00 |
|
ZappoMan
|
e35df7904b
|
cleanup bad merge
|
2014-02-09 12:32:12 -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
|
9c21eb7949
|
removed comments
|
2014-02-09 02:56:26 -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 |
|
Stephen Birarda
|
455442088c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer
|
2014-02-07 13:45:14 -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 |
|
ZappoMan
|
e50f6389ca
|
add more JS Quat features
|
2014-02-07 00:00:30 -08:00 |
|
Stephen Birarda
|
f10404b31e
|
allow setting of avatar URLs via AvatarData properties
|
2014-02-06 11:45:37 -08:00 |
|
Stephen Birarda
|
e72f6d16cc
|
rename NodeList ownerUUID to sessionUUID
|
2014-02-06 11:43:23 -08:00 |
|
Stephen Birarda
|
d563c89482
|
fix for ScriptEngine crash
|
2014-02-03 16:25:38 -08:00 |
|
ZappoMan
|
c739c2452a
|
Merge pull request #1832 from birarda/script-timer
hide ScriptEngine calls from JS
|
2014-02-03 12:45:41 -08:00 |
|
AndrewMeadows
|
6dc959f780
|
Merge pull request #1831 from ZappoMan/scripting
More scripting work
|
2014-02-03 12:43:56 -08:00 |
|
Stephen Birarda
|
028eec7164
|
don't allow calls to init, run, evaluate from JS
|
2014-02-03 10:33:31 -08:00 |
|
Stephen Birarda
|
e2842ab7a4
|
stop timers when the script does, add cleanup methods
|
2014-02-03 10:10:58 -08:00 |
|
ZappoMan
|
8b2f185937
|
always emit update even when no servers
|
2014-02-03 10:05:26 -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 |
|
ZappoMan
|
ed3f7b9d28
|
Merge pull request #1822 from birarda/cleanup
application destructor cleanup, spacing cleanup
|
2014-01-31 18:03:19 -08:00 |
|
AndrewMeadows
|
867b66e73e
|
Merge pull request #1817 from ZappoMan/more_scripting_work
More scripting work
|
2014-01-31 17:54:44 -08:00 |
|
Stephen Birarda
|
d65a3ee174
|
spacing cleanup in Application and ScriptEngine
|
2014-01-31 17:38:53 -08:00 |
|
Stephen Birarda
|
d2fd4bf445
|
expose QTimer to the script engine
|
2014-01-31 16:36:44 -08:00 |
|
Stephen Birarda
|
dd83ff0538
|
move isAvatar property access to Agent object
|
2014-01-31 14:36:50 -08:00 |
|
ZappoMan
|
9798538ea5
|
Merge branch 'master' of https://github.com/worklist/hifi into more_scripting_work
Conflicts:
libraries/particles/src/Particle.cpp
libraries/particles/src/ParticlesScriptingInterface.cpp
|
2014-01-31 14:10:45 -08:00 |
|
AndrewMeadows
|
bed63513a9
|
Merge pull request #1745 from ZappoMan/scripting_work
support for global collision callbacks in JS
|
2014-01-31 10:42:44 -08:00 |
|
Stephen Birarda
|
79c8f91c78
|
instantiate isAvatar in ScriptEngine to false, closes #1779
|
2014-01-31 10:15:17 -08:00 |
|
ZappoMan
|
3b17550d92
|
make sure to flush edit queue on script shutdown
|
2014-01-30 16:36:26 -08:00 |
|
ZappoMan
|
8b9f6813ca
|
add easier support for key codes in JS by adding text property and auto-detecting isShifted
|
2014-01-30 12:28:58 -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
|
ed0a2a5a18
|
Merge branch 'master' of https://github.com/worklist/hifi into scripting_work
Conflicts:
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
libraries/voxels/src/VoxelEditPacketSender.cpp
|
2014-01-29 19:49:36 -08:00 |
|
ZappoMan
|
08b06cc59c
|
support for global collision callbacks in JS
|
2014-01-29 17:52:17 -08:00 |
|
Stephen Birarda
|
33edcea5fb
|
resolve conflicts on merge with upstream master
|
2014-01-29 12:23:06 -08:00 |
|
ZappoMan
|
98cdc656c4
|
more scripting support, including adding a Quat helper class that makes JS quat math easier
|
2014-01-29 00:56:08 -08:00 |
|
ZappoMan
|
305e69def6
|
really get controller key, mouse, etc scripting working
|
2014-01-28 19:47:45 -08:00 |
|
ZappoMan
|
febb306a62
|
cleaned up some registration of global objects
|
2014-01-28 19:46:59 -08:00 |
|
ZappoMan
|
7882d50c5f
|
hacking on controller events
|
2014-01-28 14:58:20 -08:00 |
|
ZappoMan
|
5addc35cd8
|
hacking on controller events
|
2014-01-28 14:58:08 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
2aaa9ce3f6
|
resolve conflicts on merge with upstream master
|
2014-01-28 12:30:43 -08:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
ZappoMan
|
bcaafb25f0
|
added findParticles() to JS api
|
2014-01-24 12:36:06 -08:00 |
|