Commit graph

1313 commits

Author SHA1 Message Date
toaster
fab0897800 Check against null tmpusher source before attempting to push a thing.
# Conflicts:
#	src/p_spec.c
2022-03-18 14:08:29 +00:00
toaster
9fe2184c08 Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart.git into fast-addfile 2022-03-12 17:39:18 +00:00
SteelT
606eb28314 Linedef type 460: Don't award rings while SPB-locked 2022-01-20 03:20:53 -05:00
James R
d06355018d Track skybox within player struct
TODO: Lua

Splitscreen and change viewpoint uses the proper skyboxes!
2022-01-17 22:46:01 -08:00
Sally Coolatta
ef5a4f01d4 Merge branch 'master' into terrain-lump 2022-01-04 12:34:47 -05:00
Sally Coolatta
cc250afd45 P_InitAngle, to fix angle interpolation on spawning objects 2021-12-24 12:45:51 -05:00
James R
ffa2af7e07 Disable flat animdefs
The speed up is significant.
2021-12-16 22:25:08 -08:00
Sally Coolatta
b3d3135c58 Instead of embedding specific textures to be tripwire in hardcode ... make it a TERRAIN flag! 2021-12-09 15:54:22 -05:00
Sally Coolatta
bf4b47a2cf Merge branch 'master' into terrain-lump 2021-12-09 03:46:01 -05:00
Sally Coolatta
e212f947ad Implement the sector special-like effects
Offroad, sneaker panels, trick panels, and damaging floors can now be set via terrain.
2021-12-09 03:20:45 -05:00
SteelT
d0caa79414 Merge branch 'snapify-hitlag' into 'master'
Snapify Hitlag 2

See merge request KartKrew/Kart!461
2021-12-08 01:53:28 +00:00
James R
2276304c1d Don't skip other line specials if a trip wire is passed 2021-11-28 04:09:15 -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
Sally Coolatta
c1b34d4d4f A few more instances 2021-11-28 00:32:07 -05:00
Sally Coolatta
15556dce0b Quakes are scaled with map scale
Finally
2021-11-28 00:25:40 -05:00
toaster
c08c716682 Merge branch 'master' into purple-spark
# Conflicts:
#	src/k_kart.c
#	src/p_spec.c
2021-04-20 09:59:22 +01:00
lachablock
b96394415b Spawn electric sparks on first blood 2021-04-20 16:25:43 +10:00
lachablock
5e327e09c6 Merge master (resolve structgunch conflicts) 2021-04-20 16:09:59 +10:00
toaster
00972a83d2 remove the prefix since everything seems to function 2021-04-17 11:30:08 +01:00
Sally Coolatta
0e2b36e484 Purple sparks 2021-04-16 23:00:58 -04:00
toaster
b3d006b093 structs gunched 2021-04-17 00:27:13 +01:00
Sally Coolatta
359cf86efb Merge branch 'master' into big-large-map-markers 2021-04-09 19:49:33 -04:00
toaster
ebe38ff518 * Add a blend field to FOFs.
* Set via a fourth digit in the upper midtexture for transparent FOFs
        * For example - #2551 is additive solid, #1282 is subtractive half...
    * The original method of setting the upper midtexture to #900 or 901 still works, since I'm not out to break existing maps.
* Software: Remove the horrible `else if` ladder for FOF translucency. Algorithms, baby!
* OpenGL: Move to using `HWR_GetBlendModeFlag` in more places, for more long-term extensible support for multiple blendmodes.
2021-04-01 23:45:21 +01:00
toaster
40cbc30bff Mammoth commit, sorry.
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.

Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.

If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Sally Coolatta
f540156bbf Fully fix taglist for james scroller 2021-02-28 23:11:51 -05:00
Sally Coolatta
7dca95da14 Fix scroller merge 2021-02-28 23:01:46 -05:00
Sally Coolatta
caa5314866 Get past some taglist stuff 2021-02-28 22:58:30 -05:00
Sally Coolatta
9d7ec0ab8f Merge SRB2 next
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
toaster
08d087c6b5 Acceleration Kickstart, my little hobby project.
It's no secret that holding down a button a lot can fuck with your wrists and fingers. It's too late for me to be damageless, but I can at least create an option to reduce further harm.

This accessibility feature, when enabled (kickstartaccel and kickstartaccel2/3/4 in the console) behaves with the following properties:
* Hold accelerate for 1 second to lock it down.
* Press again to release.
* Short holds/presses do nothing (good for POSITION).
* Continue holding it during the releasing press to re-lock it.
* A small triangular UI element is added next to the speedometer sticker, which displays the current state of the acceleration kickstart for visual feedback. (NO SPLITS SUPPORT YET)

In addition:
* Add PF_ACCELDOWN and PF_BRAKEDOWN, and BT_REALACCELERATE (which ACCELDOWN tracks). Even if this feature never gets merged, BT_REALACCELERATE is required because sneakers and boosters force it on too (extending this is how I implemented it).
* Fix the dehacked playerflag list being out of shape.
* I replaced some existing flags during development of this branch, so their old uses have been whittled away.
2021-02-20 23:10:18 +00:00
Sal
ea2223abe6 Merge branch 'once-in-battle' into 'master'
Don't disable linedef executors other than 308 outside of Race

See merge request KartKrew/Kart!380
2021-02-14 21:13:51 -05:00
James R
d6ea8549d2 Scale end sign 1.5x 2021-02-13 21:38:22 -08:00
James R
a9a1779e19 Only disable 308 outside of Race 2021-02-13 20:10:12 -08:00
LJ Sonic
85cd429d1d Revert "Replace all instances of P_AproxDistance with FixedHypot"
This reverts commit 498ff708bb.
2021-02-13 17:45:20 +01:00
Sally Coolatta
1849f70359 Merge branch 'master' into waypoints-disable 2021-02-12 20:28:16 -05:00
Sally Coolatta
1f7fd96e32 Bot controller linedef
Controls bot behavior while they're touching a tagged sector.

X texture offset is angle to force the bot in (0 is east, 90 is north, 180 is west, 270 is south)

Y texture offset is trick type -- if a bot enters the sector while in trick panel state, then they'll do the input for the trick. Without the effect present, they'll do nothing and eventually tumble.
Y offset 1 does a left trick, 2 is right, 3 is forward, 4 is back/up.
2021-02-11 19:08:44 -05:00
James R
eabb97ea93 Line special 2003: No Climb - only respawn when crossing front side 2021-02-04 18:51:32 -08:00
James R
8c047372a6 Line special 2003: respawn player if crossing this line 2021-02-04 18:40:50 -08:00
Sally Coolatta
2a2198ade1 Remove MF_NOSECTOR from MT_WAYPOINT, so the linedef executor can search through sector thinglist for them. 2021-02-03 17:18:37 -05:00
Sally Coolatta
51a8d8d5cd Not everything got commited... 2021-02-01 21:46:17 -05:00
Sally Coolatta
af2b525d31 Use linedef 499, make it actually work 2021-02-01 21:45:42 -05:00
Sally Coolatta
a84a19f247 Merge branch 'lap-executor-edit' into waypoints-disable 2021-02-01 18:17:56 -05:00
Sally Coolatta
07320723d8 Waypoint disable/enable executor
Not tested yet
2021-02-01 18:17:51 -05:00
Sally Coolatta
d627da7510 Fix lap executors not happening, and also edit it so they act like Each Time rather than Once
Allows for simplified executor logic on Desert Palace and Chrome Gadget, possibly Egg Zeppelin too
2021-02-01 14:34:48 -05:00
LJ Sonic
05a75758ab Merge branch 'redundant-hypot' into 'next'
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's

See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
James R
802dd22de4 Sector Parameters Ripple
Upper Unpegged - Ripple on floor plane
Lower Unpegged - Ripple on ceiling plane
2021-01-12 22:33:49 -08:00
SteelT
29b5f38347 Merge branch 'master' into big-large-map-markers
# Conflicts:
#	src/d_netcmd.c
2021-01-09 15:52:34 -05:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
Latapostrophe
fe4d9ce889 New trick panel shit (but only the gameplay part) 2021-01-06 21:20:28 +01:00
Latapostrophe
74a39837bb Merge conflicts 2021-01-06 18:33:42 +01:00
James R
8b1c1a7ac2 Merge branch 'drain-antiri' into 'next'
Make Ring Drain sectors play the depletion sound instead of the ring sound

See merge request STJr/SRB2!1315
2020-12-15 20:51:39 -05:00