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
..
movieplayer.cpp	- Replace MAX() from templates.h with version provided in STL.	2021-10-30 10:36:02 +02:00
playmve.cpp	- removed templates.h includes.	2021-10-30 10:51:03 +02:00
playmve.h	- split the screen job code into a generic and a Raze specific part.	2021-05-22 01:35:50 +02:00
screenjob.cpp	Merge branch 'master' into whaven	2021-10-28 09:45:52 +11:00
screenjob.h	- halt the game timer when setting up a cutscene and when starting movie playback.	2021-05-23 14:36:54 +02:00