Christoph Oelckers 6f19c415d6 Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven ... # Conflicts: # source/core/gamecontrol.h # source/core/searchpaths.cpp # wadsrc/static/zscript.txt # wadsrc/static/zscript/razebase.zs		2021-05-03 18:53:54 +02:00
..
build	- migrated SW to RMAPINFO as well.	2021-05-02 17:35:25 +02:00
common	Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven	2021-05-03 18:53:54 +02:00
core	Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven	2021-05-03 18:53:54 +02:00
games	Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven	2021-05-03 18:53:54 +02:00
glbackend	Merge branch 'scriptable_cutscenes' into newrenderer	2021-05-02 22:37:46 +02:00
libsmackerdec	- fixed the noisiest value truncation warnings after shortly re-enabling them in the compiler, plus a few places where the warning pointed to incorrect code.	2020-09-26 11:59:24 +02:00
platform	- Remove leftover Ion Fury stuffs causing log errors like "Script error, 'D:/Program Files (x86)/Steam/steamapps/common/Ion Fury/fury.grpinfo" line 10: Warning: GRP without game defined. Ignoring'".	2020-09-25 18:06:06 +10:00
thirdparty	- macOS backend update, plus moving base64.cpp around.	2020-09-27 16:12:50 +02:00
CMakeLists.txt	Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven	2021-05-03 18:53:54 +02:00
g_pch.h
gitinfo.cpp