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
lachwright
c417ffae4c
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
lachwright
af7366058d
Merge branch 'next' into knuxtweaks
2020-02-01 18:00:55 +08:00
James R
71707e6dca
Reset rollangle on TNT explosion
...
This is the where the extreme lag when TNT Barrels explode came from. Probably
because the sprites are big and there's four of 'em! It shouldn't matter that
these aren't rotated--they're pretty round.
2020-01-31 14:32:47 -08:00
toaster
f90c70ebe2
Make the DMG actually *applied*. Consequence: flame will continue flying through player instead of dying in midair and dropping a flame, but this is actually desirable given the current behaviour looks kind of shitty.
2020-01-25 11:34:30 -05:00
toaster
2dd13bb2a4
Fix damagetype for Cybrak flamethrower.
2020-01-25 11:31:06 -05:00
lachwright
32607d6195
Reduce severity of glide landing & move skid dust to separate function
2020-01-23 01:02:44 +08:00
Tatsuru
db22d503a4
HUD visual indicator + property fix
2020-01-19 21:55:08 -03:00
Tatsuru
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03:00
James R
1be648578f
Merge branch 'clear-sign-sprite' into 'next'
...
Add generic signpost sprite for skins that don't have one
See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
toaster
e938f16fef
Fix Egg Slimer pogo hitbox being intangible. (WHY does it have MF_NOCLIPTHING????)
2020-01-11 16:40:42 +00:00
Tatsuru
10e9dd2c23
*bends over seductively to pick up whitespace*
2020-01-09 16:16:24 -03:00
Tatsuru
3e3cb48feb
This is stupid
2020-01-09 12:15:26 -03:00