Commit graph

7 commits

Author SHA1 Message Date
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
Lukas Aldershaab 9a795e89f3 Update usage of TinyXML to use TinyXML2 2021-07-31 21:54:19 +02:00
Jeff Hutchinson 02447f0996 compile fixes. 2021-03-31 22:12:58 -04:00
Lukas Aldershaab 7dc2521c76 Use string.compare instead of String::compare when comparing strings 2020-10-04 00:33:21 +02:00
Lukas Aldershaab 197a62f6ea Convert dStrcmp to String::compare for more cases 2020-10-04 00:00:01 +02:00
Brian Roberts 9592275fb8 mac compilation correction - verve templates order of operation compiles 2019-05-21 19:33:35 -05:00
Areloch 87ee749801 (Mostly) updated verve implementation. 2019-03-07 16:23:41 -06:00