Commit graph

927 commits

Author SHA1 Message Date
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
lachwright
12e43a2e9b Randomize skin during signpost roulette 2020-01-04 14:49:44 +08:00
lachwright
95ca48ada7 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
James R
529ccf9271 Merge branch 'saloondoor-fix' into 'next'
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
2019-12-30 00:25:37 -05:00
Tatsuru
d01fb277dc Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
lachwright
65c5f7f571 Remove MF_NOTHINK from join-breaking referenced objects 2019-12-29 03:01:09 +08:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Jaime Passos
8405dc4c07 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-23 23:08:16 -03:00
Jaime Passos
ad317cd8a2 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-19 02:15:45 -03:00
lachwright
4be3a0706c Fix pflags not being properly reset when entering dust devil from top 2019-12-19 12:03:36 +08:00
Jaime Passos
789e881abc GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium
6797e328bb Fix crash on mapload when removing Dragonbomber with Lua 2019-12-16 21:25:41 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
Alam Ed Arias
b869d29580 Fixup compiling errors 2019-12-02 12:12:26 -05:00
MascaraSnake
16703a6752 Merge branch 'metalfix' into 'master'
Boss Scream fix

See merge request STJr/SRB2Internal!581
2019-12-01 02:26:24 -05:00
toaster
4f38017598 Wait, no, I'm an idiot. 2019-11-30 14:56:43 +00:00
MascaraSnake
cebd7df2fc Merge branch 'jumphood' into 'master'
Jumphood

See merge request STJr/SRB2Internal!573
2019-11-30 06:53:15 -05:00
toaster
d6ed463227 Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA. 2019-11-30 10:31:18 +00: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
0f21a18159 Give the Robo-Hood a cute jump sound whenever it's fleeing you. 2019-11-29 19:18:05 +00:00
toaster
b177507be2 Resolve #374. 2019-11-26 17:06:30 +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
lachwright
4a23d46bce Have Minus spawn debris upon landing, as suggested 2019-11-24 23:42:27 +08:00
MascaraSnake
1b1b4e6c4e Fixed crash when BASH's target disappears during chasing 2019-11-24 10:22:00 +01: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
James R
5793ba8220 locvars not needed 2019-11-18 15:48:29 -08:00