Christoph Oelckers 7ba152e588 Merge branch 'master' into whaven ... # Conflicts: # source/core/gameinput.h # source/core/version.h # source/games/exhumed/src/enginesubs.cpp # source/games/sw/src/game.cpp		2021-11-12 11:19:23 +01:00
..
clip.cpp	- made clipmoveboxtracenum a function argument of clipmove	2021-11-08 23:22:48 +01:00
engine.cpp	Merge branch 'master' into whaven	2021-11-12 11:19:23 +01:00
engine_priv.h	Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven	2021-03-26 15:35:19 +01:00
mdsprite.cpp	- fixed warnings in Build code.	2021-05-12 21:47:32 +02:00
polymost.cpp	- removed magic flags added to sector indices in Polymost.	2021-11-11 21:28:53 +01:00