Commit graph

174 commits

Author SHA1 Message Date
Christoph Oelckers
4d8a2c91f2 - another WIP. 2021-05-19 00:43:50 +02:00
Christoph Oelckers
bd1755dee7 WIP 2021-05-18 08:01:08 +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
04f96e223f - gotpic stuff. 2021-05-10 16:08:46 +02:00
Christoph Oelckers
6c8b133b87 - integrated all the recent UI changes into Witchaven. 2021-05-09 16:05:42 +02:00
Christoph Oelckers
8c6cecd738 - scriptified WH cutscenes and created a texture name definition table. 2021-05-03 18:58:02 +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
ba5b8b3d6f Merge commit '2f696e1a95997f2969d1ddb49cd2827bde58479f' into whaven
# Conflicts:
#	source/core/gameinput.h
2021-04-19 13:11:41 +02: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
2a7f2f4381 Merge commit '798cf2f9733c1415eef335a45f4d69962fae0695' into whaven 2021-04-12 20:41:39 +02:00
Christoph Oelckers
e9ab48aa93 Merge commit 'e959226914b3e1243cbb52ebbe90c5f7e91f85c2' into whaven
# Conflicts:
#	source/core/gameinput.h
2021-04-11 11:32:31 +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
3e17f3cb97 Merge commit 'fd0e9824b60a8cae288102551f0f3134a221cf3c' into whaven
# Conflicts:
#	source/build/include/build.h
#	source/build/src/engine.cpp
#	source/build/src/engine_priv.h
2021-03-26 15:35:19 +01:00
Christoph Oelckers
a118564859 - hook up the new renderer. 2021-03-24 19:18:51 +01:00
Mitchell Richters
446723c0dc - WHaven: Initial chase cam implementation.
* Sprite's angle still requires some work.
2021-02-25 22:57:15 +11:00
Mitchell Richters
f80570634f - WHaven: Migrate lockclock to backend solution. 2021-02-25 20:40:33 +11:00
Mitchell Richters
7991dea49a - WHaven: Fix ticrate. 2021-02-14 07:43:24 +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
Mitchell Richters
266dab81cd - WHaven: Use backend sprite interpolation methods. 2021-02-13 19:48:50 +11:00
Mitchell Richters
4e5ee86bd7 - WHaven: Interpolate weapon changing drop. 2021-02-13 19:00:40 +11:00
Mitchell Richters
16c0f88451 - WHaven: Interpolate weapon HUD bobbing/swaying. 2021-02-13 19:00:37 +11:00
Mitchell Richters
6390efe32e - WHaven: Fix HUD weapon positioning. 2021-02-13 19:00:35 +11:00
Mitchell Richters
eef77e80f7 - Get whaven building now that submodules have been removed.
* Since all code is included in `all.cpp`, several identically named static functions have been renamed to avoid conflicts.
2021-02-13 19:00:27 +11:00
Mitchell Richters
e8894eeab0 - WHaven: Replace all *mulscale*() function calls with ones in m_fixed.h. 2021-01-01 19:30:04 +11:00
Mitchell Richters
449714667b - buildutils: Replace sintable[] use within remainder of WHaven's files with bsin()/bcos(). 2021-01-01 19:16:29 +11:00
Mitchell Richters
96aa6452ef - buildutils: Replace sintable[] use within WHaven's whani.cpp with bsin()/bcos(). 2021-01-01 19:16:07 +11:00
Mitchell Richters
bf06ac6460 - buildutils: Replace sintable[] use within WHaven's weapons.cpp with bsin()/bcos(). 2021-01-01 19:15:57 +11:00
Mitchell Richters
26c378936d - buildutils: Replace sintable[] use within remainder of WHaven's ai*.cpp files with bsin()/bcos(). 2021-01-01 18:54:13 +11:00
Mitchell Richters
60761ba779 - buildutils: Replace sintable[] use within WHaven's ai.cpp with bsin()/bcos(). 2021-01-01 18:51:25 +11:00
Mitchell Richters
a8d8335e2b - WHaven: Uplift sector/wall x/y panning in line with changes from d545eb7aa9 and 2cd3927613. 2021-01-01 17:44:59 +11:00
Christoph Oelckers
110adf4a83 - WH: fixed ambiguous naming of 'attack' functions. 2020-11-09 18:23:23 +01:00
Christoph Oelckers
f87d524987 - WH: initialize weapons. 2020-11-09 18:22:10 +01:00
Christoph Oelckers
dbb7697eed - WH: initialize the items. 2020-11-09 18:14:10 +01:00
Christoph Oelckers
2fbaaba116 - WH: initialize the AI data. 2020-11-09 18:07:44 +01:00
Mitchell Richters
7881dc9907 - WHaven: Fix compilation following merge of master in 5d77b1fd25. 2020-11-08 21:03:11 +11:00
Mitchell Richters
ed942ab1b7 - WHaven: Fix sprite interpolation issues. 2020-11-08 19:57:32 +11:00
Mitchell Richters
7a181400b6 - WHaven: Enable unsynchronised input. 2020-11-08 17:57:26 +11:00
Mitchell Richters
249ea218f4 - WHaven: Uplift of ang to backend code. 2020-11-08 17:57:16 +11:00
Mitchell Richters
3813913970 - WHaven: Uplift of horiz to backend code. 2020-11-08 17:51:38 +11:00
Mitchell Richters
d8c7fcd259 - WHaven: Get fvel/svel working for player. 2020-11-08 17:31:52 +11:00
Mitchell Richters
6dd2f31156 - WHaven: Set enginecompatibility_mode to ENGINECOMPATIBILITY_19950829 in app_init(). 2020-11-02 22:31:36 +11:00
Mitchell Richters
4382ab09b8 - WHaven: Fix issues with smoothratio. 2020-11-02 22:31:33 +11:00
Christoph Oelckers
422d9bfebd - text update. 2020-10-31 14:08:07 +01:00
Christoph Oelckers
91ebe9bcc2 - prepared everything for use of the string table.
# Conflicts:
#	wadsrc/static/language.csv
2020-10-31 14:08:07 +01:00
Christoph Oelckers
fd3303ab2b - set up the Witchaven specific controls and their menu entries.
Sorry, no text file yet.
2020-10-31 14:07:43 +01:00
Christoph Oelckers
7f921be824 - activated weapon code and reverted quick graphics test.
Weapons do not work yet, though.
2020-10-31 14:07:43 +01:00
Christoph Oelckers
e33c7d54ac - added the weapon drawer. 2020-10-31 14:07:43 +01:00
Christoph Oelckers
25a0ce51ba - route the input to the player.
Still very broken.
2020-10-31 14:07:42 +01:00
Christoph Oelckers
dc24dcadf5 - added input code.
Not tested yet!
2020-10-31 14:07:42 +01:00
Christoph Oelckers
725cacb8e8 - added a bit more of the GameInterface. 2020-10-31 14:07:42 +01:00
Christoph Oelckers
a31bc4be6b - added the needed parts to start the game from the menu.
Levels render, but gameplay has not been hooked up yet.
2020-10-31 14:07:42 +01:00
Christoph Oelckers
629737bd72 - main 3D render function. 2020-10-31 14:07:41 +01:00
Christoph Oelckers
30e96293cf - implemented the game progression interface. 2020-10-31 14:07:40 +01:00
Christoph Oelckers
9952e6d2b0 - added 'dophysics'. 2020-10-31 14:07:40 +01:00
Christoph Oelckers
434e4479a1 - added the loading screen - although this will be disabled just like the other games for now. 2020-10-31 14:07:40 +01:00
Christoph Oelckers
abc61902bb - added the WH! victory sequence. 2020-10-31 14:07:40 +01:00
Christoph Oelckers
18e37577bc - ported the statistics screen. 2020-10-31 14:07:39 +01:00
Christoph Oelckers
0e051a9d96 - precaching for WH. 2020-10-31 14:07:39 +01:00
Christoph Oelckers
23c6f4434e - analyzesprites function. 2020-10-31 14:07:39 +01:00
Christoph Oelckers
5c22908dc2 - added the screen flash code, although I have no idea how to properly render this.
What's there is an extrapolation of how Exhumed handled a similar blend mode but this needs thorough testing to fine tune.
2020-10-31 14:07:38 +01:00
Christoph Oelckers
fca94d64ed - added savegame code. 2020-10-31 14:07:38 +01:00
Christoph Oelckers
0a03331400 - added a bit more code for the main loop. 2020-10-31 14:07:38 +01:00
Christoph Oelckers
82f23a4733 - implemented the sound system for Witchaven.
The sound system itself is as primitive as it can get, the main change was to link sounds to sprites and not just their coordinates.
2020-10-31 14:07:37 +01:00
Christoph Oelckers
45d2fd95a9 - implementing the Witchaven menu.
Main menu is working, skill menu still to do.
2020-10-31 14:06:12 +01:00
Christoph Oelckers
6dfd36dba7 - draw the menu background. 2020-10-31 14:06:12 +01:00
Christoph Oelckers
f32e9b25e0 - Witchaven 2 font 2020-10-31 14:05:39 +01:00
Christoph Oelckers
2bebe0fa6a - the WH intro movies are playing now. 2020-10-31 14:05:01 +01:00
Christoph Oelckers
a23839b8e8 WIP 2020-10-31 14:05:01 +01:00
Christoph Oelckers
7f7a576961 - music code. 2020-10-31 14:05:00 +01:00
Christoph Oelckers
a4ce1688d5 - hooked up the Witchaven frontend with the core. 2020-10-31 14:05:00 +01:00
Christoph Oelckers
d9757017ee - re-added the texture animation code. 2020-10-31 14:05:00 +01:00
Christoph Oelckers
fb2629002f - fixed things so that everything compiles.
This isn't usable yet because only the play code is present.
2020-10-31 14:04:59 +01:00
Christoph Oelckers
f50b0f937d - added most of the remaining play code. 2020-10-31 14:04:59 +01:00
Christoph Oelckers
96637a25d1 - importing Witchaven code from GDX
This is a straight port of the GDX Java code to C++ with as few changes made as possible.
Part 1: AI code.
2020-10-31 14:04:59 +01:00