Christoph Oelckers 1dbbb56a1b Merge branch 'master' into new_level_refactor ... # Conflicts: # src/p_user.cpp		2019-02-02 16:58:30 +01:00
..
hudmessages.cpp	- moved the hud message and alt hud code from g_shared to g_statusbar	2019-01-31 02:31:57 +01:00
sbar.h	- use a separate variable pointing to the current level for the UI code.	2019-01-25 18:31:40 +01:00
sbar_mugshot.cpp	- removed all remaining native parts of APlayerPawn.	2019-01-03 22:05:49 +01:00
sbarinfo.cpp	- renamed the level variables.	2019-02-02 00:25:51 +01:00
sbarinfo.h	- added a 'protrusion' property to SBARINFO so that the map name display can properly be handled here as well. Until now it was only working for scripted status bars.	2017-05-05 19:32:37 +02:00
sbarinfo_commands.cpp	Merge branch 'master' into new_level_refactor	2019-02-02 16:58:30 +01:00
shared_hud.cpp	- moved the hud message and alt hud code from g_shared to g_statusbar	2019-01-31 02:31:57 +01:00
shared_sbar.cpp	Merge branch 'master' into new_level_refactor	2019-02-02 16:58:30 +01:00