Jeff Hutchinson 717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo ... # Conflicts: # Templates/BaseGame/game/data/ui/guis/loadingGui.gui # Templates/BaseGame/game/data/ui/guis/mainMenu.gui # Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui # Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui # Templates/BaseGame/game/tools/forestEditor/brushes.tscript		2021-08-13 20:14:39 -04:00
..
EditorChooseGUI.ed.tscript	lotsa fixes.	2021-05-04 21:18:15 -04:00
fileDialogs.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditor.ed.tscript	More updating of editor icons to assets	2021-08-07 19:27:01 -05:00
guiEditorCanvas.ed.tscript	lotsa fixes.	2021-05-04 21:18:15 -04:00
guiEditorContentList.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorGroup.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorInspector.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorNewGuiDialog.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorPrefsDlg.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorProfiles.ed.tscript	more torquescript template fixes.	2021-05-04 22:49:19 -04:00
guiEditorSelectDlg.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorStatusBar.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorToolbox.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorTreeView.ed.tscript	Parametrize script extension, default to 'tscript'	2021-01-19 21:32:31 +01:00
guiEditorUndo.ed.tscript	more torquescript template fixes.	2021-05-04 22:49:19 -04:00