Commit graph

958 commits

Author SHA1 Message Date
lachwright
bfd1d3d49f Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it 2020-05-07 23:24:33 +08:00
lachwright
cd9774b649 Fix knockback scaling 2020-05-07 22:47:34 +08:00
lachwright
645c324d51 Update new GFZ3 laser 2020-05-06 09:03:03 +08:00
lachwright
b4648e4c78 New GFZ3 laser 2020-05-06 09:01:02 +08:00
MascaraSnake
db717f1cf7 Move polyobject crush option to the first line args 2020-05-04 23:27:26 +02:00
Latapostrophe
63485c3dbe Merge branch 'v2-master' into followme-internal 2020-05-03 22:37:26 +02:00
Sally Coolatta
1fcfdd5bae Bot hints
Thing type 2004, adds a map-defined point for bots to gravitate towards or away from.
Angle: Changes radius, defaults to a 32 radius (or 64x64 area) without.
Ambush: When off, makes bots steer towards. When on, makes bots steer away.
Parameter: Changes how much the bot steers away/towards this point. If 0, defaults to 2.

(also, made bots ignore strong offroad if they could take a shortcut)
2020-04-30 14:15:10 -04:00
James R
fd51bf10b0 Thing type 2003, MT_WAYPOINT_ANCHOR - Adjust waypoint's radius
The distance from the waypoint to the anchor will be the new radius.
2020-04-21 00:36:45 -07:00
James R
89a2f8ec8d Thing type 2002, MT_WAYPOINT_RISER - Raise tagged waypoints in sector to FOF sorted by height
Thing height refers to the index of FOF. FOF are sorted by top height, lowest
to highest. Set Object Flip to sort highest to lowest.

If the waypoint thing set Object Flip, it will be placed on the bottom of the
FOF. The sorting remains the same though.

Set Ambush to raise the waypoint to the same z position.
2020-04-04 01:20:38 -07:00
Sally Cochenour
266ad99374 Add new item sprites 2020-03-30 06:57:42 -04:00
Latapostrophe
4c1459cd4e Chaos Conflicts 2020-03-29 12:14:27 +02:00
Latapostrophe
8960152a7c Merge branch 'v2-master' into spb-waypoints 2020-03-28 15:12:38 +01:00
Sally Cochenour
9a8e3aecd9 Fix papersprite appearing on wrong frames 2020-03-28 06:19:25 -04:00
Sally Cochenour
bee6bbf619 Firework frames for fire shield 2020-03-28 03:56:39 -04:00
Sally Cochenour
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -04:00
Sally Cochenour
7ec398e579 Slow down animation speed, fix meter bugs 2020-03-26 03:13:10 -04:00
Sally Cochenour
b6c282ec12 Move Eggman item code to k_collide 2020-03-26 00:47:30 -04:00
Sally Cochenour
81fa5d7f51 Start on new flame shield dash visuals 2020-03-25 23:49:39 -04:00
Latapostrophe
6d0513aa9a Fix conflict 2020-03-25 23:31:53 +01:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
Sally Cochenour
7f1d55421a Merge branch 'master' into new-items 2020-03-22 14:23:51 -04:00
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