Commit graph

791 commits

Author SHA1 Message Date
toaster
48d451cfef Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into new-menus
# Conflicts:
#	src/d_ticcmd.h
#	src/deh_soc.c
#	src/deh_soc.h
#	src/deh_tables.c
#	src/dehacked.c
#	src/f_finale.c
#	src/g_game.c
#	src/m_menu.c
2022-05-21 18:57:46 +01:00
toaster
38e6cba181 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into uncapped-absolution
# Conflicts:
#	src/f_finale.c
#	src/sdl/i_video.c
#	src/st_stuff.c
2022-05-21 13:40:20 +01:00
SinnamonLat
30aec86479 Allow P1 to add splitscreen players on command, allow console in menus 2022-05-20 21:36:43 +02:00
Sally Coolatta
5ae8664b70 Try putting lagless camera stuff back 2022-05-19 16:51:26 -04:00
Sally Coolatta
852e9b8ce9 Rebrand all console / window stuff 2022-05-19 15:10:47 -04:00
Eidolon
2c36a8cefe Don't interpolate during net lag 2022-05-17 20:04:26 -05:00
SinnamonLat
51d21ec388 Select profile after title screen 2022-05-18 02:24:29 +02:00
SteelT
7255690482 Restore refreshdirmenu = 0 line that was removed
Fixes the "file was loaded with error" semi-softlock
2022-05-08 12:32:45 -04:00
Sally Coolatta
d262190faf Fix compiling with da strict settings
Moved from gnu99 to gnu11 because I think unnamed union is reasonable, and will also cause a lot of problems down the road if we ever need changes!!
2022-05-07 07:23:26 -04:00
Eidolon
f7ec2f182f Uncapped (squashed v2)
Squashed SRB2 2.2 Public uncapped without UDMF merge

Implement interpolation at the renderer level

Instead of interpolating thinkers, we interpolate mobjs inside the
renderer. Further interpolation is TBI.

Place Frame Interpolation in "Experimental" video options header

This seems like an appropriate way to describe the feature for now.

Add smooth level platter under interpolation, `renderdeltatics`

`renderdeltatics` can be used as a standard delta time in any place,
allowing for smooth menus. It will always be equal to `realtics`
when frame interpolation is turned off, producing consistent
framerate behavior everywhere it is used.

Add smooth rendering to save select screen

Add smooth rendering to Record/NiGHTS Attack, F_SkyScroll

Ensure viewsector is accurate to viewx/viewy

This fixes a potential crash in OpenGL when changing between levels.

Ensure + commands get executed before map start

Always have precise_t defined

Fix misc dropshadow issues

Reset view interpolation on level load

Remove unnecessary precipmobj thinker hack

Add reset interpolation state functions

Reset precip interpolation on snap to ceil

Reset mobj interp state on TeleportMove

Only swap view interp state if a tick is run

Run anti-lag chasecam at tic frequency

Fixes jittery and unstable chasecam in high latency netgames

Homogenize mobj interpolations

Add sector plane level interpolations

Add SectorScroll interpolator

Add SideScroll interpolator

Add Polyobj interpolator

Intialize interpolator list at a better time

Delete interpolators associated with thinkers

Interpolate mobj angles and player drawangle

Interpolate HWR_DrawModel

Add functions to handle interpolation

Much less code duplication

P_InitAngle, to fix angle interpolation on spawning objects

Fully fix drop shadows

It used the thing's floorz / ceilingz directly -- that wouldn't account for interpolated coordinates.

Do not speed up underwater/heatwave effect in OpenGL

Closer OpenGL underwater/heatwave effect to Software

Interpolate from time of previous tic

Previously interpolated from last 35th of a second, which
may be offset from game time due to connection lag.

Consider this the proper fix to 6ecac4159a too.

Calculate FPS stuff even if frame is skipped

I decided ultimately to actually keep the frame skip optimization disabled, because I think it is actually a little bit helpful that you can still get accurate rendering perfstats while paused, however if we decide otherwise then we can have this optimization back without making the game act like it's lagging.

Keep rect in memory

Feel better about this than creating one all da time

Lots of FPS stuff

- Disabled VSync, due to the numerous problems it has.
- Instead, added an FPS cap.
- Frame interpolation is now tied to fpscap != 35.
- By default, the FPS cap is set to the monitor's refresh rate.
- Rewrote the FPS counter.

(This also consolidates several more commits ahead of this
fixing various issues. -eid)

Misc changes after Kart cherry-picks

Fix renderdeltatics with new timing data

Update mobj oldstates before all thinkers

Allow FPS cap values

Adjust how FPS cap is checked to improve FPS stability

Fix precip crash from missing vars

Improve the framerate limiter's timing for extreme stable FPS

Handle the sleep at the end of D_SRB2Loop instead of the start

Simplifies logic in the other parts of the loop, and fixes problems with it frequently waiting too long.

Reset mobj interp state on add

Add mobj interpolator on load netgame

Move mobj interpolators to r_fps

Dynamic slope interpolators

I_GetFrameTime to try and improve frame pace

(It doesn't feel that much better though.)

Move I_FinishUpdate to D_SRB2Loop to sync screen updates with FPS cap, use timestamps in I_FrameCapSleep to simplify the code

Fix plane interpolation light level flickering

Fix flickering plane interpolation for OpenGL in the exact same way

Funny OpenGL renderer being at least 50% copy-pasted Software code :)

P_SetOrigin & P_MoveOrigin to replace P_TeleportMove

Convert P_TeleportMove use to origin funcs

Revert "P_InitAngle, to fix angle interpolation on spawning objects"

This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.

Waypoint polyobjects interpolate z & children

Add interpolation to more moving plane types

Adds interpolation to the following:
- Crumbling platforms
- Mario blocks
- Floatbob platforms (this one works really strangely due to two thinkers, maybe double-check this one?)

Reset overlays interp states each TryRunTics

Interpolate model interpolation (lol)

Use interp tracer pos for GL linkdraw

Papersprite angle interpolation

Makes the ending signpost smooth

Move intermission emerald bounce to ticker

Bring back shadows on polyobjects

Also optimizes the method used so rings can show their shadows too. Using just the subsector is a tad bit imprecise admittedly but any more precise methods get really laggy.

Fix a bunch of ticking in hu_ drawing functions

Revert "Reset overlays interp states each TryRunTics"

This reverts commit a71a216faa20e8751b3bd0157354e8d748940c92.

Move intro ticking out of the drawer

Adjust 1up monitor icon z offsets

Fixes interpolation issues with 1up monitors.

Delta time choose player menu animations

Add drawerlib deltaTime function

Interpolate afterimages further back

Use old sleep in dedicated mode

Clamp cechotimer to 0

Fixes issues with cechos staying on-screen and glitching out
(NiGHTS items for example).

Revert "Remove unnecessary precipmobj thinker hack"

This reverts commit 0e38208620d19ec2ab690740438ac2fc7862a49e.

Fix frame pacing when game lags behind

The frame timestamp should've been made at the start of the frame, not the end.

Fix I_FrameCapSleep not respecting cpusleep

Jonathan Joestar bruh

Allow dedicated to use precise sleep timing again

Instead of only using one old sleep, just enforce framerate cap to match TICRATE.

Make Lua TeleportMove call MoveOrigin

Reset Metal fume interp state on appear

Add interpdebug

Put interpdebug stuff in perfstats instead

Add timescale cvar

Slow the game down to debug animations / interpolation problems! Speed it up if you need to get somewhere quickly while mapping!

Enable timescale outside of DEVELOP builds

It has NETVAR, so it should be fine -- put an end to useful debugging features excluded in multiplayer!

Force interpolation when timescale != 1.0

Reset old_z in MT_LOCKON think

Fixes interpolation artifacting due to spawn pos.

Fix cutscenes in interp

Fix boss1 laser in interp

Interpolate mobj scale

Precalculate refresh rate

Slower PCs can have issue querying mode over and over. This might kinda suck for windowed mode if you have different refresh rate displays but oh well

Fix interp scaling crashing software

Reset interp scale when Lua sets .scale

Disable angle interp on fresh mobjs

Fix interp scale crash for hires sprites

Interp shadow scales

Copy interp state in P_SpawnMobjFromMobj

Fix multiplayer character select

Don't interpolate mobj state if frac = 1.0

Fix Mario block item placement

Interpolate spritescale/offset x/y

Fix offset copies for SpawnMobjFromMobj

THANKS SAL

Add Lua HUD drawlists

Buffers draw calls between tics to ensure hooks
run at the originally intended rate.

Rename drawerlib deltaTime to getDeltaTime

Make renderisnewtic is false between tics

I know what I'm doing! I swear

Completely refactor timing system

Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.

This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.

Ensure mobj interpolators reset on level load

Ensure view is not interpolated on first frame

Disable sprite offset interpolation (for now)

Refactor timing code even more

System layer is greatly simplified and framecap
logic has been moved internally. I_Sleep now
takes a sleep duration and I_SleepDuration
generically implements a precise sleep with spin
loop.

Adjust spawned mobj z by gravity inversion

Only check VERTICALFLIP for old_z calc

Fix Marathon Mode menu for uncapped

Move screenshot code before timing

Only play emerald hunt sounds on new tics

Restore deleted zofs (fixes signpost sparkles etc)

Revert to before screenUpdate boolean was added

Was done this way for the sake of an older version of uncapped's timing; now that the new timing is much better, I decided it should remain as close to pre-uncapped as it can be.

Run UpdateLevelInterpolators in preticker

Fixes KartKrew/Kart-Public#10

Run UpdateMobjInterpolators in preticker

Reset view interp in preticker

Add per-split player view resets
2022-05-06 22:47:39 -05:00
toaster
c85cc0f182 Update all data files that have the "kart" prefix to "ring", so that you can use this in the same folder as an existing non-newmenus install.
ringconfig.cfg
ringprofiles.cfg
ringsavedips.txt
ringexec.cfg
ringserv.cfg
ringdata.dat
replay folder "ringracers"

Screenshots/gifs do not currently have adjusted name to prevent name leakage, we can change this later.
2022-03-29 17:15:18 +01:00
toaster
73dabaeab6 Merge branch 'master' into new-menus
# Conflicts:
#	src/d_clisrv.c
#	src/deh_soc.c
#	src/lua_baselib.c
#	src/m_cheat.c
#	src/m_menu.h
#	src/y_inter.c
2022-03-29 17:14:38 +01:00
Sally Coolatta
db7e71d418 Fix gif recording 2022-03-28 00:25:52 -04:00
Sally Coolatta
74eac3e3f2 Wait did this legitimately mostly fix it?!
I think it was the realtics check...?!

The issue is still here but significantly better... I THINK?? I can't tell if I just hate this code so much I'm telling myself that it's better so I don't have to look at it anymore
2022-03-27 22:16:51 -04:00
Sally Coolatta
8933fe12f6 Haven't fixed netgames yet but pushing what I have at least 2022-03-27 20:26:46 -04:00
Sally Coolatta
c0678e5016 Check FPS cap further in the main loop
This allows map changes to properly run. (I also seem to be able to hit the framerate cap slightly more often ... maybe placebo lol)
2022-03-27 13:17:26 -04:00
Sally Coolatta
12353c2d6f Do the alternative interp failsafe CORRECTLY. 2022-03-27 03:39:19 -04:00
Sally Coolatta
24f870a262 Let's try this instead 2022-03-27 02:20:39 -04:00
Sally Coolatta
35b1a0d63f go back to avg fps 2022-03-27 01:37:24 -04:00
Sally Coolatta
090fc59d12 Merge branch 'master' into finish-update-optimize 2022-03-26 23:51:47 -04:00
Sally Coolatta
369d5398c5 Lots of FPS stuff
- Disabled VSync, due to the numerous problems it has.
- Instead, added an FPS cap.
- Frame interpolation is now tied to fpscap != 35.
- By default, the FPS cap is set to the monitor's refresh rate.
- Rewrote the FPS counter.
2022-03-26 23:48:08 -04:00
toaster
f073218532 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into boss
# Conflicts:
#	src/m_menu.c
2022-03-18 09:07:13 +00:00
toaster
5c77516aab Cleanup of boss info in anticipation of merger.
* Actually add descriptions for the boss-related functions into k_boss.h.
* Introduce K_ResetBossInfo, an internal-only function for handling situations where it needs to be cleared.
* Fix a bug where bossinfo wasn't reset when using the map command to go to a battle map after having been in a boss.
* Fix some bugs where you could provide magnitudes out of the desired range to K_InitBossHealthBar and K_UpdateBossHealthBar.
2022-03-07 13:08:46 +00:00
toaster
ab132300a9 No longer autoload bosstest.pk3 2022-03-05 23:27:09 +00:00
toaster
c1f3237157 Boss API + assorted relevant bugfixes, will go over the featureset of this branch with a fine toothed comb when it's time to write the merge request description so this is all you're getting right now 2022-02-24 21:19:03 +00:00
James R
82f4364eb4 pedantic: fix misc leniencies and GNU-isms 2022-02-20 03:28:22 -08:00
James R
3504f7ebd3 Map buffered inputs to menucmd
This lets buffered tapping not count as one held input.
2022-02-19 16:30:23 -08:00
SinnamonLat
1789dd1255 Rudimentary start on profiles 2022-02-14 23:14:25 +01:00
James R
00a471405d Wrong condition 2022-02-14 14:30:39 +01:00
James R
90eeff00af JUST SEARCH ALL FUCKING WADS 2022-02-14 14:30:39 +01:00
James R
1f40c48bea Do not count gfx.pk3 toward mainwads in testers build 2022-02-14 14:30:39 +01:00
James R
a684b06f80 Do not add gfx.pk3 in testers build
MISC_PATCH.pk3 covers it.
2022-02-14 14:30:38 +01:00
toaster
6518d73d51 Music also 2022-02-14 14:30:38 +01:00
toaster
1ea1ab8c4d TESTERS stuff 2022-02-14 14:30:37 +01:00
James R
3e7cde8abd Load misc build testers data files 2022-02-14 14:29:55 +01:00
James R
10a9663ccb Interpolate viewrollangle before R_CheckViewMorph 2022-02-14 14:26:43 +01:00
James R
e909cb0a73 Don't interpolate frames if avg <35
Proper solution for 85ce207e9
2022-02-14 14:26:42 +01:00
James R
fd9590cc3d Do not interpolate if time between game tics <1/35 2022-02-14 14:26:42 +01:00
James R
c812d6fdd7 Interpolate from time of previous tic
Previously interpolated from last 35th of a second, which
may be offset from game time due to connection lag.

Consider this the proper fix to 6ecac4159a too.
2022-02-14 14:26:42 +01:00
James R
5ed55aca3d Disable wad loading in TESTERS build 2022-02-14 14:22:29 +01:00
toaster
66d8989531 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into testers 2022-01-20 19:29:10 +00:00
James R
b3e6030a9b Wrong condition 2022-01-19 01:17:54 -08:00
James R
8f8d34728b JUST SEARCH ALL FUCKING WADS 2022-01-19 01:17:12 -08:00
James R
ba6ee7eaa0 Do not count gfx.pk3 toward mainwads in testers build 2022-01-19 01:13:09 -08:00
James R
484ab4b5dc Merge branch 'fix-software-splitscreen-tilt' into 'master'
Fix splitscreen camera tilting in Software

See merge request KartKrew/Kart!531
2022-01-18 07:56:41 +00:00
James R
5e37a847f0 Interpolate viewrollangle before R_CheckViewMorph 2022-01-17 21:18:38 -08:00
James R
5441c55baf Do not add gfx.pk3 in testers build
MISC_PATCH.pk3 covers it.
2022-01-16 17:32:58 -08:00
toaster
4d4ea71a44 Music also 2022-01-17 01:23:14 +00:00
toaster
250dc70827 TESTERS stuff
#define TESTERS for tester executable
#define HOSTTESTERS for hosting with TESTERS-specific files (MISC_ etc)
2022-01-17 01:12:30 +00:00
James R
6a7ca44302 Don't interpolate frames if avg <35
Proper solution for 85ce207e9
2022-01-12 12:57:52 -08:00