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

916 commits

Author SHA1 Message Date
Ryan Huffman
4e0ac2a4be Remove fix for old QT file path bug in OSX 2016-04-18 16:07:53 -07:00
Anthony J. Thibault
253e4cbb73 validate arguments to MyAvatar.addAnimationStateHandler() 
Also validate arguments to MyAvatar.removeAnimationStateHandler() and the return result from the user provided callback function.
 2016-04-14 16:25:17 -07:00
Brad Davis
5a5583d3a5 PR comments 2016-04-09 21:43:50 -07:00
Brad Hefta-Gaub
ce1625b551 Merge pull request #7600 from sethalves/fix-entity-script-error-message 
attempt to make the failed-to-load-entity-script error-message be more helpful
 2016-04-07 09:17:04 -07:00
Brad Hefta-Gaub
986b4bea7c Merge pull request #7603 from zzmp/fix/entities-thread-crash 
Fix intermittent crash on exit
 2016-04-07 08:21:51 -07:00
Brad Hefta-Gaub
cea622f6f1 Merge pull request #7571 from howard-stearns/sandbox-entity-includes 
Sandbox entity includes
 2016-04-06 19:11:25 -07:00
Zach Pomerantz
06e827cb5e Guard against no script engine thread affinity 2016-04-06 15:41:13 -07:00
howard-stearns
f35c59ce5f Guard against meaningless query and fragment parts. 2016-04-06 15:21:43 -07:00
Seth Alves
672b4df7c1 get rid of magic number 2016-04-06 13:36:44 -07:00
Atlante45
6d1b7f1d37 Wrap sound script object to hold a strong ref 2016-04-06 13:04:18 -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
Zach Pomerantz
1e710712cc Check entities scripting thread before signaling it 2016-04-06 11:19:07 -07:00
howard-stearns
7b7ec5a174 Prohibit entity script file includes from outside the original entity 
script's directory (unless its in our resources).
 2016-04-04 16:41:21 -07:00
Seth Alves
56b84b3106 fix display of path of selected file in running-scripts window 2016-04-01 12:05:49 -07:00
Seth Alves
35affe26e3 trying again on script loading changes 2016-04-01 11:52:47 -07:00
Seth Alves
0f288247a7 include script in default script location 2016-04-01 10:50:22 -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
651d2c8954 fix script load from disk on windows 2016-03-30 17:27:36 -07:00
Seth Alves
065c238dd0 Merge branch 'use-local-scripts' of github.com:sethalves/hifi into use-local-scripts 2016-03-30 14:02:21 -07:00
Seth Alves
62372415be get this working on windows 2016-03-30 14:01:35 -07:00
Seth Alves
f5333423ff remove unused variable 2016-03-30 13:43:06 -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
Seth Alves
7c0bb72aff started on making ~ mean the application directory in script paths 2016-03-29 18:32:46 -07:00
Seth Alves
2ad02941e4 lowercase filenames/paths before they go into _treeNodes to avoid scripts being unstoppable 2016-03-29 15:38:11 -07:00
Seth Alves
51cf854863 cleanups 2016-03-29 13:45:09 -07:00
Seth Alves
0c72ca1be3 works on windows now 2016-03-29 13:39:35 -07:00
Seth Alves
3aa1090ced working toward allowing local files in running-scripts window 2016-03-29 11:58:21 -07:00
Seth Alves
b88770228e convert running-scripts window to use local script files 2016-03-29 10:40:56 -07:00
Seth Alves
de8153bd75 on windows and osx use default scripts bundled with interface 2016-03-28 12:23:23 -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
Stephen Birarda
29cd487f84 fixes for styling and logging from CR 2016-03-15 14:38:08 -07:00
Stephen Birarda
72c64532f5 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-15 09:12:49 -07:00
howard-stearns
fce8369708 Remove logging that implies a problem that isn't there. 2016-03-11 14:23:47 -08:00
Atlante45
7d7a683b18 Add uploadFile method that prompts the user 2016-03-10 14:59:20 -08:00
Stephen Birarda
b3d8b67893 remove committed debug lines 2016-03-10 14:50:21 -08:00
Stephen Birarda
c65b5b63f0 better error handling for asset browser 2016-03-10 14:48:44 -08:00
Stephen Birarda
5ad4645b47 Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2016-03-10 13:28:59 -08:00
Stephen Birarda
e3cae5b026 change setMapping for new disconnected error case 2016-03-10 12:26:00 -08:00
Stephen Birarda
9c53f40fbe remove nullptr check in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
9d19bf85b1 add consistent error handling for asset request and upload 2016-03-10 10:52:05 -08:00
Stephen Birarda
fccad7dca4 remove nullptr request checks in AssetMappingsScriptingInterface 2016-03-10 10:52:05 -08:00
Stephen Birarda
99718e9c4e short circuit the mapping operations for invalid path/hash 2016-03-10 10:52:05 -08:00
Brad Davis
ee017cf0a5 Make script cache thread safe 2016-03-10 08:47:11 -08:00
Ryan Huffman
3e5e2eef17 Add mapping sorting, copying, and isKnownMapping 2016-03-10 08:18:32 -08:00
Stephen Birarda
6f044e1cd3 handling for leading slashes while loading mappings 2016-03-09 17:36:04 -08:00
Stephen Birarda
ea5349f7a0 remove ctor and dtor for AssetMappingsScriptingInterface 2016-03-09 16:59:31 -08:00
Stephen Birarda
85fe1349eb fix filename in header comment for AssetMappingsScriptingInterface 2016-03-09 16:58:53 -08:00