Commit graph

1184 commits

Author SHA1 Message Date
SteelT
fc8bd429f3 Merge branch 'master' into invinc-changes
Also made changes to sparkles, invincibility speedlines now replaces the sparkles if boosting.
2021-04-06 22:40:02 -04:00
SteelT
4b269e89e7 Actually, fix it in a way without visually nerfing it. 2021-03-31 23:24:19 -04: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
SteelT
4f7aafe654 Fancy invincibility speed lines 2021-03-28 22:05:18 -04:00
Latapostrophe
3b617337ee Fancy rotating sparkles 2021-03-29 00:27:56 +02:00
SteelT
c8124a6c94 Some invincbility changes 2021-03-28 17:19:47 -04:00
Sally Coolatta
20e2c78331 Delete seenames code
We had SEENAMES disabled before, and vanilla removed the define, so I went ahead and removed it. Repurposed the old seenames console variable for our nametags.
2021-02-28 21:27:23 -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
Sally Coolatta
1849f70359 Merge branch 'master' into waypoints-disable 2021-02-12 20:28:16 -05:00
James R
44ec94f287 Merge remote-tracking branch 'origin/master' into funny-spikes 2021-02-06 03:00:50 -08:00
James R
caa7fe1b47 Merge branch 'player-new-frames' into 'master'
New player frames: Glancing and death

See merge request KartKrew/Kart!362
2021-02-06 05:57:11 -05:00
James R
f9c6a5e8b5 Drop Funny Spikes when getting stung
DEBTA0-DEBTH0

Instead of dropping rings, drop non collectable spikes!
2021-02-06 02:31:24 -08:00
Sally Coolatta
75dd970adc Beam objects
Place 2 to arbritrarily place the line anywhere. For sprint maps.
2021-02-05 01:58:34 -05:00
Sally Coolatta
05838acc3d Big look frames
No sheets support this yet, but it will default to glance frames, so no functionality loss without them.
2021-02-03 18:28:23 -05: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
bea2724a86 Glance frames
When someone is about to pass you, you'll take a glance at 'em!
2021-02-03 01:24:00 -05:00
Sally Coolatta
cc2704bc87 Death animation
Art is missing, but functionality is complete.

The kart corpse is also placeable as type 4095. No way to set its color currently, it simply defaults to SKINCOLOR_RED.
2021-02-02 22:36:56 -05:00
Sally Coolatta
237f86749d Merge branch 'master' into finish-line-beam 2021-02-01 23:31:19 -05:00
Sally Coolatta
cfda66103d Merge branch 'master' into just-tumble 2021-01-06 23:02:51 -05:00
SteelT
52e5de2bdc Fix rain sound not playing.
Also fixed snow precip not picking any random state.
2020-12-24 14:49:30 -05:00
James R
cf454b0d77 Merge branch 'dusty' into 'next'
Make fiery spindust fullbright

See merge request STJr/SRB2!1317
2020-12-15 20:53:29 -05:00
James R
bde40c36b1 Merge branch 'team-elementalfire' into 'next'
Player-Colored Elemental Fire for competitive gametypes

See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
katsy
a39949077b Merge remote-tracking branch 'stjr/next' into dusty 2020-12-14 05:39:35 -06:00
James R
956fd338f0 Merge branch 'oldguards' into 'next'
Kill remaining HAVE_BLUA and SEENAMES

See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
katsy
cedbb8c0de Update info.c 2020-12-11 23:39:42 -05:00
katsy
d488ff64e0 make fire spindust dust fullbright 2020-12-11 20:59:14 -05:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
katsy
9095c87be3 space 2020-12-06 04:32:30 -05:00
katsy
67f65961d2 brak barrier is scaled up by 2x in gameplay, the actual object's parameters should be halved 2020-12-06 00:13:10 -05:00
Sally Coolatta
e16c7d722f Cherry-pick e1b265df2 2020-11-16 19:55:28 -05:00
Sally Coolatta
ef0da6ce9c Finished bumper destruction 2020-11-16 02:38:13 -05:00
Sally Coolatta
8c5abf41ea Bumper destruction starts with the normal bumper sprite before transitioning into the giant bumper 2020-11-16 01:20:55 -05:00
Sally Coolatta
ae5d5abe24 Chaos Emeralds now sparkle 2020-11-16 00:51:00 -05:00
Sally Coolatta
0dc0ff8e6f More finalized Chaos Emerald visuals 2020-11-15 15:11:13 -05:00
Sally Coolatta
0882fe2b01 Change overtime center hitbox 2020-11-15 12:59:05 -05:00
Sally Coolatta
42f411399a Add bumper explosion effect 2020-11-15 12:56:03 -05:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05:00
Sal
27530dec06 Merge branch 'spindash-efx' into 'master'
Spindash EFX Part 1

See merge request KartKrew/Kart!331
2020-11-10 19:56:01 -05:00
James R
ee8fb39974 Make all springs MF_NOGRAVITY by default 2020-11-08 20:14:18 -08:00
Sally Coolatta
39acb46903 Last 3/4s: Spindash wind 2020-11-08 15:32:30 -05:00
Sally Coolatta
bffc367c36 Second-half spindash dust effect 2020-11-08 14:14:13 -05:00
Sally Coolatta
11872504ae Merge master 2020-11-08 01:26:40 -05:00
James R
6370919e05 Pick up emeralds from below 2020-11-01 22:34:14 -08:00
James R
896b29f002 Replace special handling for picking up items from below with MF_PICKUPFROMBELOW 2020-11-01 22:33:42 -08:00
Sally Coolatta
ea14d6bb1c Use Super Emerald collect sound instead for now 2020-11-02 00:51:47 -05:00
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
46b1b6db1c Double paper item height 2020-10-30 21:13:31 -07:00
James R
6864705b67 Fix fuckup 2020-10-30 19:00:37 -07:00
James R
81b8abed53 Merge remote-tracking branch 'origin/master' into paper-items-i-hate-my-life 2020-10-28 21:51:28 -07:00