Commit graph

958 commits

Author SHA1 Message Date
lachwright
f947c5e8f6 Merge branch 'next' into knuxtweaks 2020-02-01 18:00:55 +08:00
James R
9820a7384f 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
6d3f0c6a90 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
46d217b731 Fix damagetype for Cybrak flamethrower. 2020-01-25 11:31:06 -05:00
lachwright
8108fc7cf5 Reduce severity of glide landing & move skid dust to separate function 2020-01-23 01:02:44 +08:00
Tatsuru
2d7d8fc1b1 HUD visual indicator + property fix 2020-01-19 21:55:08 -03:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
James R
e831a61df5 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
3adedd5f8d Fix Egg Slimer pogo hitbox being intangible. (WHY does it have MF_NOCLIPTHING????) 2020-01-11 16:40:42 +00:00
Tatsuru
2fda026608 *bends over seductively to pick up whitespace* 2020-01-09 16:16:24 -03:00
Tatsuru
8d5153a595 This is stupid 2020-01-09 12:15:26 -03:00
Steel Titanium
447f9e65c3 Fix S_HAMMER being off by one 2020-01-08 16:00:02 -05:00
lachwright
95ca48ada7 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
lachwright
65c5f7f571 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
47dfb2046b Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00
sphere
589eeb1eb7 Edit some rock crumble states to match new sprites. 2019-12-05 02:22:25 +01:00
MascaraSnake
cebd7df2fc Merge branch 'jumphood' into 'master'
Jumphood

See merge request STJr/SRB2Internal!573
2019-11-30 06:53:15 -05:00
MascaraSnake
a0c10542dd Merge branch 'brakyeet' into 'master'
This Black Eggman? ***YEET*** (resolves #399)

Closes #399

See merge request STJr/SRB2Internal!575
2019-11-30 05:21:55 -05:00
toaster
e3c8f7bcd3 This Black Eggman? ***YEET***
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
2019-11-29 21:55:25 +00:00
toaster
9f92374fb6 Merge branch 'master' into spd 2019-11-29 19:19:55 +00:00
toaster
0f21a18159 Give the Robo-Hood a cute jump sound whenever it's fleeing you. 2019-11-29 19:18:05 +00:00
toaster
2c2169f3c3 Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382). 2019-11-27 13:47:38 +00:00
MascaraSnake
b52c71b6e2 Merge branch 'minusflip' into 'master'
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
MascaraSnake
2ad057d9b9 Give RVZ lavafalls fire damage 2019-11-24 23:01:17 +01:00
lachwright
4a23d46bce Have Minus spawn debris upon landing, as suggested 2019-11-24 23:42:27 +08:00
lachwright
86ff608cfd Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
toaster
c583c87fc0 Do Cobalt's suggestion, because this branch wasn't gonna get merged in its original state anyways. 2019-11-22 16:27:22 -05:00
MascaraSnake
6ac467896b Merge branch 'drtminus' into 'master'
drt minus

See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
MascaraSnake
76ef50f73e Merge branch 'gfz-debris' into 'master'
VAdaPEGA's GFZ debris

See merge request STJr/SRB2Internal!505
2019-11-22 15:27:11 -05:00
lachwright
d1d8146001 Correct sound for GFZ debris (copy-paste oversight) 2019-11-21 01:26:53 +08:00
lachwright
eb80360850 Add missing GFZD spriteset 2019-11-21 01:14:24 +08:00
lachwright
a9326be8d7 Add GFZ debris; reorganize wood debris index 2019-11-21 01:05:22 +08:00
lachwright
553e80332e Add bump sounds to rollout rock & add Newton's third law to jumping off them 2019-11-20 23:45:34 +08:00
MascaraSnake
04fbb5dbd3 Merge branch 'cobalt-ai' into 'master'
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
2019-11-18 17:26:28 -05:00
MascaraSnake
66cc8046a5 Merge branch 'dragonbomber' into 'master'
Dragonbomber

See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
toaster
2bfbfc1933 Left this in by mistake. 2019-11-18 22:07:29 +00:00
toaster
420656a716 As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite. 2019-11-18 22:05:05 +00:00
toaster
7bcaa5c359 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
# Conflicts:
#	src/p_map.c
2019-11-18 21:33:51 +00:00
MascaraSnake
5324107edf Merge branch 'jester-fireball' into 'master'
Mario fireball by Jester (resolves #296)

Closes #296

See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
MascaraSnake
ecd021abdf Merge branch 'fhzenemytweaks' into 'master'
Hardcode DrT's FHZ improvements (resolves #295).

Closes #295

See merge request STJr/SRB2Internal!483
2019-11-18 15:21:59 -05:00
toaster
b283b85d0b In the absence of a proper revamp of the badnik, give the Deton the SPB sound from Kart when it sees the player, as a teaching shorthand and/or easter egg. 2019-11-18 13:27:02 +00:00
lachwright
cd38e4ba1a Add flight indicator 2019-11-18 15:17:27 +08:00
lachwright
3fb5870445 Prevent mines from sliding upon touching the ground 2019-11-18 10:35:56 +08:00
Jaime Passos
dd39e59749 Restore old sound effect 2019-11-17 21:33:59 -03:00
Jaime Passos
743f04e2ca Fireball 2019-11-17 21:25:17 -03:00
lachwright
814ee200fa Add Dragonbomber enemy 2019-11-18 05:23:59 +08:00
toaster
e936b0d893 Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha 2019-11-17 20:34:25 +00:00
toaster
9c221d2362 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +00:00
MascaraSnake
397520e090 Merge branch 'papersign2' into 'master'
Paper sign tweaks

See merge request STJr/SRB2Internal!460
2019-11-14 18:07:34 -05:00