zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-12 13:41:48 +00:00
Code Issues Projects Releases Packages Wiki Activity
14314 commits 34 branches 63 tags 172 MiB
Commit graph

125 commits

Author SHA1 Message Date
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
207298aeb4 - fixed compilation (again.) 2021-06-02 21:00:39 +02:00
Christoph Oelckers
7fa690082e - fixed cherry picked commit. 
# Conflicts:
#	source/core/gamecontrol.h
 2021-06-02 20:52:47 +02:00
Christoph Oelckers
d44500863b - removed the multiplayer scoreboard screens. 
Since there is no plan to keep them in case MP gets implemented there's no need to maintain them.
These should later be replaced by a generic screen using a better font and a layout that takes higher resolutions into account.
 2021-05-27 13:33:54 +02:00
Christoph Oelckers
d7a47b2f3a - route all accesses to gameaction from the backend through the sysCallbacks. 
gameactions are frontend specific so this needs to be decoupled.
 2021-05-22 13:02:34 +02:00
Christoph Oelckers
e10bcf6294 - split the screen job code into a generic and a Raze specific part. 
Preparations for porting this to GZDoom.
 2021-05-22 01:35:50 +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
499ed52972 - route savegame requests through the newwork, just like GZDoom does. 
Although a bit overkill for single player saves only, this will ensure consistent behavior between both engines regarding the menu.
 2021-05-12 00:21:26 +02:00
Christoph Oelckers
6f19c415d6 Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven 
# Conflicts:
#	source/core/gamecontrol.h
#	source/core/searchpaths.cpp
#	wadsrc/static/zscript.txt
#	wadsrc/static/zscript/razebase.zs
 2021-05-03 18:53:54 +02:00
Christoph Oelckers
8003ab6fa3 Merge branch 'scriptable_cutscenes' into newrenderer 2021-05-02 22:37:46 +02:00
Christoph Oelckers
21aa5c9234 - added game flags for all supported add-ons. 2021-04-30 20:08:31 +02:00
Christoph Oelckers
7fbe153ae7 - more Duke screen porting. 2021-04-30 20:08:24 +02:00
Christoph Oelckers
5784e45f41 Merge commit 'aa6bd8ffcc11c0ae3de1dae1ab530a999dd510c9' into whaven 
# Conflicts:
#	source/core/gameinput.h
 2021-04-25 12:18:39 +02:00
Christoph Oelckers
8c379f7a44 Merge branch 'master' into newrenderer 2021-04-25 11:33:47 +02:00
Christoph Oelckers
5585351c0f - added a hack to help the new renderer with Lunatic Fringe. 
This is by no means a permanent solution but having it buys some time to find something more universal that won't affect performance too badly and investigate the need for a more robust solution.
The idea here is to define pairs of walls where when the first element of the pair is seen, it will treat the second one as view blocking.
This is used as the two offending windows (sectors 151 and 152) to cope with the lack of a height sensitive clipper.
 2021-04-24 20:00:54 +02:00
Mitchell Richters
8e53489487 - Remove some leftover stuff from gamecontrol.h. 2021-04-22 18:53:14 +10:00
Christoph Oelckers
e82f17f9c6 Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven 
# Conflicts:
#	source/core/d_protocol.h
#	source/core/gameinput.h
 2021-04-17 14:59:12 +02:00
Christoph Oelckers
9a58299bee Merge branch 'master' into newrenderer2 2021-04-14 22:37:59 +02:00
Christoph Oelckers
4fe3c50c7c - used the newly added game ID as reference for GAMEINFO to autoselect which game to start a mod with. 
While in GZDoom this uses the IWAD name, the same approach is a lot more problematic here because of name duplications with far more incompatible content.
So this allows targeting a group of base games instead of one specific version.
 2021-04-13 18:08:55 +02:00
Christoph Oelckers
2a7f2f4381 Merge commit '798cf2f9733c1415eef335a45f4d69962fae0695' into whaven 2021-04-12 20:41:39 +02:00
Christoph Oelckers
42d02834b1 Merge branch 'master' into newrenderer2 
# Conflicts:
#	source/build/include/build.h
#	source/build/src/polymost.cpp
#	source/build/src/voxmodel.cpp
#	source/core/gamecontrol.cpp
#	source/core/gamestruct.h
#	source/games/blood/src/animatesprite.cpp
#	source/games/blood/src/misc.h
#	source/games/blood/src/view.cpp
#	source/games/duke/src/render.cpp
#	source/games/sw/src/draw.cpp
#	source/games/sw/src/game.h
#	source/games/sw/src/jsector.cpp
#	source/glbackend/glbackend.cpp
 2021-04-11 14:38:56 +02:00
Christoph Oelckers
db5fbe3bbb - make the startup banner in the initial console window work. 2021-04-10 19:14:30 +02:00
Christoph Oelckers
aedb17e539 Merge commit 'a5ed7ba8a3eb26d3e3aa46bc87044608eacba57f' into whaven 2021-04-10 17:00:43 +02:00
Christoph Oelckers
333581a084 Merge branch 'master' into newrenderer2 
# Conflicts:
#	source/build/src/defs.cpp
 2021-04-09 19:57:56 +02:00
Christoph Oelckers
fb02b38279 - better .def loading logic. 
To allow cumulative loading without interfering with other ports, Raze will now look for files called xxxx-raze.def, where xxxx is the default .def name (e.g. duke3d-raze.def for Duke3D.) and if that is found, cumulatively load all same-named files - it will fall back on the default name if no such thing is found.
-def still overrides both and will not cumulatively load.
 2021-04-09 14:30:01 +02:00
Christoph Oelckers
e30dc82676 - Cleanup of the voxel code. 
* moving polymost_voxdraw into polymost.cpp.
* consolidated all remaining voxel code in hw_voxels.cpp. All original Build voxel code is completely gone now, except for polymost_voxdraw, so this got moved out of the build/ folder.
* integrate Blood's voxel init code into the main function.
* some further cleanup was allowed as a result of this, so engineInit is gone now because these parts can now be done outside the games' app_init functions.
 2021-04-05 18:05:43 +02:00
Christoph Oelckers
56eda9928c Merge commit 'ba90f444ddc85aaafab595915353362f6e181855' into whaven 
# Conflicts:
#	source/core/gameinput.h
 2021-04-05 14:12:44 +02:00
Christoph Oelckers
97a0cb2a10 - handle voxel rotation in the backend to enable it for all games. 
This was previously only present in the Blood module and missed in Exhumed from upstream so the entire option was rather pointless.
Fixes #290
 2021-04-04 10:33:29 +02:00
Christoph Oelckers
b8fd41a58f Merge master into whaven 
# Conflicts:
#	source/core/gamecontrol.h
 2021-03-15 10:42:59 +01:00
Christoph Oelckers
f4b27bbd27 - sort the game selection list by definition order in grpinfo.txt. 
This is to have consistent ordering, independent of where the files are found.
Game order is: Duke, Blood, Shadow Warrior, Redneck Rampage, Nam, WW2GI, Exhumed, all the official mission packs are grouped below the game they belong to.
 2021-03-12 23:45:03 +01:00
Mitchell Richters
e5d4661d79 Merge branch 'master' into whaven 2021-02-25 20:35:26 +11:00
Mitchell Richters
2abda0e27d - All Games: Migrate each game's clock counter to backend solution. 2021-02-18 21:47:33 +11:00
Christoph Oelckers
14b7d65229 - Witchaven: Added 'give' CCMD and some basic cheats. 
Most of WH2's cheats not done yet.
 2021-02-13 11:47:04 +01:00
Christoph Oelckers
5aacb2370d - fixed game resource lookup. 
The algorithm was a bit too complicated and missed the smallest defined game resource.
GrpInfo was renamed because there were two of them which created a debugger conflict.
 2021-02-13 10:07:18 +01: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
Christoph Oelckers
5b6aa372ea - fixed autoaim check and adjusted presentation in the menu to be correct for all games. 
Fixes #264
 2021-02-06 10:56:11 +01:00
Mitchell Richters
5124c0daec - Amalgamate ksgn and sgn into Sgn in cmdlib.h, and remove pragmas.h. 2021-01-05 07:31:37 +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
a515426c68 Merge branch 'master' into witchaven2 2021-01-01 17:32:32 +11:00
Christoph Oelckers
5850c7b284 - let SyncInput return a combination of gamesetinput and cl_syncinput - also serialize gamesetinput. 2020-11-30 23:45:21 +01:00
Mitchell Richters
22f7fc93f4 - Exhumed/SW: Move code to trigger synchronised input for edge cases where its needed into gamecontrol. 2020-12-01 07:31:47 +11:00
Mitchell Richters
b9e1cbb5de - gamecontrol.h: Move getHalfLookAng() into PlayerAngle struct as look_anghalf(). 
* Uses internal struct variables at full BAM precision.
 2020-11-26 16:37:37 +11:00
Mitchell Richters
32a1796728 - buildutils: Replace sintable[] use within Build with bsin()/bcos(), using bsinf()/bcosf() where appropriate. 
* Includes a few header include shuffles to make it all come together.
 2020-11-22 21:18:02 +01: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
f9f365a593 - Ensure crouch_toggle bool from 6e3d414b3c is serialised when saving game, and cleared when InputState::ClearAllInput() is called. 2020-11-08 07:30:48 +11:00
Christoph Oelckers
ff06895470 - added game identifiers for Witchaven 1+2 
Lacking any main resource file, this checks for the JOESND containers to avoid rewriting the detection logic to work without containers.
 2020-10-31 14:05:00 +01:00
Christoph Oelckers
f50b0f937d - added most of the remaining play code. 2020-10-31 14:04:59 +01:00
Christoph Oelckers
1757ef2aa6 - split the game input code off gamecontrol.cpp into its own file. 2020-10-11 16:33:43 +02:00
Christoph Oelckers
8e1c71b867 Merge branch 'InputContinuation' 2020-10-11 15:24:51 +02:00