lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11843 commits 1 branch 29 tags 122 MiB
Commit graph

510 commits

Author SHA1 Message Date
James R 019082cf7a 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 14c6d93c0c 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 f09198788d Merge remote-tracking branch 'stjr/next' into dusty 2020-12-14 05:39:35 -06:00
James R 7b6675178e 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 e55d842d7f Kill SEENAMES 2020-12-12 02:11:23 -08:00
katsy 2971156ba7 Update info.c 2020-12-11 23:39:42 -05:00
katsy ddf743d521 make fire spindust dust fullbright 2020-12-11 20:59:14 -05:00
Zippy_Zolton f2095b57fd Player-Colored Elemental Fire for competitive gametypes 2020-12-10 20:37:50 -06:00
katsy 8f4d23197c space 2020-12-06 04:32:30 -05:00
katsy 2fcf613a31 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
Zolton Auburn 85692ac409 Update info.c 2020-10-23 14:04:02 -04:00
Zippy_Zolton a4459b6693 Dash state for Tails overlay 2020-10-23 00:47:47 -05:00
lachwright 9ae2010880 Allow Canarivore gas to interact with players again (oops) 2020-09-22 13:11:56 +09:30
lachwright 5d1a95b9c6 Prevent Canarivore gas from teleporting up walls 2020-09-21 17:23:53 +09:30
Nev3r 710097a0ca Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-10 11:47:16 +02:00
lachwright c28ed25628 Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3 2020-07-09 00:00:21 +08:00
Nev3r fd5b05cafc Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
LJ Sonic 9c1bee694b Merge branch 'knuxtweaks' into 'next' 
Knuckles tweaks

See merge request STJr/SRB2!1030
 2020-07-04 16:37:35 -04:00
LJ Sonic cf4087a014 Merge branch 'jetjawsound' into 'next' 
Jet Jaw Sounds

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

See merge request STJr/SRB2!1012
 2020-07-04 07:00:20 -04:00
lachwright f03addc5a7 Merge remote-tracking branch 'origin/next' into knuxtweaks 2020-07-04 18:53:26 +08:00
LJ Sonic 3679df07aa Merge branch 'dragonbomber-height' into 'next' 
Fix Dragonbomber z positioning

See merge request STJr/SRB2!1004
 2020-07-03 17:05:10 -04:00
lachwright 8652bbc1a5 Knuckles changes: 
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
 2020-07-04 01:54:00 +08:00
lachwright 3ebc17ac3a Merge branch 'next' into knuxtweaks 2020-07-02 13:08:04 +08:00
Nev3r ff8759e507 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 dc2f689957 Jet Jaw Sounds 2020-06-25 00:38:07 -05:00
James R 207d8aee4b Merge branch 'acz3-softlock-fix' into 'next' 
ACZ3 softlock fix

See merge request STJr/SRB2!1015
 2020-06-24 21:43:42 -04:00
sphere e9e9cd6133 Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking. 2020-06-21 16:01:24 +02:00
Zippy_Zolton fc68134938 Thanks for the feedback, I have fixed your issues. 2020-06-20 02:04:18 -05:00
Zippy_Zolton bfa1382736 New Debris for CEZ3 2020-06-20 02:02:13 -05:00
lachwright 47d9d87654 Fix the Eggman signpost's background color 2020-06-19 15:49:24 +08:00
lachwright 7b2e54b426 Fix Dragonbomber z positioning 2020-06-19 00:52:24 +08:00
MascaraSnake 4a0206b38d Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
SwitchKaze 46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
MascaraSnake 969c48fac8 Merge branch 'udmf-next' into udmf-polyobjects 
# Conflicts:
#	src/p_polyobj.c
 2020-05-16 11:18:47 +02:00
lachwright 9d21d790a4 Prevent laser sprites clipping into walls/off ledges 2020-05-08 02:58:56 +08:00
lachwright 36b400387e Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it 2020-05-07 23:24:33 +08:00
lachwright 3a1988fc01 Fix knockback scaling 2020-05-07 22:47:34 +08:00
lachwright 63cb58a10a Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
lachwright 92c900f284 New GFZ3 laser 2020-05-06 09:01:02 +08:00
MascaraSnake df3ca712d8 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
SwitchKaze 3106a92e8b Prohibit modification of built-in colors 
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
 2020-02-29 23:14:49 -05:00
SwitchKaze 6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale 56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium 76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
lachwright 365e63894f Merge branch 'next' into knuxtweaks 2020-02-21 16:28:17 +08:00
James R 7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R 92f65fd822 Merge branch 'exitmove-tweaks' into 'next' 
Exitmove tweaks

See merge request STJr/SRB2!709
 2020-02-18 21:58:18 -05:00
MascaraSnake 9498c5ba8e Merge branch 'signpostfixes' into 'next' 
Fix CLEAR! signpost showing up in unmodded games (& add proper support for SPR2 animated signpost)

See merge request STJr/SRB2!775
 2020-02-11 16:23:06 -05:00
lachwright aeab33ee03 Defuse minecarts 2020-02-12 01:41:11 +08:00