Christoph Oelckers 53162a8a5c Merge branch 'master' into new_level_refactor ... # Conflicts: # src/am_map.cpp		2019-02-03 09:20:13 +01:00
..
statscreen.txt	Merge branch 'master' into new_level_refactor	2019-02-03 09:20:13 +01:00
statscreen_coop.txt	- silenced a few float truncation warnings that get printed in developer mode.	2017-04-27 10:23:31 +02:00
statscreen_dm.txt	- silenced a few float truncation warnings that get printed in developer mode.	2017-04-27 10:23:31 +02:00
statscreen_sp.txt	- fixed display of WIPAR lump on Doom intermission screen.	2017-05-07 10:29:58 +02:00
types.txt	- status screen fully scriptified but not active yet.	2017-03-18 19:35:26 +01:00