Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-15 05:20:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22186 commits 25 branches 0 tags 1.1 GiB
Commit graph

249 commits

Author SHA1 Message Date
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
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
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
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
ZappoMan
d734655ab6 fix some recently introduced warnings 2014-09-06 16:03:03 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -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
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
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
wangyix
0dfe0b1f2a merged with master 2014-08-08 13:32:27 -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
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
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
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
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
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
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
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
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
Ryan Huffman
2dda87fe7f Add XMLHttpRequest constructor to ScriptEngine 2014-05-06 11:28:35 -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
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
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
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