MascaraSnake
b068a37d14
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
Sally Coolatta
0038241325
Merge branch 'master' into new-cars-movie
2020-05-12 22:41:37 -04:00
Sally Coolatta
1788d29263
Merge branch 'master' into pet-robo
2020-05-12 22:38:23 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Latapostrophe
2bee969c6a
Add follower bubbles with the BUBBLESCALE field
2020-05-11 00:16:13 +02:00
Sally Coolatta
9ea37836e2
New kart animations!
...
- Add unique frames for inward and outward drifting.
- Increase the speed threshold required to reach your "fast driving" frames.
- Use slow driving frames when you're slowing down, even if you're techincally above the fast speed threshold.
- Use frameangle to smooth out the transition into drifting, instead of having "pre-turned" drift frames.
2020-05-08 17:26:27 -04: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
71f4433b98
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04: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
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
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
Latapostrophe
897feac651
Make SPB spawn damaging dust and sliptides while it moves around
2020-03-20 14:59:38 +01:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -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
834225c597
One more... I swear it's the last...
2020-03-01 17:50:58 -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
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
7f190f35f2
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into Tatsuru/SRB2-dye
...
# Conflicts:
# src/d_player.h
# src/dehacked.c
2020-02-19 17:46:18 -03:00
Tatsuru
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03: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
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
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
Tatsuru
445269ce14
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
Tatsuru
8d5153a595
This is stupid
2020-01-09 12:15:26 -03:00
lachwright
95ca48ada7
Add generic signpost sprite for skins that don't have one
2020-01-03 13:12:18 +08:00
Jaime Passos
be227cc58c
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
