Commit graph

19110 commits

Author SHA1 Message Date
AJ Martinez
dd48ec2df5 Add FX for powerup clash collision 2022-05-12 17:54:12 -05:00
Sally Coolatta
9795f21c33 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart 2022-05-12 17:35:17 -04:00
Sally Coolatta
4e740ea683 WHY IS IT NOT ON BY DEFAULT 2022-05-12 17:35:14 -04:00
James R
11f97049b1 Merge remote-tracking branch 'origin/master' into uncapped-absolution 2022-05-11 17:09:59 -07:00
James R
7568e84f2e Merge branch 'fix-wrong-mainwads' 2022-05-11 17:09:31 -07:00
James R
900d9e0276 Merge branch 'tiny-try-move-16' into 'master'
Cap TryMove radius to 16x map scale

See merge request KartKrew/Kart!586
2022-05-12 00:05:36 +00:00
James R
d541651937 Merge branch 'brake2' into 'master'
Brake dust

See merge request KartKrew/Kart!585
2022-05-12 00:05:18 +00:00
James R
b89bf775df DEVELOP: don't let clients download mainwads 2022-05-11 17:04:18 -07:00
James R
6fe36193a2 Scale brake drift sparks up to 3x 2022-05-11 15:40:09 -07:00
James R
86cea709ef Fix brake dust double scaling 2022-05-11 15:34:22 -07:00
James R
1f73f98e7a Remove fullbright from Brake Dust 2022-05-11 13:09:18 -07:00
James R
266f1c9a65 Cap TryMove radius to 16x map scale 2022-05-11 12:45:00 -07:00
James R
730e00ab19 Brake dust
- Spawns outward from both front wheels, from outer wheel
only if brake-drifting.
- Scales with speed, up to 200%. Also applies to drift
sparks.
2022-05-11 12:34:42 -07:00
James R
364651ac39 Remove Brak Eggman 2022-05-11 12:25:58 -07:00
toaster
e28295635c Merge branch 'gcc-12-warnings' into 'master'
Fix GCC 12 warnings

See merge request KartKrew/Kart!584
2022-05-11 19:24:53 +00:00
James R
7579cf1b10 Fix misc warnings for GCC 12 2022-05-11 12:21:18 -07:00
Roberto Ierusalimschy
199c40a14d useless test removed (pointed by lint) 2022-05-11 12:17:49 -07:00
James R
71833862b2 Make tripwire speed lines Lilac and additive 2022-05-09 18:45:35 -07:00
James R
8164d63078 Merge remote-tracking branch 'origin/tripwire-leniency' 2022-05-08 22:19:27 -07:00
James R
5293b151be Merge branch 'rewrite-mines' into 'master'
Rewrite mines

See merge request KartKrew/Kart!581
2022-05-09 05:15:31 +00:00
James R
6df43062b0 Merge branch 'invinc-efx' into 'master'
Invincibility updates

See merge request KartKrew/Kart!583
2022-05-09 05:14:57 +00: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
72d77f7fb5 Invincibility updates
- You flash white while in invincibility
- Invincibility is not rainbow UNTIL you go above the initial timer.
- Increased visibility of the shield effect around invincible players.
- Invincibility sparkles have trailing afterimages.
- Disabled invincibility speed lines; they now use the normal speedlines but grey/rainbow. (The code/sprites will be used for something later.)
- Using invincibility adds time, instead of setting it.
- Player hitbox is finally bigger, to actually match the shadow size.
2022-05-08 03:43:53 -04:00
Sally Coolatta
5d0ed5e9e0 Tripwire leniency efx 2022-05-08 01:44:12 -04:00
Sally Coolatta
9ab0e028d4 Tripwire leniency
1 full second after entering a tripwire state, you can still go through tripwires
2022-05-08 01:03:11 -04:00
Sally Coolatta
1381a56077 Rewrite mines
Get rid of the tons of extra objects it uses for sounds & collision, do it all from the actual object PLEASE...
2022-05-07 22:59:38 -04:00
Sally Coolatta
cb393a87f5 Readd NOTHINK since interpolation is handled outside of thinker 2022-05-07 20:42:40 -04:00
toaster
c0830d1ddc Merge branch 'testers220430' into 'master'
Minor prep for 220430 test

See merge request KartKrew/Kart!576
2022-05-07 13:53:03 +00:00
toaster
1fbe04bd6d Merge branch 'spindash-tweaks' into 'master'
Spindash tweaks

See merge request KartKrew/Kart!578
2022-05-07 13:09:20 +00:00
Sally Coolatta
e3a51b1a5a Use multiplier for FPS counter 2022-05-07 07:33:03 -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
SinnamonLat
7a65dbfe8e use other magnetic sound for ebrake 2022-05-04 10:55:19 +02:00
SinnamonLat
3bcf4fd33b fix exploit where releasing only accel mid spindash would cancel it 2022-05-04 10:50:07 +02:00
SinnamonLat
bf09bdd642 ebrake sound 2022-05-03 23:51:37 +02:00
SinnamonLat
f80ef0e051 ignore offroad while in tiregrease 2022-05-03 23:37:32 +02:00
SinnamonLat
03056eb3b5 better ebrake/spindash visuals 2022-05-03 23:23:46 +02:00
SinnamonLat
464e4a338a wip: ebrake visuals 2022-05-03 03:35:01 +02:00
SinnamonLat
d843cc5b5c Spindash iframe ring drain based off of speed/weight 2022-05-03 02:16:22 +02:00
SinnamonLat
784a541c09 Spindash charge time rebalance + release thrust 2022-05-03 01:53:20 +02:00
James R
2de756d077 Fix typo 2022-05-01 18:31:17 -07:00
James R
64b8da086f Readjust race item odds for Hyudoro 2022-05-01 14:39:19 -07:00
James R
38ab22f022 Netsave player.hoverhyudoro 2022-05-01 14:04:25 -07:00
James R
2196ccef62 Add k_objects.h 2022-05-01 13:36:17 -07:00
James R
8fd251b54c Revert wrongly committed code 2022-05-01 13:36:01 -07:00
James R
3e8d50a44a Fix/finish hyudoro return delivery
- Fix item detection, matches paper sprite pickups
- Stacked hyudoros deliver item once player is not holding
2022-04-30 00:25:42 -07:00
James R
39ff9ce383 Remove orphaned MT_SHADOW 2022-04-29 23:43:25 -07:00
James R
c6e7fe2d29 Hyudoro object code 2022-04-29 22:02:22 -07:00
James R
910ebe9d0f Add objects subdirectory
For game object-specific code
2022-04-29 22:01:51 -07:00
James R
61399981a2 MT_SHADOW + SPR_NONE, teleports to tracer and renders only a shadow 2022-04-29 21:14:10 -07:00