Jeff Hutchinson 17231ca9fb Merge remote-tracking branch 'devhead/Preview4_0' into tsneo ... # Conflicts: # Engine/source/platform/types.visualc.h # Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript # Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript # Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript # Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui		2021-09-01 22:26:23 -04:00
..
GUI	Merge remote-tracking branch 'devhead/Preview4_0' into tsneo	2021-08-13 20:14:39 -04:00
Scripts	Improves handling of rendering guiPopupCtrls where if the height extent is taller than the bitmap array height, it'll adjust the height to recenter the displayed bitmap elements.	2021-09-01 01:12:16 -05:00
main.tscript	Improve handling of non-default script filenames	2021-01-19 21:32:31 +01:00