Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 20:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27791 commits 71 branches 56 tags 1.2 GiB
Commit graph

571 commits

Author SHA1 Message Date
Brad Hefta-Gaub
c39c716755 Merge pull request #3679 from AndrewMeadows/inertia 
move code out of "shared" and into new "physics" lib
 2014-10-28 15:25:38 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Ryan Huffman
c802c74396 Add comment to new redo functionality 2014-10-28 13:48:48 -07:00
Ryan Huffman
cce1e23eec Update UndoStackScriptingInterface to not call redo automatically 2014-10-28 13:43:22 -07:00
Stephen Birarda
bb652c0784 rename signal in AbstractControllerScriptingInterface from cancel to back 2014-10-27 16:01:39 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
Stephen Birarda
8556b8b95d fix HFMetaEvent headers for new placement 2014-10-27 15:28:02 -07:00
Stephen Birarda
a12e0dd0dc fix HFActionEvent headers for new placement 2014-10-27 15:27:27 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Stephen Birarda
76493597da move SpatialEvent from EventTypes to its own file 2014-10-27 14:47:44 -07:00
Stephen Birarda
818c97fcaf move WheelEvent out of EventTypes into its own file 2014-10-27 14:41:23 -07:00
Stephen Birarda
e72409bf39 move TouchEvent out of EventTypes to its own file 2014-10-27 14:37:04 -07:00
Stephen Birarda
3aa7c3c7dc move MouseEvent out of EventTypes into its own file 2014-10-27 14:30:20 -07:00
Stephen Birarda
5a390da509 move KeyEvent from EventTypes to its own file 2014-10-27 14:24:32 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Stephen Birarda
f8b423ced6 bubble up isAutoRepeat state for KeyEvent 2014-10-24 16:12:15 -07:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Atlante45
a48811777e Script engine audio dependency 2014-10-22 15:26:16 -07:00
Ryan Huffman
ac8d947cb1 Update ScriptUndoCommand to run on ScriptEngine thread 2014-10-22 15:18:49 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Philip Rosedale
2a5b2d8686 Improved version of headMove with timed target reveal 2014-10-21 11:40:16 -07:00
Atlante45
ee4c7c25bf Header fix 2014-10-20 16:50:49 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
Atlante45
f09dc1aeac remove deprecated _engine member from ScriptEngine 2014-10-14 15:17:31 -07:00
NextPrior
a0a5530641 Initial reverb implementation 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Audio.cpp
	interface/src/Audio.h
	libraries/script-engine/src/ScriptEngine.cpp
 2014-10-13 18:13:51 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
ZappoMan
b50e996ec8 added Vec3.orientedAngle() 2014-10-09 17:35:58 -07:00
Stephen Birarda
d064919cb0 fix a missed reference to NetworkAccessManager 2014-10-08 10:41:16 -07:00
Stephen Birarda
7773a94df7 resolve conflicts on merge with upstream master 2014-10-08 09:27:16 -07:00
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
ZappoMan
07832fdd68 fix include for https relative urls 2014-10-06 14:34:19 -07:00
ZappoMan
aa634c8ff2 added new methods to Vec3 and Quat 2014-10-02 17:55:32 -07:00
Atlante45
f50b42fd16 Read new Sound() arg 2014-09-25 19:15:16 -07:00
Stephen Birarda
00b0806c4d move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick 2014-09-23 17:09:46 -07:00
Stephen Birarda
900daf48eb initial working connection of an xbox gamepad 2014-09-23 14:48:44 -07:00
Brad Hefta-Gaub
631171eb2e Merge pull request #3462 from Atlante45/fix_attachment_bug_with_recording 
Fixes concurrency issue with ScriptEngine timers
 2014-09-21 20:48:05 -07:00
Andrew Meadows
09d3c51120 add multiply(float, Vec3) because multiply commutes 2014-09-19 16:54:03 -07:00
Atlante45
3d8f3ad9fa Fixes concurrency issue with scriptengine timers 2014-09-19 13:21:24 -07:00
Atlante45
66a3683482 Fix timer bug with script engine 
Occurs when Script.clearInterval() called inside
Script.setInterval callback
 2014-09-17 16:48:46 -07:00
ZappoMan
9cbc53abc3 pack position and orientation in silent frames 2014-09-16 13:06:46 -07:00
Ryan Huffman
113e9cf43b Remove use of Quat::rotate 2014-09-12 13:31:07 -07:00
Ryan Huffman
4315d63fb5 Merge branch 'master' of github.com:highfidelity/hifi into 19831 2014-09-11 11:13:13 -07:00
ZappoMan
d734655ab6 fix some recently introduced warnings 2014-09-06 16:03:03 -07:00
Brad Hefta-Gaub
a77739f31c Merge pull request #3369 from ctrlaltdavid/20007 
Code Review for Job #20007
 2014-09-06 15:36:29 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -07:00
Andrew Meadows
51dca12a7b added default case for switch statements 
which avoids warnings about unhandled enum values
 2014-09-05 16:55:42 -07:00
Andrew Meadows
2fdfb125f2 removed signed/unsigned comparisons 2014-09-05 16:55:24 -07:00
Andrew Meadows
c089dbb0bb removed signed/unsigned comparisons 2014-09-05 16:44:33 -07:00
Ryan Huffman
e590f992f6 Merge branch 'master' of git://github.com/highfidelity/hifi into 19831 2014-09-05 10:18:02 -07:00
AndrewMeadows
bd55da4a83 Merge pull request #3335 from ZappoMan/virtualEntities 
Model Server to Entity Server Refactoring
 2014-09-03 15:48:58 -07:00
ZappoMan
ca3cf6d517 removed dead code 2014-09-03 12:42:51 -07:00
Atlante45
a1e6d9e7a1 Protections against null pointers 2014-09-02 12:56:12 -07:00
ZappoMan
2bcad6ab2b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-08-28 21:19:56 -07:00
Craig Hansen-Sturm
e941e58626 merge HEAD with PR-3281 2014-08-26 18:25:40 -07:00
Philip Rosedale
7b86f668a6 Add SPACE to scripting JS, change reset to apostrophe 2014-08-18 23:22:55 -07:00
ZappoMan
32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
 2014-08-18 15:16:35 -07:00
Ryan Huffman
082f618479 Fix bug with KeyEvent key values on lowercase characters 2014-08-14 22:27:43 -07:00
ZappoMan
abe892ddc3 quiet some debugging 2014-08-14 11:36:53 -07:00
ZappoMan
fbe409a0c2 added lots of debugging for octree edit packet sender bug fixed threading issue 2014-08-14 11:23:56 -07:00
wangyix
db0fbcab97 merge with upstream 2014-08-13 11:09:55 -07:00
wangyix
a405cd9a72 repetition-with-fade ready for commit 2014-08-13 11:01:15 -07:00
wangyix
8565e93ba4 more test code (10% drop both directions) 2014-08-12 10:50:34 -07:00
David Rowe
fbaeeef014 Merge branch 'master' into 19840 
Resolved conflicts in editModels.js
 2014-08-11 20:59:37 -07:00
Ryan Huffman
fc82dfc958 Add Quat::rotate 2014-08-09 23:31:02 -07:00
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -07:00
Stephen Birarda
b1310c065c remove TARGET_NAME from cmake macros where it is not required 2014-08-08 13:17:54 -07:00
Stephen Birarda
26f7b1ba62 add macro to link shared dependencies to target 2014-08-08 13:17:54 -07:00
Stephen Birarda
c9f8433a2d tweak setup_hifi_library to bubble up full path of Qt modules 2014-08-08 13:17:54 -07:00
Stephen Birarda
17df6484d4 remove ssize_t and replace with size_t or int where appropriate 2014-08-08 13:17:53 -07:00
Stephen Birarda
93b6f167f5 change more CMakeLists to use simplified hifi library linker 2014-08-08 13:17:53 -07:00
Stephen Birarda
31488e72fe repairs for interface build to succeed 2014-08-08 13:17:53 -07:00
Stephen Birarda
892e30c5e1 get past assignment-client build after cmake auditing 2014-08-08 13:17:53 -07:00
David Rowe
83a868d741 Make XMLHttpRequest automatically authorize API calls 2014-08-07 15:20:30 -07:00
ZappoMan
3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
 2014-08-04 12:01:23 -07:00
David Rowe
f3b4f708a5 Add Script.load() JavaScript method 2014-07-31 21:50:07 -07:00
David Rowe
573ce7261b Add proper sending of ArrayBuffers via JavaScript XMLHttpRequest 2014-07-31 19:24:46 -07:00
ZappoMan
77e1867b11 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/src/Agent.cpp
	assignment-client/src/Agent.h
	examples/editModels.js
	interface/src/Application.h
 2014-07-31 10:34:23 -07:00
Brad Hefta-Gaub
d4d4069f11 Merge pull request #3225 from birarda/master 
cmake file cleanup to suppress warnings on cmake 3.0
 2014-07-30 19:20:18 -07:00
barnold1953
c4a7c2783c Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript 2014-07-30 15:21:49 -07:00
Stephen Birarda
2796f71419 library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
David Rowe
f39aed37b6 Recode and rescale texture file data before uploading 
A recodeImage() method is added to the JavaScript ArrayBuffer object.
 2014-07-29 17:26:42 -07:00
David Rowe
287e3d6800 Compress model and texture file data in multipart/form-data 
A compress() method is added to the JavaScript ArrayBuffer object.
 2014-07-29 13:52:52 -07:00
barnold1953
5c47e9013c Working procedural walk animation with two keyframes 2014-07-28 18:36:25 -07:00
wangyix
4825457f4d silent audio packet type generalized 2014-07-28 16:49:53 -07:00
ZappoMan
805a88b73b Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/editModels.js
	interface/src/entities/EntityTreeRenderer.h
	libraries/models/src/ModelsScriptingInterface.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-28 13:39:35 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
barnold1953
e25ea64b9b Merge branch 'master' of https://github.com/highfidelity/hifi into dancerScript 2014-07-25 11:11:40 -07:00
Philip Rosedale
9a83be618a Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine 
ScriptEngine now inherit from QScriptEngine
 2014-07-24 21:38:13 -07:00
barnold1953
9b629a7326 Added slerp and squad to the Quat scripting interface 2014-07-24 16:55:23 -07:00
Atlante45
3ffc116cc5 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 2014-07-24 13:48:23 -07:00
Thijs Wenker
49fcd302f4 AbstractControllerScriptingInterface matches ControllerScriptingInterface 2014-07-24 00:16:00 +02:00
Atlante45
95c98203a9 Replaced the Avatar in Agent by a scriptable avatar. 2014-07-23 14:00:49 -07:00
Thijs Wenker
b6cb19c2f6 FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors) 2014-07-23 16:55:59 +02:00
David Rowe
ed7bd9317e Make XMLHttpRequest return an ArrayBuffer object when requested 2014-07-22 21:48:48 -07:00
David Rowe
ffb696dc53 Merge branch 'make_scriptEngine_a_qScriptEngine' of https://github.com/Atlante45/hifi into 19840 2014-07-22 20:21:19 -07:00
Atlante45
17a6a72bdd ScriptEngine now inherit from QScriptEngine 2014-07-22 11:39:49 -07:00
David Rowe
3f24f61180 Provide Content-Type and -Length headers when reading local files 2014-07-20 22:45:19 -07:00
David Rowe
d05435db91 Add arraybuffer binary data handling in JavaScript XMLHttpRequest 2014-07-19 23:27:36 -07:00
David Rowe
33ffed7135 Add GET of local files to JavaScript XMLHttpRequest 2014-07-19 15:47:06 -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
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
ZappoMan
2baac96665 Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	examples/sit.js
	interface/src/Application.cpp
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
 2014-07-15 10:04:40 -07:00
Atlante45
afa43a9d7e Fix win build fail 2014-07-14 11:06:10 -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
5a8569fcd5 Handling NaN values for floats 2014-07-11 17:46:07 -07:00
Atlante45
b9fe5b2ef1 Added JS exceptions + fixed up floating precision mess up 2014-07-11 16:23:19 -07:00
Atlante45
3070ac457f Typed arrays bug fixing 2014-07-10 18:33:57 -07:00
Atlante45
0e5af5afea More work on typed arrays 2014-07-10 18:32:55 -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
b4eb6a2eb7 Some refactoring 2014-07-10 10:09:49 -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
28438d66b1 Fixed exceptions/endian issues with DataViews 2014-07-09 10:27:23 -07:00
Atlante45
49302b2340 Merge branch 'master' of https://github.com/highfidelity/hifi into typed_arrays 2014-07-09 09:49:34 -07:00
Atlante45
4b2e4b7b28 Some type modifications in DataViewPrototype 2014-07-08 16:59:27 -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
2e48076408 Added first draft of DataView scriptable objects 2014-07-08 16:09:45 -07:00
Atlante45
13fe8b579f Added ArrayBufferView scriptable objects 2014-07-08 16:09:06 -07:00
Atlante45
1f6e1b9509 Modifications and improvments of the ArrayBuffers 2014-07-08 16:08:11 -07:00
Atlante45
96a1390d8f Fixed up ArrayBuffer::slice() behaviour 2014-07-07 18:58:53 -07:00
Atlante45
f9b739a0d1 Functional ArrayBuffer class following Qt standard 2014-07-07 18:02:33 -07:00
Atlante45
c246205692 Base implementation of ArrayBuffer 2014-07-07 15:04:45 -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
ZappoMan
ec0c350f60 Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities 
Conflicts:
	interface/src/Application.cpp
	interface/src/DatagramProcessor.cpp
	libraries/script-engine/src/ScriptEngine.cpp
 2014-07-03 14:20:40 -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
74e7e0a7bf Switched XMLHttpRequestClass to NetworkAccessManager 2014-07-02 11:27:32 -07:00
Atlante45
2549b0d946 Switched ScriptEngine to NetworkAccessManager 2014-07-02 11:22:44 -07:00
ZappoMan
865566414c Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities 
Conflicts:
	interface/src/entities/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTreeElement.cpp
	libraries/models/src/ModelsScriptingInterface.cpp
	tests/octree/CMakeLists.txt
	tests/octree/src/ModelTests.cpp
 2014-07-01 16:32:47 -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
ZappoMan
c4fe36b13d more Models->Entities renaming 2014-06-26 17:01:07 -07:00
wangyix
cb48825561 added seq number to all Audio types, untested 2014-06-26 16:52:23 -07:00
ZappoMan
ccc9eabd33 first cut at renaming Models to Entities 2014-06-26 16:39:52 -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
Stephen Birarda
a9c2e3fe71 put back ssize_t definition 2014-05-20 11:56:06 -07:00
Stephen Birarda
0e7615391c don't look for GnuTLS from cmake 2014-05-20 10:35:04 -07:00
Atlante45
0f19890048 Fixes filesystem issue between Qt and Windows 2014-05-18 19:27:43 -07:00
ZappoMan
18de6dddec Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-14 12:21:44 -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
a5c10220e6 Remove _ prefix from private methods in XMLHttpRequest 2014-05-14 10:16:04 -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
Ryan Huffman
310f184978 Add getters for onTimeout and onReadyStateChange 2014-05-14 09:53:44 -07:00
ZappoMan
ed6f828b36 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-05-12 09:14:04 -07:00
ZappoMan
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -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
Ryan Huffman
f3305a51e2 Remove XMLHttpRequestClass::escapeJavascriptString 2014-05-06 13:09:49 -07:00
Ryan Huffman
2dda87fe7f Add XMLHttpRequest constructor to ScriptEngine 2014-05-06 11:28:35 -07:00
Ryan Huffman
7d7e012965 Add XMLHttpRequest 2014-05-06 11:28:09 -07:00
Atlante45
48facce85f coding standard 2014-05-02 15:34:07 -07:00
Atlante45
4e88d66c95 Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js 2014-05-02 10:17:11 -07:00
ZappoMan
c621f1533d removed debugging 2014-05-02 09:36:11 -07:00
ZappoMan
715e6b8e60 debugging model editing 2014-05-02 09:10:30 -07:00
AndrewMeadows
05e5277084 Merge pull request #2764 from ZappoMan/modelserver 
Model Server, Renderer, Scripting, etc
 2014-05-01 15:39:12 -07:00
Atlante45
8068a915aa More work on editModels 2014-04-30 16:50:40 -07:00
Ryan Huffman
701fcd3542 Fix invalid check for null object in registerGetterSetter 2014-04-30 11:29:01 -07:00
Ryan Huffman
9e684a0bc8 Add registerGetterSetter to remove need for getEngine() 2014-04-30 11:17:36 -07:00
ZappoMan
0182a6d895 models working end to end 2014-04-30 11:12:49 -07:00
Ryan Huffman
65fd2a7724 Merge remote-tracking branch 'upstream/master' into 19612 
Conflicts:
	interface/src/Menu.cpp
 2014-04-30 09:57:17 -07:00
Ryan Huffman
0477706cb9 Add ScriptEngine::getEngine() to get internal QScriptEngine 2014-04-30 09:40:32 -07:00
ZappoMan
58c852d210 Merge branch 'master' of https://github.com/worklist/hifi into modelserver 2014-04-30 09:29:06 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07:00
Ryan Huffman
edcff0b67f Merge remote-tracking branch 'upstream/master' into RunningScripts 
Conflicts:
	interface/src/Application.cpp
	interface/src/ui/FramelessDialog.cpp
	interface/src/ui/FramelessDialog.h
 2014-04-29 16:28:36 -07:00
ZappoMan
4aa96e1fbe added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock 2014-04-29 15:10:28 -07:00
Andrew Meadows
c7dbc5984f add local gravity option parameter for MyAvatar 2014-04-28 16:40:22 -07:00
Andrew Meadows
a7c4b02f2d merge new work into andrew/inertia 2014-04-28 09:52:06 -07:00
Andrew Meadows
b05a315b5a merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-25 14:52:44 -07:00
Andrew Meadows
357aac833e expose AVATAR_MOTION_OBEY_GRAVITY const to JS 2014-04-25 14:15:40 -07:00
Andrew Meadows
2d5bfc81cd add Vec3.distance(Vec3, Vec3) for JS 2014-04-25 14:14:34 -07:00
Andrew Meadows
0a7a5031ee expose COLLISION_GOUP_* constants to JS 2014-04-24 14:17:10 -07:00
Mohammed Nafees
29d64373b4 Merge branch master 2014-04-24 18:52:59 +05:30
Atlante45
ddf14b0842 Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-22 10:22:30 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Thijs Wenker
70ac93c20d Style 2014-04-21 21:44:50 +02:00
Thijs Wenker
c016d6557e - few Adjustments in Application class for Script editor 
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
 2014-04-21 05:25:28 +02:00
Stephen Birarda
75f35c5858 optionally add an AvatarHashMap instance to the ScriptEngine 2014-04-17 17:55:16 -07:00
Andrzej Kapolka
15d4f59ceb Moved AnimationObject to separate source files. 2014-04-17 15:52:32 -07:00
Andrzej Kapolka
197ce036c4 Remove debugging line. 2014-04-17 11:06:28 -07:00
Andrzej Kapolka
0f69bbe23f More work on animation loading. 2014-04-16 20:39:55 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
Andrzej Kapolka
38c0e99cbe More work on animation loading. 2014-04-14 18:12:32 -07:00
Stephen Birarda
5904d19603 Merge pull request #2637 from birarda/authentication 
add optional DTLS option for domain-server to node communication
 2014-04-14 10:24:17 -07:00
Clément Brisset
5f6dee6c64 Merge pull request #2635 from thoys/windows-script-path-fix 
Fixed loading local stored scripts on Windows machines
 2014-04-10 16:40:47 -07:00
Stephen Birarda
54647f0f08 make sure gnutls define for ssize_t comes before gnutls include 2014-04-10 10:27:08 -07:00
Stephen Birarda
2518d314ac add ssize_t definition for gnutls.h include on Windows 2014-04-10 10:19:45 -07:00
Stephen Birarda
4e2e3b7b6d fix GnuTLS include dir variable name 2014-04-10 10:15:18 -07:00
Stephen Birarda
11cce7640e link to GnuTLS library from script-engine 2014-04-10 10:12:09 -07:00
Thijs Wenker
825acbbd9c Update ScriptEngine.cpp 
DWORD is not defined in UNIX based systems. int should be fine
 2014-04-10 10:47:21 +02:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Thijs Wenker
5d812c8cb2 Fixed loading local stored scripts on Windows machines 2014-04-09 23:44:40 +02:00
Andrew Meadows
5fa1fd6b81 merge 2014-04-09 14:36:22 -07:00
Andrew Meadows
698e3783e0 fixing formatting 2014-04-09 13:06:29 -07:00
Andrew Meadows
f8e66b4e0d remove cruft 2014-04-09 13:05:26 -07:00
Andrew Meadows
7304049f83 update boiler plate to abide by new standard 2014-04-09 12:55:29 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Stephen Birarda
2d755adfc0 repairs to good code blown away by regex 2014-04-09 10:46:20 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427 prepare header files for regex run against cpp 2014-04-09 09:35:05 -07:00
Stephen Birarda
7ce91b3f96 fix headers who had their comments removed 2014-04-08 17:43:35 -07:00
Stephen Birarda
6a51df9e38 initial regex replacement of headers 2014-04-08 17:30:36 -07:00
Andrew Meadows
23c6873d99 Add Uuid object to ScriptEngine 2014-04-07 14:12:29 -07:00
Atlante45
5acc8313ba Manual merge 2014-04-02 18:07:55 -07:00
Mohammed Nafees
d85d4fea5d Added the new Running Scripts widget 2014-04-02 12:46:57 +05:30
Stephen Birarda
7eab276122 suppress debug in ScriptEngine, fix spatialization from FS head changes 2014-03-26 17:19:23 -07:00
Stephen Birarda
f0f3cf7282 remove seed to random number generator that is no longer needed 2014-03-25 14:36:02 -07:00
Stephen Birarda
f8c479f9c5 seed random number generator in ScriptEngine for Math.random use in JS 2014-03-25 14:28:26 -07:00
ZappoMan
c34b64e296 add load script from URL support 2014-03-25 00:17:19 -07:00
ZappoMan
a613da8032 add Script.include() 2014-03-24 21:25:59 -07:00
ZappoMan
7ef1fe3a74 add support for listing all audio devices and default device in JS 2014-03-24 09:15:03 -07:00
Stephen Birarda
8c4fad443f allow Agents to microphone audio from Sound objects 2014-03-19 16:14:58 -07:00
Stephen Birarda
7e0da71527 have agent optionally send silent stream flag 2014-03-17 16:38:39 -07:00
Brad Hefta-Gaub
8f200e917b fix JS radians vs degrees issues 2014-03-14 13:03:14 -07:00
Stephen Birarda
54d73d4a64 use floor since round is missing on windows 2014-03-12 17:50:58 -07:00
Stephen Birarda
bd6c42a685 define roundf for use on Win from ScriptEngine 2014-03-12 17:32:52 -07:00
Stephen Birarda
3b653ca542 add a sendAvatarAudioStream option to Agent for mixer load testing, closes #2291 2014-03-12 17:00:12 -07:00
Andrew Meadows
793a760272 merge upstream master into "radians" project 2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
ZappoMan
f4d487464a more constructor cleanup 2014-03-09 00:01:47 -08:00
ZappoMan
cfa618d694 cleanup constructors 2014-03-08 23:31:23 -08:00
ZappoMan
1ceb05bf09 click harder 2014-03-08 18:22:30 -08:00