8 commits

Author	SHA1	Message	Date
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07: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
Thijs Wenker	cf1baaf6ea	- Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition) ... - Line numbers in ScriptEditor	2014-04-30 23:32:41 +02:00
Thijs Wenker	4bdc945f94	Changed font sizes in script-editor to pixels, it should he readable in both Windows and OSX now	2014-04-29 20:12:16 +02:00
U-Uthoypia\Thijs	0e28ff2fcd	This should fix the ubuntu build	2014-04-21 06:33:20 +02:00

Renamed from interface/ui/ScriptEditorWidget.ui (Browse further)