wangyix
0dfe0b1f2a
merged with master
2014-08-08 13:32:27 -07:00
David Rowe
f3b4f708a5
Add Script.load() JavaScript method
2014-07-31 21:50:07 -07:00
wangyix
4825457f4d
silent audio packet type generalized
2014-07-28 16:49:53 -07:00
Atlante45
17a6a72bdd
ScriptEngine now inherit from QScriptEngine
2014-07-22 11:39:49 -07:00
Brad Hefta-Gaub
d8d6d08958
Merge pull request #3145 from samcake/19734
...
19734 - Leapmotion support
2014-07-17 08:45:55 -07:00
Andrzej Kapolka
2d4134afaf
Provide basic conversions to/from SharedObjectPointer (still have to work out
...
how to handle reference counting correctly).
2014-07-15 17:58:31 -07:00
Atlante45
30fd4e27d0
pre-CR cleanup
2014-07-14 10:43:01 -07:00
Andrew Meadows
8ffc3aa73d
merge upstream/master into andrew/thermonuclear (AKA samcake/19734)
...
Conflicts:
interface/src/Application.cpp
2014-07-14 09:10:27 -07:00
Atlante45
aa65084ae1
Code cleanup
2014-07-11 23:08:41 -07:00
Atlante45
6d4bb0f4fd
Added Uint8ClampedArray
2014-07-11 18:27:26 -07:00
Atlante45
3070ac457f
Typed arrays bug fixing
2014-07-10 18:33:57 -07:00
samcake
c66560c1c0
Fix C++11 usage
...
- replace all the auto keyword by the proper type
kept the auto line in todo for reference :)
- silent a few warnings
2014-07-10 16:45:12 -07:00
Atlante45
b2b1701965
- Bunch of fixes to typed arrays
...
- First working prototype for Int8Array
- Base classes for all other typed arrays
2014-07-09 17:47:09 -07:00
Atlante45
49302b2340
Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays
2014-07-09 09:49:34 -07:00
David Rowe
bc785115a9
Fix script errors not being reported
...
Script.update event needs to be emitted after reporting any script errors.
2014-07-08 16:33:31 -07:00
Atlante45
7fe88a4426
Hooked up ArrayBuffer, ArrayBufferView and DataView to ScriptEngine
2014-07-08 16:10:22 -07:00
Atlante45
f9b739a0d1
Functional ArrayBuffer class following Qt standard
2014-07-07 18:02:33 -07:00
samcake
abacefa723
Merge remote-tracking branch 'upstream/master' into 19734
...
Conflicts:
interface/CMakeLists.txt
interface/src/avatar/SkeletonModel.cpp
2014-07-05 19:25:46 -07:00
samcake
fca3a6aa13
Merge branch 'master' of https://github.com/highfidelity/hifi into 19734
2014-07-05 18:10:59 -07:00
Clément Brisset
4798cad1e5
Merge pull request #3121 from ZappoMan/animationFrameIndex
...
adds JavaScript API for getting the current animationDetails (state) for avatar animations
2014-07-03 13:45:27 -07:00
ZappoMan
a53d007c33
add support for getting current animation details for running avatar animations
2014-07-03 11:59:18 -07:00
Stephen Birarda
6038c33fe6
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 11:12:19 -07:00
Stephen Birarda
0a3a8b0693
remove space at the top of the ScriptEngine file
2014-07-03 10:45:43 -07:00
Stephen Birarda
0af79c4d95
fix for script agent audio missing channel flag
2014-07-03 10:45:05 -07:00
Stephen Birarda
f1e2ba1267
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-07-03 09:25:03 -07:00
Atlante45
2549b0d946
Switched ScriptEngine to NetworkAccessManager
2014-07-02 11:22:44 -07:00
Stephen Birarda
f389e3a6da
resolve conflicts on merge with upstream master
2014-07-01 11:02:25 -07:00
Brad Hefta-Gaub
df51d26625
Merge pull request #3094 from wangyix/seqNumberStats
...
Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;
2014-07-01 10:54:35 -07:00
Stephen Birarda
5ba4a4dbb5
initial pass of MIDI implementation that bubbles events to JS
2014-07-01 09:53:18 -07:00
samcake
a8b875d32e
Merge remote-tracking branch 'origin/LeapMotion' into 19734
2014-07-01 03:20:26 -07:00
samcake
3ce455aba4
Support for LeapMotion and worklist 19734
...
- Introduce the DeviceTracker class to abstract all the possible
devices
- Introduce the MotionTracker ( a DeviceTracker ) that contains a
transform tree of joints
- Add Leapmotion class as a MotionTracker and the support for the
Leapmotion sdk in external
- Add InputController as the abstraction of a MotionTracker/Joint for
Javascript
2014-07-01 03:15:26 -07:00
wangyix
c789f3c6b9
merge with upstream
2014-06-30 14:13:34 -07:00
wangyix
c4a85736e7
removed unnecessary changes from ScriptEngine
2014-06-30 13:51:43 -07:00
wangyix
de3c1ebf0f
changed class name to AudioStreamStats, reverted ScriptEngine packing back to QDataStream
2014-06-30 09:42:22 -07:00
David Rowe
742007892f
Rework old fix for Script Editor Script.stop() crash
2014-06-29 19:57:26 -07:00
wangyix
4587828a3a
removed debug prints
2014-06-27 16:48:21 -07:00
wangyix
ff438a2434
added seq stats for Agent,
...
fixed AudioInjector to do << (quint16)0 instead of
skipRawData(sizeof(quint16) to correctly allocate space for seq number;
added debug prints;
2014-06-27 11:23:50 -07:00
wangyix
cb48825561
added seq number to all Audio types, untested
2014-06-26 16:52:23 -07:00
David Rowe
e92ad86282
Clear script engine errors once they have been reported
...
So that an error is not repeatedly reported to the console and log file.
Also consistently report filename.
And scripts included after one in error will now be run.
2014-06-25 10:51:18 -07:00
Ryan Huffman
89fbeb0b6d
Fix invalid remote scripts being loaded
2014-06-17 13:09:48 -07:00
Ryan Huffman
099777ef8c
Merge branch 'master' of git://github.com/highfidelity/hifi into 19648
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-26 10:01:44 -07:00
Ryan Huffman
8aa9cea30e
Add custom evaluation of commands in ScriptEngine
2014-05-26 09:59:02 -07:00
ZappoMan
efd0580cfb
add ray picking to the model scripting interface
2014-05-23 17:09:37 -07:00
Atlante45
0f19890048
Fixes filesystem issue between Qt and Windows
2014-05-18 19:27:43 -07:00
Brad Hefta-Gaub
8bb5b90f05
Merge pull request #2852 from huffman/19614
...
Code Review for Job #19614
2014-05-14 10:40:14 -07:00
Ryan Huffman
c16654628a
Add carriage return to escaped string in print()
2014-05-14 10:08:54 -07:00
Ryan Huffman
bd56ab911d
Fix bug with js print() breaking on certain characters
...
The message text needs to be escaped before beign evaluated.
2014-05-14 10:05:04 -07:00
Ryan Huffman
dca555a8d4
Merge branch 'master' of git://github.com/highfidelity/hifi into 19614
2014-05-14 09:58:59 -07:00
Andrzej Kapolka
f866828db2
Avatar attachment scripting bits.
2014-05-08 15:20:14 -07:00
Stephen Birarda
99ee6ae8af
return an injector from playSound and allow user to stop it
2014-05-07 16:26:32 -07:00
