Commit graph

670 commits

Author SHA1 Message Date
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
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
James R
41f1b3b97c Kill SEENAMES 2020-12-12 02:11:23 -08:00
Zippy_Zolton
b153276057 Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
LJ Sonic
079df8df4d Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
# Conflicts:
#	src/dehacked.c
#	src/dehacked.h
2020-11-29 21:54:15 +01:00
GoldenTails
d673604b48 Split dehacked.c into multiple files. 2020-11-23 21:42:26 -06: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
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
42f411399a Add bumper explosion effect 2020-11-15 12:56:03 -05:00
Louis-Antoine
ff7ca5450f Only call the Lua API for overridden actions 2020-11-15 01:15:58 +01:00
Sally Coolatta
56a20d05df Merge branch 'master' into battle-rethink 2020-11-11 00:11:18 -05: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
Sally Coolatta
91ed67bece Start on Chaos Emeralds
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
Sally Coolatta
62139f144a Paper item spawners
Code is a little horrendous in a few places but I will hopefully fix later :V
2020-10-26 22:20:02 -04:00
Zippy_Zolton
e612b2a7f3 g 2020-10-23 01:09:12 -05:00
Zippy_Zolton
5a06c0e7b0 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
Sally Coolatta
69e4a1c59f Blue sphere jiggle physics 2020-10-22 22:15:07 -04:00
Sally Coolatta
9ad88cdfa9 Add center point mobj, polish the visual a bit more, reduce the speed that the barrier shrinks 2020-10-22 17:38:06 -04:00
Sally Coolatta
7ce53ac104 Add blue spheres
Doesn't have animations, and doesn't have stat-specific buffs. But it's already a massive improvement
2020-10-22 02:52:33 -04:00
Sally Coolatta
884eb3d515 Error icon for when a map is missing its signpost 2020-09-30 06:00:13 -04:00
toaster
23faef24d7 * Introduce SPR2_XTRA for face graphics, since the current system is prone to plenty of conflicts with modders if you're not careful.
* Fixed a bug where you'd see :nick: on the current character selection screen if you didn't have many skins loaded.
* Fixed a bug where character skins loaded in PK3s would attempt to load every single lump of the PK3, even if it wasn't in the same subfolder as the original S_SKIN, as a sprite into the player struct. Could stand to be ported to vanilla.

Requires new chars.kart, which was created using the help of the indev 2.2-based Kartmaker update which will be available shortly.
2020-09-23 23:46:54 +01:00
Sally Coolatta
51aef1ce75 Fix some of the dehacked tables, change doomednums of haunted heights stuff to not conflict with items/waypoints, use "rings" variable instead of "kartstuff[k_rings]" 2020-08-16 01:46:54 -04:00
Sally Coolatta
30144d5d06 Things to get it to run
Build is still MASSIVELY broken, you can't even get into a level, still investigating
2020-08-15 20:09:36 -04:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
5a6263c36b Make it past p_mobj 2020-08-14 20:48:06 -04:00
Sally Coolatta
5319ef434e Compiling reaches g_demo.c again after the merge 2020-08-12 22:40:15 -04:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
fc10bf1d9a Fix conflicting info definitions 2020-08-10 16:49:54 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Sally Coolatta
cdb0310982 Merge info.c/h 2020-08-06 17:38:29 -04:00
Sally Coolatta
2645e4dea8 Add magnets to the sides, make client-side, fix length 2020-07-30 07:33:01 -04:00
Sally Coolatta
4e4598d784 Fault line is here 2020-07-30 06:25:34 -04:00
James R
b23581ac38 The drift boost clip is fatter 2020-07-19 21:05:29 -07:00
James R
280791a832 Drift Boost Plumes, play every other frame of Drift Boost Explosion (normally flicker frames) 2020-07-19 19:11:19 -07:00
James R
f8b19a239f Drift Boost Clip, bounces on floor and sparks, then flickers until it dies 2020-07-19 18:04:11 -07:00
James R
1dae3d196b Who said anything about a 5th frame? 2020-07-18 14:52:30 -07:00
James R
59c0f99865 5th frame + rainbow colors cycle on the drift explody 2020-07-17 23:44:00 -07:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
LJ Sonic
325867ea59 Merge branch 'jetjawsound' into 'next'
Jet Jaw Sounds

See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
ac070380c1 Merge branch 'cez3debris' into 'next'
New Debris for CEZ3

See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
# Conflicts:
#	src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Zippy_Zolton
74ece42ee2 Jet Jaw Sounds 2020-06-25 00:38:07 -05:00
sphere
97ebb50e12 Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. 2020-06-21 16:01:24 +02:00
Zippy_Zolton
9c194f4186 Thanks for the feedback, I have fixed your issues. 2020-06-20 02:04:18 -05:00
Zippy_Zolton
50f51715a7 New Debris for CEZ3 2020-06-20 02:02:13 -05:00