Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
41781 commits 2 branches 0 tags 1.1 GiB
Commit graph

446 commits

Author SHA1 Message Date
Seth Alves
672b4df7c1 get rid of magic number 2016-04-06 13:36:44 -07:00
Seth Alves
21c2db7cdc attempt to make the failed-to-load-entity-script error-message be more helpful 2016-04-06 12:40:59 -07:00
Seth Alves
35affe26e3 trying again on script loading changes 2016-04-01 11:52:47 -07:00
Seth Alves
63595e196e fix batch-loaded local scripts 2016-03-31 14:02:47 -07:00
Seth Alves
cfa847ba54 don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts 2016-03-31 09:45:28 -07:00
Seth Alves
bb43347599 Merge branch 'master' of github.com:highfidelity/hifi into use-local-scripts 2016-03-30 13:33:59 -07:00
Seth Alves
26e01bbacd rewrite a bunch of path/url mangling code 2016-03-30 13:33:49 -07:00
Andrew Meadows
5ac0640cbe check for time machine 2016-03-27 16:33:53 -07:00
Ryan Huffman
1a2f74f43a Add protection around ScriptEngine::runInThread being called twice 2016-03-22 11:26:10 -07:00
Anthony J. Thibault
0d62b10a8f Added Mat4 support to script 
Also, hooked up MyAvatar.sensorToWorldMatrix access to script.
 2016-03-07 16:16:14 -08:00
Howard Stearns
05943ed353 Entity scripts keep of the which entity they are executing for. When the entity goes away, any created timers do, too. Also, loading interface scripts is not allowed from entity scripts. 2016-03-01 16:50:58 -08:00
Brad Davis
c07f3789e4 Don't crash on script destructor 2016-02-22 14:26:33 -08:00
Brad Davis
55af5eaf06 Fix crash on shutdown due to lifetime of scripts 2016-01-12 12:40:02 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
553e455a53 Merge pull request #6759 from huffman/script-engine-slot-exception 
Add logging of signal slot exceptions in ScriptEngine
 2016-01-07 08:54:34 -08:00
Ryan Huffman
810da77abe Update ScriptEngine signal exception handling to call hadUncaughtExceptions 2016-01-04 10:34:55 -08:00
Ryan Huffman
f60cd09b45 Add logging of signal slot exceptions in ScriptEngine 2016-01-03 21:12:21 -08:00
Brad Davis
07531353e4 Allow a script to set a resource override. 2015-12-30 09:06:04 -08:00
Brad Hefta-Gaub
111a8caa3c Merge pull request #6701 from highfidelity/graphics 
Graphics merge into Master: Adding Gamma correction, Tone Mapping and Debugging tool
 2015-12-21 13:54:50 -08:00
Brad Davis
05b7fcc957 Remove script -> qt::webchannel dependency 2015-12-21 11:19:05 -08:00
samcake
1e8e3fec87 Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-19 11:38:20 -08:00
Brad Davis
6098c4a1d6 Revert "Revert "Migrate QML based web views to Qt WebEngine"" 
This reverts commit 1f3adeb666.
 2015-12-18 17:18:46 -08:00
samcake
7e66515beb Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 17:13:48 -08:00
Brad Davis
1f3adeb666 Revert "Migrate QML based web views to Qt WebEngine" 2015-12-18 17:09:38 -08:00
samcake
41525a7c4d Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster 2015-12-18 16:20:41 -08:00
Zach Pomerantz
919a4b6728 Split global JS Scene into Render 2015-12-18 10:33:41 -08:00
Brad Davis
82c865af2c Rename QmlWebWindow to OverlayWebWindow, move ctor registration to script engine 2015-12-17 12:20:38 -08:00
James B. Pollack
d21e4ff5e1 Merge pull request #6592 from huffman/script-engine-fixes 
Fix concurrency issues for bools in ScriptEngine
 2015-12-10 10:48:54 -08:00
Brad Davis
978d39b7f4 Moving OpenVR to external plugin and updating to latest version 2015-12-09 16:20:24 -08:00
Ryan Huffman
a21e07327d Update ScriptEngine::stop() to always run on its thread 2015-12-09 14:50:30 -08:00
Ryan Huffman
e7a1550b64 Update ScriptEngine::finished to include 2015-12-09 14:50:09 -08:00
Ryan Huffman
4dbfd3bfd9 Fix concurrency issues for bools in ScriptEngine 
Several member variables were unsafely being accessed from multiple threads. Making these variables std::atomic makes this safe.
 2015-12-08 11:13:27 -08:00
Atlante45
1d498af76e Merge branch 'master' of https://github.com/highfidelity/hifi into baseball 2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
46556b7fa5 Merge pull request #6513 from huffman/fix-script-race-condition 
Fix ScriptEngine setting _isFinished when it shouldn't, causing scripts to accumulate when restarting
 2015-12-03 17:17:42 -08:00
Ryan Huffman
4d84362757 Fix ScriptEngine setting _isFinished when it shouldn't 2015-12-01 11:30:56 -08:00
Stephen Birarda
c3f3639374 more spacing adjustments in ScriptEngine.cpp 2015-11-30 15:57:10 -08:00
Stephen Birarda
b1a69bb2cf cleanup spacing in ScriptEngine 2015-11-30 15:52:10 -08:00
Stephen Birarda
4573e5c59e resolve conflicts on merge with upstream/master 2015-11-30 13:32:38 -08:00
David Rowe
e25d4c17e8 Fix InputController (Leap Motion) not able to be created 2015-11-25 09:29:40 +13:00
Brad Hefta-Gaub
5f88d958ab CR feedback 2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub
ce46c30647 change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete 2015-11-23 16:27:06 -08:00
David Rowe
c72c6a0a47 Make multiline strings from JavaScript's print() readably in log file 
Addresses quoting of newline characters as "\n" which was introduced in
Qt 5.5.
 2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub
f80a765a29 add Assets.uploadData() and Assets.downloadData() 2015-11-19 17:28:20 -08:00
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