35adf2ce4a
fix leftshift of negative value MascaraSnake also gets
2019-07-09 21:48:18 +01:00
f62087ef30
Fix MascaraSnake's issues with sign-compare (hopefully)
2019-07-09 21:43:38 +01:00
63d337211e
Merge branch 'eggcolosseum' into 'master'
...
Egg Colosseum (CEZ3 remaster)
See merge request STJr/SRB2Internal!248
2019-07-09 16:32:24 -04:00
11a24b88ee
Merge branch 'seaegg_tweaks' into 'master'
...
Sea Egg
See merge request STJr/SRB2Internal!244
2019-07-09 16:25:07 -04:00
dc71e297bb
Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well
2019-07-09 21:15:12 +01:00
848061d517
Fix compiling on Linux
2019-07-09 15:42:14 -04:00
2df90888bb
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
...
# Conflicts:
# src/p_mobj.c
# src/sounds.c
# src/sounds.h
2019-07-09 19:52:52 +01:00
3e305c0993
Merge branch 'toast_cleanup' into 'master'
...
PITY IN PINK and everything associated (formerly toast_fixes)
See merge request STJr/SRB2Internal!232
2019-07-09 14:31:25 -04:00
ef984eb336
Merge branch 'metalfixes' into 'toast_cleanup'
...
Metal Sonic Boss fixes (again)
See merge request STJr/SRB2Internal!245
2019-07-09 14:29:42 -04:00
c1bea02f03
Merge branch 'rainfixesmkII' into 'master'
...
Accidentially broke rain in the rainfixes branch (oh, the irony!)
See merge request STJr/SRB2Internal!249
2019-07-09 14:24:14 -04:00
574cf2609f
Merge branch 'remove-character-flags' into 'master'
...
Remove character flags
Closes #27
See merge request STJr/SRB2Internal!246
2019-07-09 14:18:27 -04:00
b571be865b
Merge branch 'sound-menu-fix' into 'master'
...
Sound options menu fixes
Closes #160
See merge request STJr/SRB2Internal!250
2019-07-08 19:42:47 -04:00
c5ecb392b3
Merge branch 'cezbricks' into 'master'
...
Hardcode CEZ brick debris
See merge request STJr/SRB2Internal!247
2019-07-08 17:03:31 -04:00
d3d24bc0bd
Removed the "disable" linedef effect, since it's useless now that the character flags are gone
2019-07-08 22:58:31 +02:00
5b741d8232
Simplified checks for ML_NETONLY and ML_NONET
2019-07-08 22:56:00 +02:00
4da108748b
Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks.
...
If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)
2019-07-08 21:17:40 +01:00
b265ab6937
Merge branch 'toast_cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
2019-07-08 13:54:11 +01:00
98b6280d03
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup
...
# Conflicts:
# src/p_mobj.c
2019-07-08 13:53:31 +01:00
1f15209eb5
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks
...
# Conflicts:
# src/p_enemy.c
# src/p_mobj.c
2019-07-08 13:52:11 +01:00
a65925aeca
Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed.
...
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
2019-07-08 13:39:21 +01:00
5e0d18be2d
Before I forget...
2019-07-08 13:36:02 +01:00
867f7ecfca
ha ha ha how can i possibly describe this commit
...
Just wait for the MR, it won't be far behind.
2019-07-08 13:26:40 +01:00
d2adb5e829
Update info.h
...
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
2019-07-06 18:11:49 -04:00
ef05d81a4c
Change this, not that it really matters but
2019-07-06 00:39:36 -04:00
ec8f64100e
Hardcode brick debris
2019-07-06 00:36:02 -04:00
5baaba1d9e
Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed.
...
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
2019-07-04 14:44:09 +01:00
b78fac66c4
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum
2019-07-04 14:09:56 +01:00
3efb49487e
Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready.
...
Just making this commit now so I can merge in master...
2019-07-04 14:09:38 +01:00
a5074a846b
Implemented a skin-based linedef executor trigger
2019-07-03 09:19:29 +02:00
4ad1703ae3
Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'""
...
This reverts commit c04b560e92
2019-07-03 00:58:02 +01:00
c04b560e92
Revert "Merge branch 'metalfixes' into 'toast_cleanup'"
...
This reverts merge request !239
2019-07-02 23:49:10 +00:00
e0ae13ff37
Merge branch 'metalfixes' into 'toast_cleanup'
...
Metal Sonic Boss fixes
See merge request STJr/SRB2Internal!239
2019-07-02 19:45:46 -04:00
5cec737985
Remove character-specific flags, replace them with net-only/no-net flags
2019-07-03 00:10:22 +02:00
29bf89824f
Merge branch 'thinkerlists' into 'master'
...
Separate thinkers into different lists
See merge request STJr/SRB2Internal!219
2019-07-02 17:30:31 -04:00
1dadc11cc8
Merge branch 'thinkerlists' of git.magicalgirl.moe:STJr/SRB2Internal into thinkerlists
2019-07-02 23:09:17 +02:00
e9978b2955
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
a67900b453
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:03:06 +02:00
a3f758f34f
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks
...
# Conflicts:
# src/p_mobj.c
2019-07-02 14:19:36 +01:00
726b0f6c83
correctly use P_UnsetThingPosition, P_SetThingPosition + P_DelSeclist around MF_NOBLOCKMAP addition in the TNT explosion code
2019-06-30 22:22:12 +01:00
658a3f2eea
comment out unused variable
2019-06-30 19:33:41 +01:00
f9f92abc44
ha ha ha ha ha ha ha ha
...
Sea Egg is majorly changed according to Mystic's ancient instructions (excepting the flying FOF rock, I cared not for fucking around with FOFs).
Specifically:
* Faster paced fight.
* Instantly travels horizontal distance.
* Fakes no longer hurt papa, and spin out like a deflating balloon when he dies.
* New attack: When surfacing, produces an electric shockwave. Replaces underwater shock. Designed for new, shallow arena.
* Support for multiple bosses in the same map distinguished by parameter.
Will upload map to fight the new battle in on the MR.
2019-06-30 15:37:33 +01:00
9913cc39a1
Merge branch 'public_next'
...
# Conflicts:
# src/g_game.c
# src/p_setup.c
# src/p_user.c
# src/r_data.c
2019-06-29 20:55:58 +01:00
e5a0bd8be3
Merge branch 'wooddebris-fix' into 'master'
...
Wood debris fix
See merge request STJr/SRB2Internal!240
2019-06-29 03:21:15 -04:00
3a9ce483f5
Merge branch 'master' into next
...
# Conflicts:
# src/r_data.c
2019-06-28 23:24:36 +01:00
2c906e9c29
Merge branch 'jimita-unfuck-awayview' into 'next'
...
unfuck awayview
See merge request STJr/SRB2!493
2019-06-28 18:21:52 -04:00
47eb711097
Merge branch 'public-musicplus-feature-endoflevel' into 'next'
...
Fade out music at end of level, before intermission
See merge request STJr/SRB2!472
2019-06-28 18:21:07 -04:00
836d3d3186
Fixed Canarivore gas going through the floor
2019-06-29 00:19:46 +02:00
f7357a02ae
Merge branch 'pk3-folders-are-not-textures-backport' into 'next'
...
Pk3 folders are not textures!
See merge request STJr/SRB2!502
2019-06-28 18:18:53 -04:00
016f1fe533
Merge branch 'morememoryshenanigans' into 'master'
...
More Memory Shenanigans
See merge request STJr/SRB2!501
2019-06-28 18:18:14 -04:00
3e404051c9
Merge branch 'console-colors-touchup' into 'master'
...
Console color shenanigans
Closes #156
See merge request STJr/SRB2Internal!238
2019-06-28 18:16:12 -04:00
Monster Iestyn