Sryder
da2f1fc972
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/k_kart.c
2020-03-21 23:27:55 +00:00
Sal
9d35d0f5d8
Merge branch 'driftspark-update' into 'master'
...
Yellow drift sparks & new drift spark effects
See merge request KartKrew/Kart!211
2020-03-21 19:02:48 -04:00
Sal
cbfce16dcc
Merge branch 'done-with-spikeballs' into 'master'
...
Slow down backwards spikeballs (again)
See merge request KartKrew/Kart!212
2020-03-21 18:49:02 -04:00
Latapostrophe
897feac651
Make SPB spawn damaging dust and sliptides while it moves around
2020-03-20 14:59:38 +01:00
Sally Cochenour
7924606fe4
Opaque splash
2020-03-19 22:37:13 -04:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sally Cochenour
9e3a37cdc7
Make Ballhog thrown more like normal missiles
...
(For some reason, it used banana toss throwing speeds before)
2020-03-17 18:49:16 -04:00
Sally Cochenour
860c1fe23b
Opaque rain
2020-03-16 04:17:45 -04:00
Sally Cochenour
48e69f7c91
Air sparks, start on drift boosts
2020-03-16 00:53:33 -04:00
Sally Cochenour
c4dd88bbae
Turn sparkles that warn you when you're about to hit a new drift spark!
2020-03-15 21:59:22 -04:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04:00
Sally Cochenour
c6f3ac651e
Switch red & blue sparks, add yellow sparks, add big spark sprites
2020-03-14 01:43:54 -04:00
James R
253ab49c07
Merge remote-tracking branch 'origin/master' into 22shadows
2020-03-05 21:36:58 -08:00
Sal
10fe9434f6
Merge branch 'blizzard' into 'master'
...
Weather system refactor, Blizzard weather type
See merge request KartKrew/Kart!200
2020-03-06 00:09:43 -05:00
Sally Cochenour
2b6ca4a384
Increase SPB speed & turn
2020-03-03 20:56:57 -05:00
Sally Cochenour
30d391b6b2
FINISH removing the shadows...
2020-03-01 17:35:49 -05:00
Sally Cochenour
3633dc341a
Merge branch 'master' into targets
2020-03-01 15:42:49 -05:00
Sally Cochenour
6956e1d24e
Store random states in mobjinfo instead of precipprops
...
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
SwitchKaze
044e19e328
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
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
lachwright
db766f02a5
Merge branch 'next' into knuxtweaks
2020-02-21 16:28:17 +08:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
James R
ba9f866acf
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
MascaraSnake
905d9a5ee6
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
e5b788ed65
Defuse minecarts
2020-02-12 01:41:11 +08:00
lachwright
2544681658
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
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
