Commit Graph

11255 Commits

Author SHA1 Message Date
Christoph Oelckers a93ed1e502 Merge branch 'master' into back_to_basics2
# Conflicts:
#	source/blood/src/view.cpp
#	source/core/gamecontrol.cpp
2020-07-14 12:57:38 +02:00
Christoph Oelckers 9caf1ead91 - use the common interpolation function for Blood.
This keeps the main calculation for time difference in one place.
2020-07-14 12:48:56 +02:00
Christoph Oelckers 893686709b - removed the redundant rfreq factor from CalcSmoothRatio.
I never realized it was redundant when consolidating the interpolation math into one function - originally this was done in a way that it wasn't obvious.
This also eliminates the dependency on refreshFreq which never actually made any sense.
2020-07-14 12:32:59 +02:00
Christoph Oelckers 481ac965cf - reverted ClockTicks to an integer so that interpolation can be reimplemented without it affecting the global game timer.
The entire method at use here is essentially not correct. Interpolation should be handled independently of the game timer directly based on the underlying clock, like in ZDoom.
There's interpolation bugs in the Build games that cannot be fixed if totalclock is used for it, but if we use something else we do not need a fractional totalclock.
2020-07-14 11:52:38 +02:00
Christoph Oelckers a24034e087 - removed some demo code from savegame.cpp. 2020-07-07 23:07:03 +02:00
Christoph Oelckers 319e2e2745 - minor cleanup 2020-07-07 23:01:34 +02:00
Christoph Oelckers ecddd8687c - newgame is clean now. 2020-07-07 22:41:31 +02:00
Christoph Oelckers 63eaec916b - fixed a few things.
Basic level progression is working, special cases still need testing, but for now it's good enough.
2020-07-07 21:38:20 +02:00
Christoph Oelckers 01fce31f43 - everything compiles again.
Still needs testing.
2020-07-07 20:27:21 +02:00
Christoph Oelckers 915b566612 - another safety commit. 2020-07-07 17:56:20 +02:00
Christoph Oelckers 6b86d7606f - safety commit - does not compile! 2020-07-07 13:19:09 +02:00
alexey.lysiuk df2b3b6b17 - made mouse scaling in Cocoa backend match other platforms 2020-07-07 11:37:23 +03:00
Christoph Oelckers dd45749650 - got rid of m_level_number and m_volume_number.
These were only needed so that G_NewGame_EnterLevel could be called without parameters. Ouch!
2020-07-07 10:17:02 +02:00
Christoph Oelckers 7f3c0ef16c - safety commit 2020-07-07 09:39:33 +02:00
Christoph Oelckers 34874d1a21 - migrated displayrest and took the opportunity to un-fuck the palette management. 2020-07-07 04:54:12 +02:00
Christoph Oelckers b6f410923e - restored most of the original user_defs.
Most of the added EDuke things were gone anyway.
2020-07-07 00:16:54 +02:00
Christoph Oelckers 43ff87f47f - lightened player.h a bit more. 2020-07-06 23:50:14 +02:00
Christoph Oelckers dca7e158bb - "po" reverted 2020-07-06 23:33:33 +02:00
Christoph Oelckers e8ebeefaad - started consolidating the struct types.h 2020-07-06 23:24:35 +02:00
Christoph Oelckers 642ae03d90 - use player_struct from JFDuke. 2020-07-06 23:05:48 +02:00
Christoph Oelckers 631398a35a - renamed a few things. 2020-07-06 23:04:19 +02:00
Christoph Oelckers 1644c1d33a - cleanup continues. 2020-07-06 23:02:41 +02:00
Christoph Oelckers 45f51b0c4b -more header work. 2020-07-06 22:55:35 +02:00
Christoph Oelckers 0d0f6854c3 - cleaned out another header file. 2020-07-06 22:54:26 +02:00
Christoph Oelckers 83bcfcfd0c - Big cleanup. 2020-07-06 22:53:20 +02:00
Christoph Oelckers f1babcee95 - more header cleanup. 2020-07-06 16:24:22 +02:00
Christoph Oelckers a4879fb338 - draw all overlay elements on the game screen. 2020-07-06 15:52:09 +02:00
Christoph Oelckers e272245537 - fixing some HUD stuff. 2020-07-06 15:48:51 +02:00
Christoph Oelckers 928620ab91 - why was this missed? 2020-07-06 13:27:56 +02:00
Christoph Oelckers f2380f8829 - constant cleanup. 2020-07-06 13:26:26 +02:00
Christoph Oelckers 5d93e946c2 - moved all prediction code into a separate (inactive) source file. 2020-07-06 11:39:39 +02:00
Christoph Oelckers f4e763e252 - input code cleanup.
The input queues are mostly abstracted now and some EDuke specific handling that isn't needed anymore was removed.
2020-07-06 10:34:31 +02:00
Christoph Oelckers 9300c0bdeb - stripped down the main menu loop to the minimum needed to be able to run it. 2020-07-06 08:55:56 +02:00
Christoph Oelckers 736a52f7b2 - startrts and domovethings. 2020-07-06 03:00:52 +02:00
Christoph Oelckers 827672a775 - moveclouds. 2020-07-06 02:05:31 +02:00
Christoph Oelckers 25bff01c70 - cleanup. 2020-07-06 00:54:06 +02:00
Christoph Oelckers c6b619214f - cleanup of viewborder code.
The view border will now only be rendered in one place - inside displayrooms. None of the 2D content still depends on what it is set to.
2020-07-06 00:15:22 +02:00
Christoph Oelckers 021799573e - fixed sprite animations. 2020-07-05 23:22:35 +02:00
Christoph Oelckers 7bd2b33e39 - fixed centering of RR big text. 2020-07-05 21:40:51 +02:00
Christoph Oelckers 90d5d7ba75 . ugh. 2020-07-05 21:24:55 +02:00
Christoph Oelckers cfe1e531c5 - activated the newly added render code and deleted the old one. 2020-07-05 21:21:39 +02:00
Christoph Oelckers 7ead48b9d9 - safety commit for displayrooms. 2020-07-05 16:49:00 +02:00
Christoph Oelckers 53f36e5c40 - fixed P_GetInput to work with the changed backend. 2020-07-05 12:26:00 +02:00
Christoph Oelckers 8a1206edbc Merge remote-tracking branch 'remotes/origin/master' into back_to_basics2 2020-07-05 11:55:41 +02:00
Christoph Oelckers c08b8dc17b - camera display fix.
This is one fucked up mess of code.
2020-07-05 11:54:50 +02:00
Christoph Oelckers 2e78c08856 - fixed palette transparency checks 2020-07-05 10:15:55 +02:00
Mitchell Richters dae1506182 - change `std::max()` to `std::min()` in glbackend.h. Fixes issue in coelckers/Raze#83. 2020-07-05 09:05:19 +02:00
Christoph Oelckers 2b61b44188 - remove unused variable. 2020-07-05 08:58:13 +02:00
Mitchell Richters 30300bf3b2 - allow shade in glbackend.h to accept negative values, but still at a max of numshades-1.
* This fixes some issues with distance lighting issues in Duke3D as reported at https://forum.zdoom.org/viewtopic.php?f=341&t=68838&start=75#p1158417.
2020-07-05 08:57:21 +02:00
Christoph Oelckers 2105af8096 - deleted some garbage. 2020-07-05 00:39:34 +02:00