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 |
|
Christoph Oelckers
|
389f760d45
|
- address C++20 deprecation warnings with enums in floating point arithmetic.
|
2021-11-02 23:32:31 +01:00 |
|
Mitch Richters
|
4030a18245
|
Merge branch 'master' into whaven
|
2021-10-28 09:45:52 +11:00 |
|
Mitchell Richters
|
6894be4ad1
|
- Use the new isSWALL() wrapper everywhere.
|
2021-07-11 12:40:01 +10:00 |
|
Christoph Oelckers
|
d35092698d
|
- Witchaven: fix status bar code so that everything compiles again.
|
2021-06-03 19:42:49 +02:00 |
|
Christoph Oelckers
|
198fbf9297
|
Merge branch 'master' into whaven
# Conflicts:
# source/core/screenjob.cpp
# source/core/searchpaths.cpp
|
2021-06-03 08:52:19 +02:00 |
|
Christoph Oelckers
|
cd56fd66d2
|
- RR: fixed advanced notify display's font size.
At some point the scale multiplier must have gotten lost, which with the twice as large fonts in this game resulted in text being too large.
|
2021-05-31 21:20:28 +02:00 |
|
Christoph Oelckers
|
671d200aa7
|
Merge branch 'master' into whaven
# Conflicts:
# source/build/include/buildtypes.h
# source/core/console/c_notifybuffer.cpp
# source/core/d_protocol.h
# source/core/version.h
# wadsrc/static/zscript.txt
|
2021-05-16 13:03:17 +02:00 |
|
Christoph Oelckers
|
cb2bc7967a
|
- fixed the remaining warnings.
|
2021-05-12 21:50:01 +02:00 |
|
Christoph Oelckers
|
783b94f922
|
- more warning fixes in 'core'.
|
2021-05-12 21:48:14 +02:00 |
|
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 |
|