Commit graph

7408 commits

Author SHA1 Message Date
toaster
f46568868a Merge branch '2.2backport-ceilslope-light' into 'next'
2.2 Backports - add ceil slope double step-up/down and fix sprite/models all black in sector with light level of 256

See merge request KartKrew/Kart-Public!274
2022-05-27 16:32:05 +00:00
AJ Martinez
129fc2bbb1 Style cleanup 2022-05-25 18:22:43 -05:00
AJ Martinez
1441fda838 Clearly mark MS reminder + formatting touchup 2022-05-24 18:44:49 -05:00
AJ Martinez
8548d44109 Futureproofing mserv address conveyance 2022-05-24 18:25:18 -05:00
AJ Martinez
93647873de Add warning and reset flow for non-default masterserver address 2022-05-23 23:12:24 -05:00
Sal
d0addde847 Merge branch 'uncapped-next' into 'next'
Uncapped

See merge request KartKrew/Kart-Public!276
2022-05-22 01:28:01 +00:00
Eidolon
8a4d865880 Update interpolation during objectplace 2022-05-21 14:40:29 -05:00
Eidolon
64088d8f07 Tweaks for kart v1 MR comments 2022-05-21 12:32:40 -05:00
Eidolon
2fe0555e3f Make character cursor framerate-independent 2022-05-19 21:07:25 -05:00
Sally Coolatta
a4090db7b9 Use double instead of precise_t for FPS counter
Makes the displayed FPS more accurate to what it's actually displaying.

Also removed HUDTRANS from it -- stop it fading out during level transitions, it's annoying when I actually want to see the FPS during those bits.
2022-05-19 16:37:33 -04:00
Eidolon
507211b94e Remove hudlib getDeltaTime 2022-05-18 21:17:28 -05:00
Eidolon
de0d5d09e0 Don't interpolate during net lag 2022-05-17 20:05:54 -05:00
Eidolon
bf3748110c Copy tracer interp state for Jawz reticle 2022-05-06 10:11:08 -05:00
Eidolon
e3f4479457 Fix typo in view reset 2022-05-05 19:58:12 -05:00
Eidolon
80a479f512 Reset view interp in preticker 2022-05-05 19:48:34 -05:00
Eidolon
0741b7ee8e Run UpdateMobjInterpolators in preticker 2022-05-05 19:24:21 -05:00
Eidolon
1a08cd2f49 Run UpdateLevelInterpolators in preticker
Fixes KartKrew/Kart-Public#10
2022-05-05 18:49:31 -05:00
Sally Coolatta
cd6a68aea5 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.
2022-05-05 00:04:14 -04:00
Sally Coolatta
f085fc5cbb Move screenshot code before timing 2022-05-04 20:17:35 -04:00
Sally Coolatta
8149a51192 Do not register servers twice
Advertise_OnChange is CV_NETVAR, so the server will get registered by CV_LoadNetVars when the server starts.

This race condition occasionally pops up in master, but got very consistent with uncapped.
2022-05-04 05:20:32 -04:00
Sally Coolatta
5a89c2738f Apply the same fix for instashield overlay 2022-05-03 19:43:31 -05:00
Sally Coolatta
35ddf39453 Fix jawz reticule in uncapped 2022-05-03 19:43:07 -05:00
SteelT
c351129658 Fix sounds playing multiple times during intro if interpolation is on 2022-05-03 18:43:35 -05:00
Eidolon
40cd1c797c Restore missing chat msg timers 2022-05-03 18:41:50 -05:00
Sally Coolatta
84a59cd76c Interpolate song credits 2022-05-02 00:02:06 -04:00
Sally Coolatta
d45390f617 Fix lookback interpolating 2022-05-01 23:25:11 -04:00
Sally Coolatta
b5b2810838 Create scores drawlist 2022-05-01 23:11:14 -04:00
Sally Coolatta
bf2b8490ea Partially port newer sky rendering
Not the cause of the black sky bug, but doing this helped me diagnose it & it's cleaner
2022-05-01 21:48:48 -04:00
Sally Coolatta
c35985d595 Fix src_rect size not being init
Fixes Software being a blank screen
2022-05-01 21:07:00 -04:00
Sally Coolatta
c96855f59c Use newer CVar setting code
Fixes weirdness with the named values in fpscap
2022-05-01 21:01:19 -04:00
Sally Coolatta
1ab5a46256 Fix old shadows interpolation 2022-05-01 20:40:51 -04:00
Sally Coolatta
c72f959d5c Fix mixed declarations & code 2022-05-01 20:15:52 -04:00
Sally Coolatta
73a35d3280 Poor whitespace on libd_fadeScreen + const variable that needs changed 2022-05-01 20:15:05 -04:00
Sally Coolatta
ea30cfd8f8 Fix refresh rate on mode change 2022-05-01 20:08:02 -04:00
Sally Coolatta
6a7b43aa2e Fix shadowed declaration 2022-05-01 20:05:35 -04:00
Sally Coolatta
adcdb7f711 Remove unused variable
Makes me unable to compile with harsh compiler settings
2022-05-01 20:00:41 -04:00
Eidolon
8f354ad9c1 Implement Uncapped (squashed)
Co-Authored-By: Sally Coolatta <tehrealsalt@gmail.com>
Co-Authored-By: James R <justsomejames2@gmail.com>
Co-Authored-By: Monster Iestyn <iestynjealous@ntlworld.com>
Co-Authored-By: katsy <katmint@live.com>

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 54148a0dd0 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.
2022-05-01 17:35:30 -05:00
Sal
da1dbac164 Merge branch 'jug-noforcedhell' into 'next'
Remove Map Hell Force if all players random

See merge request KartKrew/Kart-Public!275
2022-04-05 19:01:59 +00:00
JugadorXEI
2864547dc9 banishing hell map forcing 2022-03-30 15:25:35 +02:00
Sal
92c7a1dc80 Merge branch 'freeslot-increase' into 'next'
Freeslot increase

See merge request KartKrew/Kart-Public!268
2022-03-29 22:35:53 +00:00
Sal
750b8bfe20 Merge branch 'load-logging-improvements' into 'master'
Small logging improvements for addon loading

See merge request KartKrew/Kart-Public!272
2022-03-29 22:22:14 +00:00
Sal
7d5a499f38 Merge branch 'small-download-tweaks' into 'master'
Few small tweaks to the connection screen

See merge request KartKrew/Kart-Public!262
2022-03-29 22:19:16 +00:00
Sal
4cec473d6f Merge branch 'cvar-default-suggestions' into 'master'
A few cvar default suggestions

See merge request KartKrew/Kart-Public!263
2022-03-29 22:19:02 +00:00
Sal
7b113b5f39 Merge branch 'Rocket-sneaker-cleanup' into 'next'
Properly detach rocket sneakers when the player dies

See merge request KartKrew/Kart-Public!271
2022-03-29 22:18:30 +00:00
Sal
4d6c57551c Merge branch 'discod-join-minor-improvements' into 'master'
Discord joins now force menu close and title demo stop

See merge request KartKrew/Kart-Public!270
2022-03-29 22:17:55 +00:00
Sally Coolatta
6c8938af6b not on player join 2022-03-29 17:17:57 -04:00
Sally Coolatta
a031998f5f Fix compile errors 2022-03-29 15:46:02 -04:00
Sally Coolatta
fce57a1027 startedInFreePlay 2022-03-29 15:42:31 -04:00
U-DESKTOP-Q6QDT0F\PC
abd7ecef72 from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/840?commit_id=0d92bf3dd09cd4712a63fc79cc7520ed18556bf6 2022-03-23 08:18:56 -03:00
U-DESKTOP-Q6QDT0F\PC
46b1effacd from https://git.do.srb2.org/STJr/SRB2/-/merge_requests/1192 2022-03-23 08:18:56 -03:00