James R
b8d40a5783
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
Louis-Antoine
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Monster Iestyn
f4cb6e1f5e
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
7060083db5
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Tatsuru
80edefa56e
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into dye
2020-02-19 17:32:43 -03:00
Tatsuru
b1ad7787f4
Standards 3
2020-02-18 22:54:11 -03:00
lachwright
248a80cac4
Cast to statenum_t for 32-bit compatibility
2020-02-11 20:36:48 +08:00
lachwright
c417ffae4c
Add proper support for animated signpost
2020-02-11 15:53:25 +08:00
Louis-Antoine
f209721ded
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
d03c928baa
Give flashing tics to disconnected players and prevent drowning
2020-01-22 03:14:44 +01:00
James R
1be648578f
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
fb19d25de1
What
2020-01-14 00:52:54 -03:00
Tatsuru
0fa638eaf5
Logistical problems
2020-01-13 19:12:02 -03:00
Tatsuru
7b3cc02ddc
Range check
2020-01-11 21:38:10 -03:00
Tatsuru
5d33ca42cf
Expose colorization to mappers and SOC
2020-01-11 20:40:57 -03:00
toaster
004cfb45aa
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
6f5833f8b3
Randomize skin during signpost roulette
2020-01-04 14:49:44 +08:00
lachwright
da226139f1
Add generic signpost sprite for skins that don't have one
2020-01-03 13:12:18 +08:00
James R
c46bfa2be9
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
3d724f302d
Fix saloon doors not letting players through when marked with the Ambush flag
2019-12-30 01:16:50 -03:00
lachwright
5ed1dc5410
Remove MF_NOTHINK from join-breaking referenced objects
2019-12-29 03:01:09 +08:00
Jaime Passos
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
Jaime Passos
89b4a558a8
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-23 23:08:16 -03:00
Jaime Passos
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
lachwright
d401ba558d
Fix pflags not being properly reset when entering dust devil from top
2019-12-19 12:03:36 +08:00
Jaime Passos
299f2bd8cd
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
Jaime Passos
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
Steel Titanium
0e371774c8
Fix crash on mapload when removing Dragonbomber with Lua
2019-12-16 21:25:41 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
Alam Ed Arias
b5738620c1
Fixup compiling errors
2019-12-02 12:12:26 -05:00
MascaraSnake
ae2594e5ce
Merge branch 'metalfix' into 'master'
...
Boss Scream fix
See merge request STJr/SRB2Internal!581
2019-12-01 02:26:24 -05:00
toaster
9d442ae6ea
Wait, no, I'm an idiot.
2019-11-30 14:56:43 +00:00
MascaraSnake
e664e8b7f3
Merge branch 'jumphood' into 'master'
...
Jumphood
See merge request STJr/SRB2Internal!573
2019-11-30 06:53:15 -05:00
toaster
85e3180056
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
339907fd5d
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
1fa87611f7
Give the Robo-Hood a cute jump sound whenever it's fleeing you.
2019-11-29 19:18:05 +00:00
toaster
613ae0c9f8
Resolve #374 .
2019-11-26 17:06:30 +00:00
MascaraSnake
8adcea56c3
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
4e9e5a072f
Have Minus spawn debris upon landing, as suggested
2019-11-24 23:42:27 +08:00
MascaraSnake
4be45a5e43
Fixed crash when BASH's target disappears during chasing
2019-11-24 10:22:00 +01:00
lachwright
cdc7a88b04
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
eefc285b5c
locvars not needed
2019-11-18 15:48:29 -08:00
MascaraSnake
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
MascaraSnake
7a48a8d72d
Merge branch 'poledance' into 'master'
...
Make ACZ3's slapstick signpost taller (resolves #267 ).
Closes #267
See merge request STJr/SRB2Internal!473
2019-11-18 15:14:48 -05:00
lachwright
f786a8dbf6
Important fixes & mine lob speed reduction
2019-11-18 22:57:26 +08:00
lachwright
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
toaster
892f6eca27
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
toaster
66001cc73c
Resolve #288 .
...
* Fix off-by-one error I caused in the skin randomisation selection.
* Clean up signcolour set to never go outside of valid entry range.
* Fix the preventing-console-spam mechanism for invalid sprites viewed in-game by only setting the state's sprite/frame to S_UNKNOWN's if the object's sprite/frame is currenly equal to the state's.
2019-11-15 12:47:21 +00:00
MascaraSnake
80fd112009
Merge branch 'papersign2' into 'master'
...
Paper sign tweaks
See merge request STJr/SRB2Internal!460
2019-11-14 18:07:34 -05:00
