Christoph Oelckers 42d02834b1 Merge branch 'master' into newrenderer2 ... # Conflicts: # source/build/include/build.h # source/build/src/polymost.cpp # source/build/src/voxmodel.cpp # source/core/gamecontrol.cpp # source/core/gamestruct.h # source/games/blood/src/animatesprite.cpp # source/games/blood/src/misc.h # source/games/blood/src/view.cpp # source/games/duke/src/render.cpp # source/games/sw/src/draw.cpp # source/games/sw/src/game.h # source/games/sw/src/jsector.cpp # source/glbackend/glbackend.cpp		2021-04-11 14:38:56 +02:00
..
build	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
common	- migrated 'texture' .def command.	2021-04-10 14:09:08 +02:00
core	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
games	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
glbackend	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +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 branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
g_pch.h
gitinfo.cpp