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

553 commits

Author SHA1 Message Date
samcake
d2f3b48637 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-17 17:36:38 -08:00
Brad Hefta-Gaub
2f142eb088 add a receiver example 2015-11-17 13:33:30 -08:00
Brad Hefta-Gaub
32bf81ef0d move MessagesClient to agent 2015-11-17 12:59:12 -08:00
Sam Gateau
5b92929833 Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client 2015-11-17 09:32:22 -08:00
Eric Levin
a2abc11df1 Merge pull request #6351 from huffman/script-path-resolution 
Update script engine path resolution behavior to behave consistently
 2015-11-10 14:10:42 -08:00
Ryan Huffman
f6df7e298e Merge branch 'script-path-resolution' into baseball 2015-11-09 14:03:10 -08:00
Atlante45
b15054c1fb Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-09 13:41:06 -08:00
Eric Levin
7700e67734 Merge pull request #6326 from imgntn/entity_params 
Add Ability to Pass Parameters When Calling Methods on Entities
 2015-11-09 12:17:58 -08:00
Ryan Huffman
b835711266 Update script engine path resolution behavior 
The path resolution will now be relative to the script currently
being evaluated *on its initial evaluation.* The previous behavior
was that all paths would be resolved relative to the root script
for client scripts, and inconsistent for entity scripts depending
on the order that scripts were loaded. The entity script situation
was particularly bad because including more than 1 level deep produced
inconsistent results.
 2015-11-09 12:04:17 -08:00
Atlante45
55c6706f76 Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-11-06 13:31:39 -08:00
James B. Pollack
e928c8278b overload a single function and cleanup, add examples 2015-11-06 11:48:51 -08:00
James B. Pollack
3cee569bae pass parameters to entities 2015-11-05 16:57:39 -08:00
James Pollack
751d51ee72 entity call params 2015-11-05 14:19:11 -08:00
Atlante45
0508091130 Rebase fixes 2015-11-03 11:37:57 -08:00
Zach Pomerantz
6bf9a4518a Bail early from ScriptEngine::run if stopped 
evaluate() bails anyway, so this will avoid the cost of init().
If run() is invoked from runInThread(), this may avoid a race
where _isRunning is set after it is checked because the check
occured during init().
 2015-11-03 11:24:04 -08:00
Stephen Birarda
8cd41b9383 resolve conflicts on merge with huffman/baseball 2015-11-03 11:13:15 -08:00
Ryan Huffman
afffe7f5c6 Merge branch 'master' of github.com:Atlante45/hifi into baseball 2015-11-03 11:10:14 -08:00
Brad Hefta-Gaub
8839458d54 Merge pull request #6242 from highfidelity/controllers 
New Controller interfaces/api
 2015-10-30 12:47:51 -07:00
Howard Stearns
ada32dd260 typo 2015-10-29 19:17:52 -07:00
Stephen Birarda
d03a837263 resolve conflicts on merge with upstream master 2015-10-29 14:28:50 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Howard Stearns
d79d0bc5c5 Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars 2015-10-29 08:25:41 -07:00
Atlante45
136747929e Fix typo 2015-10-28 17:11:46 -07:00
Atlante45
7695afec0a Fix ScriptEngine crash 2015-10-28 16:43:41 -07:00
Stephen Birarda
cee029f752 resolve conflicts on merge with upstream/master 2015-10-28 15:19:10 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
Atlante45
c0138bd189 Rename check functions and make them static 2015-10-27 12:39:40 -07:00
Atlante45
ffe73348fb Move check functions to cpp only 2015-10-27 12:11:27 -07:00
Atlante45
a53a576aa3 checkExceptions after testing entity scripts in the sandbox 2015-10-27 12:11:27 -07:00
Atlante45
ea56f965a4 Lambda conversion fix for windows 2015-10-27 12:11:27 -07:00
Atlante45
3e43a3c345 Some more script checks 2015-10-27 12:11:27 -07:00
Atlante45
13b7fa6b5d Typo 2015-10-27 12:11:27 -07:00
Atlante45
c8c9118d4d Improve script engine error logging + some cleanup 2015-10-27 12:11:27 -07:00
Atlante45
3742c169b5 Make handler generators more readable 2015-10-27 12:11:27 -07:00
Atlante45
380139364c checkExceptions after testing entity scripts in the sandbox 2015-10-26 12:41:49 -07:00
Atlante45
1c048880ee Lambda conversion fix for windows 2015-10-26 12:27:48 -07:00
Atlante45
8d72fcada5 Some more script checks 2015-10-26 11:33:13 -07:00
Atlante45
9771361840 Typo 2015-10-26 10:49:41 -07:00
Howard Stearns
4b4907c9ef Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in. 2015-10-26 10:04:55 -07:00
Howard Stearns
e11b0add9a Update safety trampoline with correct arguments. 2015-10-24 15:29:49 -07:00
Atlante45
421d967e49 Improve script engine error logging + some cleanup 2015-10-23 15:41:31 -07:00
Atlante45
4e33aa84e8 Make handler generators more readable 2015-10-23 15:41:31 -07:00
Howard Stearns
2b7ceffd64 Get rid of globalObject().property("MyAvatar").property("animationStateHandlerResult"). 2015-10-22 16:23:09 -07:00
Howard Stearns
1d0464ede5 Name change and thread checks per comments. 2015-10-22 15:15:10 -07:00
Howard Stearns
9fd61907f5 Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts. 2015-10-21 20:50:07 -07:00
Brad Davis
bea6fdd890 Working on JSON parsing and cleanup 
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
 2015-10-20 10:20:28 -07:00
Brad Davis
734a39f962 Breaking up UserInputMapper, restoring some mappings 2015-10-18 18:58:03 -07:00
Brad Davis
57be59935d Move controller test to app 2015-10-17 19:13:38 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d Merging old and new controller interfaces 2015-10-14 15:16:54 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Brad Davis
99d1e17ae8 Support reload-on-change for local scripts 2015-10-07 19:18:59 -07:00
Brad Hefta-Gaub
08babecb75 add support for mapping EntityPropertyFlags to QScriptValues and wire in desiredProps 2015-09-17 19:51:21 -07:00
Brad Hefta-Gaub
b16dfb8a9e whitespace repair 2015-09-17 17:41:54 -07:00
Brad Hefta-Gaub
81255c8379 whitespace repair 2015-09-17 17:40:41 -07:00
Brad Hefta-Gaub
6fac447b97 Merge branch 'master' of https://github.com/highfidelity/hifi into getEntityPropertiesPerformance 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
	libraries/script-engine/src/ScriptCache.cpp
	libraries/script-engine/src/ScriptCache.h
 2015-09-16 17:16:57 -07:00
Brad Hefta-Gaub
248107c468 add reload all support for entity scripts 2015-09-16 16:45:26 -07:00
Brad Hefta-Gaub
0a41ab2f41 Merge pull request #5827 from jherico/homer 
fix ScriptEngine location property
 2015-09-16 15:19:54 -07:00
Brad Davis
cbb8bee962 Trying to fix ScriptEngine location property 2015-09-16 15:00:24 -07:00
Stephen Birarda
5df7ce7424 fix for missing jurisdiction listener in Agent 2015-09-16 11:43:54 -07:00
Brad Hefta-Gaub
016a5e5f0a cleanup comments 2015-09-15 11:52:07 -07:00
Brad Hefta-Gaub
41caa36038 removed some debug code 2015-09-15 11:50:10 -07:00
Brad Hefta-Gaub
6521de8163 rework ScriptEngine and worker thread shutdown 2015-09-15 11:00:05 -07:00
Brad Hefta-Gaub
e92d195030 tweak 2015-09-14 21:18:36 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
Brad Hefta-Gaub
18fbf896f1 first cut at moving entity scripts into ScriptEngine 2015-09-14 15:13:43 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
56118e4204 migrate Agent to use standard APIs of ScriptEngine 2015-09-11 22:12:42 -07:00
Brad Hefta-Gaub
54c56a92f1 move agent specific code out of ScriptEngine 2015-09-11 21:56:00 -07:00
Brad Hefta-Gaub
8395fb6eff normalize how ScriptCache::getScript() works relative to ResourceManager 2015-09-11 21:24:39 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Brad Hefta-Gaub
5c6d8da97b Revert "Make sure all entity script callbacks happen on the Entities script engine thread" 2015-09-11 11:55:36 -07:00
Brad Hefta-Gaub
b9d5412aad prevent sending signals in the entities script engine 2015-09-11 09:48:42 -07:00
Brad Hefta-Gaub
92a5a999c6 quiet some debug 2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
8eacdbf1c4 first cut at making sure entity scripts are called on the entities script engine thread 2015-09-10 13:02:02 -07:00
Brad Hefta-Gaub
f45e182d33 fix CR feedback, add examples 2015-09-10 09:06:56 -07:00
Brad Hefta-Gaub
ede0a39b5b prevent Script.include() from including the same file multiple times 2015-09-09 17:54:09 -07:00
Seth Alves
0c8848a463 don't update _lastSendJointData if we didn't send 2015-09-03 15:41:40 -07:00
Seth Alves
36ca789d92 fix differential avatar-joint sending to work if more than 2 avatars are in the domain 2015-09-03 14:08:04 -07:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
Thijs Wenker
0e255f4f3e properly exposed WebSocketClass::ReadyState to the ScriptEngine 2015-08-22 01:59:44 +02:00
Thijs Wenker
d89ecc1e42 Move WebSocketServer to be accessable from Assignment-Client:Agent only. 2015-08-21 22:43:49 +02:00
Thijs Wenker
e43dc3f9fe Completed implementation of WebSocket and WebSocketServer 2015-08-18 03:21:48 +02:00
Thijs Wenker
7c77e0e941 initial WebSocketServer 2015-08-13 18:21:50 +02:00
Thijs Wenker
d10ae4a68d Merge branch 'master' of https://github.com/worklist/hifi into 20638 2015-08-07 21:43:32 +02:00
Thijs Wenker
25266b986c added basic implementation of WebSocket class ( https://developer.mozilla.org/en-US/docs/Web/API/WebSocket ) using QWebSocket 2015-08-07 21:43:14 +02:00
Andrew Meadows
0a5ada3c09 remove legacy shapes 2015-07-29 09:02:24 -07:00
Ryan Huffman
396bb613f8 Avoid creating a new variable in js print 2015-07-23 15:32:40 -07:00
Ryan Huffman
5f33ac5459 Update script print() to be variadic 2015-07-23 15:30:54 -07:00
Stephen Birarda
7a13c867ae quit the ScriptEngine thread once the script is done 2015-07-17 11:18:14 -07:00
Stephen Birarda
5a2d59c530 fix ScriptEngine cleanup for Agent 2015-07-15 15:07:34 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Stephen Birarda
821c16cbc4 resolve conflicts on merge with uptream/master 2015-07-14 09:52:20 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
Atlante45
957e6394a9 sendPacket function take Node& not a pointer 2015-07-13 11:57:20 -07:00
ZappoMan
a8a4c99529 on script shutdown, wait to process all pending edit messages before ending the script engine 2015-07-09 15:01:16 -07:00
Stephen Birarda
1b4e333c49 Merge pull request #3 from birarda/atp 
initial networking API changes for new protocol
 2015-07-09 16:51:37 -04:00
Stephen Birarda
2417981c9d resolve conflicts on merge with clement/protocol 2015-07-09 13:27:59 -07:00
Atlante45
57d4e64926 Missing deref 2015-07-09 13:24:07 -07:00
Stephen Birarda
caed7da99b create the avatarPacket in ScriptEngine with the right size 2015-07-09 13:23:20 -07:00
Stephen Birarda
16e7b2625b don't sink the audioPacket in ScriptEngine 2015-07-09 13:20:10 -07:00
Stephen Birarda
7ee08130f0 fix for avatar packet size in ScriptEngine 2015-07-09 13:18:11 -07:00
Stephen Birarda
9c18277e9c packet fixes in script-engine and Application 2015-07-08 18:24:49 -07:00
Bing Shearer
25a1108b61 Fixed spelling error 2015-07-08 16:24:23 -07:00
Stephen Birarda
74940a2132 replace lingering PacketTypes in old format 2015-07-08 10:18:13 -07:00
David Rowe
1898c6bd55 Merge branch 'master' into 20547 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
	libraries/networking/src/PacketHeaders.h
 2015-06-26 13:05:51 -07:00
Stephen Birarda
ff21c22245 fix AC crash with no controller scripting interface 2015-06-22 11:56:07 -07:00
David Rowe
67206332e6 Make individual reload buttons reload scripts 2015-06-17 16:11:30 -07:00
Sam Gondelman
984d449bf9 exposed input key bindings to js to enable key remapping 2015-06-04 16:29:58 -07:00
Seth Alves
a96520ca74 set up EntityItemPropertiesFromScript to either ignore or honor read-only properties 2015-05-29 13:43:18 -07:00
Howard Stearns
3a7a290094 Uglify conditional returns. :-) 2015-05-26 11:38:36 -07:00
Howard Stearns
5608892a15 Remove obsolete comment. 2015-05-26 11:16:11 -07:00
Howard Stearns
bbdf9f1d9f Remove changingEntityID. 2015-05-26 11:14:23 -07:00
Howard Stearns
069e6237cc Noop change with more declarations, in hopes of convincing MSVS how lambdas work. 
(Hey, it's worth a try...)
 2015-05-25 16:52:14 -07:00
Howard Stearns
4266a99d78 Put the javascript methods on Script, not Entities, and other minimum-diff cleanup. 2015-05-25 11:28:33 -07:00
Howard Stearns
a0d09c0a6d Mulitple independent handlers for same entity/event. 2015-05-24 11:48:11 -07:00
Howard Stearns
b884d3cf90 Handle all the signals. 2015-05-24 09:57:12 -07:00
Howard Stearns
1dd2b7275e Simpler and more uniform version that handles all the standard entity-script events. 2015-05-23 18:11:05 -07:00
Howard Stearns
277f5ef3a4 Working experimental first version. 2015-05-23 13:35:35 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Ryan Huffman
2e61ef01da Update ScriptEngin::stop to only take effect when not finished 2015-04-15 09:55:36 -07:00
Seth Alves
7af32bd67a put audio and script-engine logging into their own QLoggingCategory 2015-04-06 15:57:18 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
ZappoMan
a88b3c02d2 quiet warning flood when scripts are bad 2015-03-30 18:24:34 -07:00
ZappoMan
e2d8d82096 more script caching cleanup 2015-03-30 16:34:04 -07:00
ZappoMan
74d50a9250 more work on improving script caching 2015-03-30 16:21:47 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Ryan Huffman
38a361dcf0 Remove class scope on _entityScriptingInterface property references 2015-03-02 11:32:07 -08:00
Ryan Huffman
75a943386b Remove nullptr comparison 2015-03-02 10:44:32 -08:00
Ryan Huffman
a443157dd7 Update ScriptEngine::entityScriptingInterface to be static pointer 
Statically allocating the EntityScriptingInterface means we can't make
sure it is initialized AFTER NodeList has been initialized
 2015-03-02 10:40:46 -08:00
Sam Gateau
a757229c0e Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-02-25 19:18:01 -08:00
Sam Gateau
6b29e314c2 Adding the Stage of the Scene and exposing control of the sun light from javascript 2015-02-25 19:05:27 -08:00
ZappoMan
f1017f8a5d simplify waitTillDoneRunning 2015-02-24 17:45:22 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
ZappoMan
eab09eaf28 removed extra debugging 2015-02-24 17:15:58 -08:00
ZappoMan
25ae001d3b removed extra debugging 2015-02-24 17:05:44 -08:00
ZappoMan
9dcea38b2b tweak some debugging 2015-02-24 16:23:39 -08:00
ZappoMan
8757600a5e ifdef around massive debug output 2015-02-24 15:57:13 -08:00
ZappoMan
fd93b99f03 more hacking on script shutdown behavior 2015-02-24 14:02:46 -08:00
ZappoMan
6be8f4c0ec more work on improving shutdown behavior 2015-02-23 17:32:31 -08:00
ZappoMan
7e2d355b56 first cut at properly shutting down timers while shutting down scripts 2015-02-23 11:40:30 -08:00
ZappoMan
1efa7b28b0 removed dead code 2015-02-23 10:04:14 -08:00
ZappoMan
a8d48e592f removing debug messages 2015-02-23 09:44:18 -08:00
ZappoMan
e3de994c4a more hacking 2015-02-20 18:42:02 -08:00
ZappoMan
8c4474b2d0 more hacking 2015-02-20 17:55:04 -08:00
ZappoMan
b219937902 switch known scripts iterator 2015-02-20 15:46:11 -08:00
ZappoMan
0b607fa390 first cut at shutting down scripts ahead of other cleanup 2015-02-20 15:28:25 -08:00
Andrew Meadows
d896f3a811 Merge pull request #4252 from thoys/20224 
CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads
 2015-02-17 09:03:17 -08:00
Thijs Wenker
062c2cbcee HUD LookAt positions could be NULL now if whenever they're out of range 
HMD.HUDLookAtPosition2D -> HMD.getHUDLookAtPosition2D()
HMD.HUDLookAtPosition3D -> HMD.getHUDLookAtPosition3D()
 2015-02-12 22:55:44 +01:00
Stephen Birarda
79674fb94f use a wrapper on audio injector for script ownership 2015-02-11 17:20:00 -08:00
Ryan Huffman
4a3ee02b11 Initialize _entityScriptingInterface in ScriptEngine 2015-02-06 11:31:19 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Ryan Huffman
e6caefa023 Add comment to ScriptEngine::include() 2015-01-29 09:08:55 -08:00
Ryan Huffman
ce9e8910e4 Add callback to QScriptEngine::include(QString) 2015-01-29 09:04:57 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Ryan Huffman
e27db48e26 Remove qDebug and unnecessary include 2015-01-22 14:20:42 -08:00
Ryan Huffman
38b38eb063 Update ScriptEngine to use BatchLoader 2015-01-22 14:14:21 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
ZappoMan
cfa5e5c61b Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
 2014-12-19 10:35:18 -08:00
Stephen Birarda
7beb3a7b62 resolve conflicts on merge with upstream master 2014-12-17 16:57:35 -08:00
Stephen Birarda
9425ea2c17 Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 16:47:15 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
737741c13b Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo 2014-12-17 09:23:42 -08:00
Atlante45
c40e83c9e4 Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11 2014-12-16 15:42:40 -08:00
Atlante45
b2dac6f53f DM users update 2014-12-16 15:32:11 -08:00
Stephen Birarda
4077a76e46 remove AudioRingBuffer include where not needed 2014-12-16 11:58:12 -08:00
Stephen Birarda
c734bc89a3 move the audio scope into its own class 2014-12-16 11:54:59 -08:00
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Stephen Birarda
98f56aaa0c fix URL/filename discrepancy for local scripts 2014-12-03 09:55:55 -08:00
Stephen Birarda
d7f168999d don't block main thread for a script load 2014-12-02 10:30:23 -08:00
Stephen Birarda
36f716cd61 have script loading be separate from ScriptEngine constructor 2014-12-02 10:13:43 -08:00
ZappoMan
cd0ee0ff1d better support for includes in entity scripts 2014-11-23 14:58:29 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
ef2c181c98 repairs to audio classes for Sound* to QScriptValue 2014-11-11 10:55:07 -08:00
Ryan Huffman
bedd9c76f2 Merge branch 'master' of github.com:highfidelity/hifi into entity-grid-tool 
Conflicts:
	examples/newEditEntities.js
 2014-11-11 10:48:49 -08:00
Stephen Birarda
a8681cd5b6 changes to allow AudioInjectorOptions to operate as a hash from js 2014-11-11 10:24:21 -08:00
Ryan Huffman
b04fd89e4f Update grid tool html location 2014-11-11 09:55:30 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
Ryan Huffman
feaf5678bb Add grid tools to entity edit tools 2014-11-06 15:00:39 -08:00
Stephen Birarda
38f2b2ac6a move script-engine library to intel tbb concurrent map 2014-11-06 13:47:56 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00