Mitchell Richters
|
5fc7c7b1d7
|
Merge branch 'master' into whaven
# Conflicts:
# source/CMakeLists.txt
# source/build/include/buildtypes.h
# source/common/utility/m_fixed.h
# source/core/console/c_notifybuffer.cpp
# source/core/gamecontrol.h
# source/core/inputstate.cpp
# source/core/version.h
|
2021-02-13 18:59:58 +11:00 |
|
Mitchell Richters
|
25eaeff0db
|
- Wrap all g_gameType & GAMEFLAG_BLOOD checks into isBlood() inline.
|
2021-01-02 14:46:58 +11:00 |
|
Mitchell Richters
|
f7e30acf85
|
- gamecontrol.h: Define GAMEFLAG_WHALL as bitwise or of GAMEFLAG_WH and GAMEFLAG_WH2.
|
2020-11-08 21:59:46 +11:00 |
|
Christoph Oelckers
|
5d77b1fd25
|
Merge branch 'master' into witchaven2
# Conflicts:
# source/core/packet.h
# wadsrc/static/menudef.txt
|
2020-11-08 10:44:19 +01:00 |
|
Mitchell Richters
|
8178d20f97
|
- c_notifybuffer.cpp: Center and pulse text for all RR games in DrawNative().
* Fixes #163.
|
2020-11-08 10:39:45 +11:00 |
|
Christoph Oelckers
|
15eae9c4a2
|
- added native notify text positioning for Witchaven.
Nothing fancy here - just a single line of text in the top left - just offset a bit from the edge of the screen.
|
2020-10-31 14:07:41 +01:00 |
|
Christoph Oelckers
|
8d3585afe1
|
- console cleanup.
The bulk of the console is now free of game dependencies.
|
2020-10-25 13:14:42 +01:00 |
|