ZipperQR
d62d43a76b
Dust devil support
2020-04-22 00:59:12 +03:00
Nev3r
f61d677f34
Delete tags.
2020-04-18 00:23:24 +02:00
Nev3r
71ab943298
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
Nev3r
23ed07e08e
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02: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
Latapostrophe
297104f12d
Merge branch 'fix-double-bombs' into awful-mix
2020-04-05 22:30:43 +02:00
Sally Cochenour
4380caf7dd
All around polishing
...
- Make ring usage smarter
- Ring usage threshold varies between characters (Tails will be more willing to dump rings, Metal will hold onto them)
- Decrease ring use threshold when they have a speed boost (tethering)
- Decrease ring use threshold when slowed down more than usual
- Properly implement Triple Sneaker & Rocket Sneaker usage
- Use smallest radius of all waypoints being predicted, to improve precision
- Bots never use prev waypoints
2020-04-01 21:16:26 -04:00
Latapostrophe
8960152a7c
Merge branch 'v2-master' into spb-waypoints
2020-03-28 15:12:38 +01:00
Sally Cochenour
657a15fae2
Merge branch 'master' into new-items
2020-03-28 00:23:39 -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
James R
abcba53781
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 18:28:07 -07:00
Sally Cochenour
ec7528a333
Merge branch 'master' into new-items
2020-03-22 21:17:43 -04:00
Sally Cochenour
464e3273a9
Missing include
2020-03-22 21:16:55 -04:00
James R
cbd4693de7
Merge remote-tracking branch 'origin/master' into parties
2020-03-22 14:34:29 -07:00
Sally Cochenour
7f1d55421a
Merge branch 'master' into new-items
2020-03-22 14:23:51 -04:00
Latapostrophe
2cd0e1d615
I'm dumb, don't check for flashtics here...
2020-03-22 13:08:46 +01:00
Sryder
4975cce3ac
Just use an I_Assert on SpawnSPBRingTrail
2020-03-22 00:47:17 +00:00
Latapostrophe
366fff9942
Red rings, fuse, and spb game speed support
2020-03-20 21:58:14 +01:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Latapostrophe
897feac651
Make SPB spawn damaging dust and sliptides while it moves around
2020-03-20 14:59:38 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Sally Cochenour
040865b589
Merge branch 'master' into new-items
2020-03-17 19:31:47 -04:00
Sally Cochenour
fa34e4eee4
Merge branch 'master' into sal-waypoints
2020-03-15 20:21:17 -04:00
Latapostrophe
b6bc575a70
Merge branch 'spb-blockmap-fix' of git.magicalgirl.moe:KartKrew/Kart-Public into awful-mix
2020-03-13 22:38:20 +01:00
Latapostrophe
bcca38d014
This flag shouldn't have been applied there
2020-03-13 13:50:22 +01:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
James R
18aa2972e5
Merge remote-tracking branch 'origin/master' into parties-only
2020-03-05 21:41:23 -08:00
Sally Cochenour
2b6ca4a384
Increase SPB speed & turn
2020-03-03 20:56:57 -05:00
Sally Cochenour
721fb369fd
Move changes to K_GetBestWaypointForMobj so that K_GetClosestWaypointToMobj can stay the same
2020-03-03 18:34:17 -05:00
Jaime Passos
895c226548
Fix incorrect team gametype rule being used in A_OldRingExplode
2020-02-28 23:25:25 -03:00
Jaime Passos
604c05801a
Fix homing ring using the wrong team gametype rule
2020-02-28 23:21:27 -03:00
James R
f164320c88
Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen
2020-02-23 23:20:20 -08:00
Sally Cochenour
c7daa33bb8
Merge branch 'master' into draw-flags
2020-02-24 00:52:45 -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
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
1463d8ba20
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
Tatsuru
92060edf6d
Standards 3
2020-02-18 22:54:11 -03:00
lachwright
390511a531
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
2544681658
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
Louis-Antoine
a997683d1c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into keep-body
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
2020-01-22 03:57:22 +01:00
Louis-Antoine
08589dcd96
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01: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
b4d6c160a9
What
2020-01-14 00:52:54 -03:00
Tatsuru
0ef62248ab
Logistical problems
2020-01-13 19:12:02 -03:00
Tatsuru
a1fb309392
Range check
2020-01-11 21:38:10 -03:00
Tatsuru
445269ce14
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
toaster
4f77e1e99b
Allow Rollout Rocks that are being ridden to:
...
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.
This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).
Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00