Commit graph

38 commits

Author SHA1 Message Date
Howard Stearns
0cbddb217c Don't ask about differences over after the user has said no -- until the external file changes again. 2016-03-17 19:58:28 -07:00
howard-stearns
d59d5549a1 Merge branch 'master' of https://github.com/highfidelity/hifi into os-window-vs-modal-overlay-in-script-editor 2016-03-17 17:04:54 -07:00
howard-stearns
a957716511 Disable script editor close and tab close when we have a modal dialog up
about external changes to the file.
2016-03-17 16:54:59 -07:00
David Rowe
ab963b4a4b Fix up script editor's "reload script?" message box 2016-03-15 09:04:23 +13:00
Brad Davis
aa03241dd9 Make all load script dialogs QML and respect previous script location 2016-01-28 15:53:04 -08:00
Brad Davis
d28f80aa07 Moving running scripts functionality to scripting library 2016-01-11 12:44:03 -08:00
Brad Hefta-Gaub
927fe97359 migrate callers of QMessageBox::warning() to OffscreenUi::warning() 2016-01-05 10:17:16 -08:00
Thijs Wenker
96b6067d88 ScriptEditor Improvements:
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
2015-10-14 20:37:47 +02:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
David Rowe
fed5e8e573 Don't run Script Editor scripts from the cache 2015-09-22 11:35:34 -07:00
David Rowe
5474c0634e Merge branch 'master' into 20277
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
2015-01-30 13:49:45 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu
Also did a bit of Header cleanup
2015-01-18 07:14:52 -08:00
Atlante45
be050b0469 Added missing deletes 2015-01-05 15:13:07 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
Stephen Birarda
b4cfce8ffa final NetworkAccessManager return repairs 2014-10-06 14:58:23 -07:00
Stephen Birarda
7964180905 handle place creation at new API endpoint 2014-09-11 17:33:01 -07:00
David Rowe
5ebe6962a4 Make scripts loaded with Script.load() not persist 2014-09-06 09:59:47 -07:00
Atlante45
9bcd4e7ac8 Switched ScriptEditorWidget to NetworkAccessManager 2014-07-02 11:21:54 -07:00
David Rowe
ce874305be Add checkbox that automatically reloads externally changed files 2014-06-29 21:50:16 -07:00
David Rowe
c454c790fa Check script file for external changes when editor regains focus
Prompt user whether to reload.
2014-06-29 21:31:28 -07:00
David Rowe
3df43dc653 Catch any on-the-fly modifications made while script is restarting 2014-06-29 20:13:27 -07:00
David Rowe
742007892f Rework old fix for Script Editor Script.stop() crash 2014-06-29 19:57:26 -07:00
David Rowe
48fb156e28 Fix Script Editor run-on-the-fly crashing
Wait for script engine to stop before restarting.
2014-06-29 19:47:00 -07:00
David Rowe
9449ad7192 Add missing script engine hash key code changes
The script engine hash key changed starting at commit [62f85d] on 11 Jun.
2014-06-29 19:40:53 -07:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the
processEraseMessage wait until it can lock to ensure particles are
deleted.
2014-05-22 12:45:36 -07:00
Thijs Wenker
9667748156 - Style fixes
- ScriptHightlighting qouting RegEx fix (  "hello" + " " + "world" // the text between two quote entities isn't red anymore )
2014-05-01 21:07:46 +02:00
Thijs Wenker
c20381a0ea EditorWindow on-top behavior fixed 2014-04-30 08:24:04 +02:00
Thijs Wenker
87260a4c58 ability to load a script thats running from an external link into the ScriptEditor , followed by a save dialog 2014-04-30 00:58:22 +02:00
Thijs Wenker
fc2ed9f9fb Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script. 2014-04-29 22:03:51 +02:00
Andrew Meadows
f46a5dc966 fix #2718 for warning about unused variable 2014-04-23 10:13:05 -07:00
Thijs Wenker
6c89521f1d Style 2014-04-22 13:12:21 +02:00
Thijs Wenker
9faee0d82d - Style
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
2014-04-21 21:37:49 +02:00
Thijs Wenker
c1ed38f4de Style 2014-04-21 21:23:39 +02:00
Thijs Wenker
77994ae0cb header cleanup (hopefully the ubuntu test-build will like this) 2014-04-21 06:20:18 +02: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
Thijs Wenker
e66822c6ee ScriptEditor: Syntax highlighting update 2014-04-16 00:55:06 +02:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00