Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-01 15:59:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22198 commits 23 branches 28 tags 1.2 GiB
Commit graph

94 commits

Author SHA1 Message Date
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
a8d48e592f removing debug messages 2015-02-23 09:44:18 -08:00
ZappoMan
8c4474b2d0 more hacking 2015-02-20 17:55:04 -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
7b485829c4 cleanup AudioInjector memory management 2015-02-11 15:52:00 -08:00
Ryan Huffman
ce9e8910e4 Add callback to QScriptEngine::include(QString) 2015-01-29 09:04:57 -08:00
Ryan Huffman
38b38eb063 Update ScriptEngine to use BatchLoader 2015-01-22 14:14:21 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -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
ZappoMan
660bf2720e convert AnimationCache to DependencyManager 2014-12-15 19:48:15 -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
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
Ryan Huffman
b04fd89e4f Update grid tool html location 2014-11-11 09:55:30 -08:00
Ryan Huffman
feaf5678bb Add grid tools to entity edit tools 2014-11-06 15:00:39 -08:00
Stephen Birarda
2e8118300f fix for two member variable declarations on same line 2014-11-05 11:11:37 -08:00
Stephen Birarda
2c667d209d make the AudioInjectorScriptingInterface a singleton 2014-11-05 10:10:05 -08:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -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
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
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
Atlante45
95c98203a9 Replaced the Avatar in Agent by a scriptable avatar. 2014-07-23 14:00:49 -07:00
Atlante45
17a6a72bdd ScriptEngine now inherit from QScriptEngine 2014-07-22 11:39:49 -07:00
ZappoMan
1eb472c43a Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-15 10:05:06 -07:00
Atlante45
30fd4e27d0 pre-CR cleanup 2014-07-14 10:43:01 -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
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
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
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
106c8bffd8 first cut at animations in models 2014-05-09 16:08:06 -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
9e684a0bc8 Add registerGetterSetter to remove need for getEngine() 2014-04-30 11:17:36 -07:00
Ryan Huffman
0477706cb9 Add ScriptEngine::getEngine() to get internal QScriptEngine 2014-04-30 09:40:32 -07:00
ZappoMan
aac42058ac first cut at modelserver 2014-04-30 09:25:52 -07: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
38c0e99cbe More work on animation loading. 2014-04-14 18:12:32 -07:00