Commit graph

912 commits

Author SHA1 Message Date
Sally Coolatta
afdb2908f2 Interrupt tumble when hitting springs 2022-08-22 23:53:32 -04:00
SteelT
5ebcf86d7d Merge branch 'battle-tweak-update' into 'master'
Huge Battle W

See merge request KartKrew/Kart!636
2022-08-04 16:55:26 +00:00
James R
d11179d9aa Don't hitlag tripwire when passing above 2022-08-01 07:17:47 -07:00
James R
4fb0dfa9c0 New pogospring behavior
Spawns a spring under you. First bounce gives you trick
air time, subsequent bounces give you tumble.
2022-08-01 05:27:32 -07:00
Sally Coolatta
36b8ab1eac Streamline cheats
"cheats" is a proper cvar now. Enabling it allows for cheats to be used any time, even in multiplayer, and disables gamedata saving. Turning it off undoes as many cheat commands as reasonably possible. Based a little bit off of some vanilla work I also did.

Many cheat commands are still SP-only, but can reasonably be allowed in netgames now if a net command is created for them.
2022-06-08 12:46:56 -04:00
Sally Coolatta
052e72c409 PIT_CheckThing valid checks more consistent 2022-05-23 19:20:21 -04:00
Sally Coolatta
d053d5f8ba Fix blockmap WILD inconsistency when it's not PIT_CheckThing
An optimized error check was put into P_BlockThingsIterator for tmthing, but this meant that anything that was not using or even setting this variable (the supermajority of them) would exit after finding 1 thing in each block.

To keep this error check & keep it optimized, the PIT_ functions were expanded to three options instead of two: BMIT_CONTINUE lets the search continue. If used as the last mobj, it will return true when the iterator finishes. BMIT_ABORT ends the search and forces the iterator to return false.
BMIT_STOP ends the search and forces the iterator to return true.
2022-05-23 17:37:29 -04:00
James R
11f97049b1 Merge remote-tracking branch 'origin/master' into uncapped-absolution 2022-05-11 17:09:59 -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
266f1c9a65 Cap TryMove radius to 16x map scale 2022-05-11 12:45:00 -07:00
James R
364651ac39 Remove Brak Eggman 2022-05-11 12:25:58 -07: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
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
Sally Coolatta
794090d026 Make more lenient on the ground 2022-04-02 01:20:23 -04:00
Sally Coolatta
f3bb8833a1 Tumble when not landing upright on slopes 2022-03-28 17:10:27 -04:00
SteelT
002e07dceb Merge branch 'mergeladder' into 'master'
Merge Ladder

See merge request KartKrew/Kart!558
2022-03-22 03:34:08 +00:00
toaster
52d2472ed7 "Drop Target" item initial commit.
Most of the way there, but still a bit left to do.
2022-03-21 23:40:30 +00:00
toaster
3c83508646 add sprung flag to steam
# Conflicts:
#	src/p_map.c
2022-03-18 13:39:19 +00:00
toaster
a3eab3099e Solve the concern about potential tiregrease overwriting. Let the video resume at once 2022-03-12 23:18:55 +00:00
James R
c58d789a07 Always reset tiregrease 2022-02-24 22:51:01 -08:00
James R
8f303f03d2 Merge branch 'iamnobump' into 'master'
I am no bump

See merge request KartKrew/Kart!548
2022-02-17 05:05:24 +00:00
toaster
93e4ef0ef1 Permit players to not bounce when colliding with ML_NOTBOUNCY walls (imperfect but better than the LITERALLY NO SUPPORT that was there beforehand) 2022-02-10 00:06:47 +00:00
toaster
766fce5857 Make some adjustments to the damage combo system for players.
* Prevent a player that is moving upwards from being DMG_TUMBLE'd again (resolves #212).
* Instead of having a special case for missiles there, make PIT_CheckThing toggle DMG_WOMBO instead.
* Allow hard hits (DMG_TUMBLE, DMG_EXPLODE, and DMG_KARMA) to have combos toggled off with DMG_WOMBO, too.
2022-02-03 19:51:17 +00:00
SinnamonLat
fafcf307d2 Add combo to bubble shield 2022-01-23 18:02:56 +01:00
toaster
93dfbf382c The "free" changes from framezero - the crash fixes that have no complexity and therefore no negative consequence to introduce 2022-01-20 19:27:02 +00:00
toaster
ef6ee928ac After I experienced a few consistent crashes for invalid subsector references in P_BounceMove/P_SlideMove, add a few extra checks for whether the mobj is removed. 2022-01-16 22:03:27 +00:00
Sally Coolatta
ef5a4f01d4 Merge branch 'master' into terrain-lump 2022-01-04 12:34:47 -05:00
Sal
20b1ddb4d3 Merge branch 'dont-scale-gravity' into 'master'
Scale gravity with map scale instead of object scale

See merge request KartKrew/Kart!513
2022-01-04 04:22:42 +00:00
Sally Coolatta
c4385166e5 Scale gravity with map scale instead of object scale 2022-01-03 20:02:22 -05:00
Sally Coolatta
6c13ddca01 Rename PitchRoll stuff back
I did a find+replace because I realized the functions I added were named too similar to other ones & to make the purpose more obvious ... but it ended up changing them too anyway! Gah!
2021-12-24 13:00:12 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
Sally Coolatta
0cd3efc76d Merge branch 'master' into terrain-lump 2021-12-18 18:36:05 -05:00
Sally Coolatta
2a9f2214cb Merge branch 'master' into terrain-lump 2021-12-12 04:15:53 -05:00
Sally Coolatta
5f4e4f8cb5 Merge branch 'master' into bot-maint 2021-12-11 14:13:27 -05:00
Sally Coolatta
19463d6b20 New bot prediction wall detection
Instead of searching for walls around the player, and then deciding to make the radius tighter if it found anyway, it instead checks if the waypoint it's trying to predict towards was blocked by any walls / hazards.

Needs adjusted some, I think its being pulled back too hard sometimes, but I am optimistic about some of the improvements I already saw.
2021-12-10 17:42:00 -05:00
SteelT
e009f1ebab Merge branch 'super-upside-down-spring' into 'master'
2x vertical speed for downward springs

See merge request KartKrew/Kart!483
2021-12-10 04:11:17 +00:00
Sally Coolatta
bf4b47a2cf Merge branch 'master' into terrain-lump 2021-12-09 03:46:01 -05:00
Sally Coolatta
150faf9de6 Add terrain pointer to mobj_t 2021-12-09 00:56:05 -05:00
James R
f2e8d7d469 Increase step up with water-running just like water-skipping 2021-12-07 16:26:52 -08:00
James R
0cbd24e589 2x vertical speed for downward springs 2021-12-06 21:30:35 -08:00
James R
9bde266f9f Water running
You can run on water in any case where you would have
slope resistance AND your speed is over 100%. You may run
on water regardless if you're speed is above 200%.
2021-12-05 22:41:25 -08:00
James R
7180027c9f Merge branch 'ceiling-bump' into 'master'
Ceiling clipping is satisfying

See merge request KartKrew/Kart!466
2021-11-30 04:09:19 +00:00
Sally Coolatta
c43f8da5e6 P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2021-11-29 08:20:27 -05:00
James R
72ded01ac8 Smoother ceiling clipping
- Apply some gravity immediately.
- Play the bump (like against walls) effect.
2021-11-28 21:45:31 -08:00
James R
332d3bfa12 Fix passing tripwire not triggering SOMETIMES 2021-11-28 18:48:27 -08:00
James R
0e6bb75230 Check TRIPWIRE texture at map load
So it can be animated.
2021-11-28 04:08:38 -08:00
James R
8e20ca4c04 TRIPWIRE
Set a sidedef's midtexture to "TRIPWIRE" to turn that line
into a tripwire.

Players can't drive through a tripwire and will bounce
back at high speed if they're in one of the following
states:

1. Invincibility / Grow
2. Sneakers
3. Flame Shield dash
4. >200% on the speedometer

Hitting a tripwire plays a sound, sends you into hitlag,
then plays another sound when the hitlag is over. The
sounds used depend on whether you can drive through the
tripwire.
2021-11-28 03:03:43 -08:00
James R
17b3cd205e Merge branch 'snapify-hitlag' into 'master'
Snap da sentinel like hitlag

See merge request KartKrew/Kart!458
2021-11-28 00:29:29 +00:00
Sally Coolatta
a17f11e6c5 Ignore collisions between 2 objects that are BOTH in hitlag
Still allows it if a new object interferes to add more hitlag, but this should hooopefully prevent super big knockback stacking from 1 object?
2021-11-27 13:45:23 -05:00
James R
0d3a1b72cb Apply grease to vertical only springs too 2021-11-27 03:05:04 -08:00