stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-12 13:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity
6358 commits 172 branches 41 tags 242 MiB
Commit graph

6358 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
11a24b88ee Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Monster Iestyn
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
Steel Titanium
60cb2de6a0
Seperate declarations from code 2019-07-09 15:51:11 -04:00
Steel Titanium
c1c6656b54
Merge branch 'master' into libopenmpt-fixes 2019-07-09 15:44:58 -04:00
Steel Titanium
848061d517
Fix compiling on Linux 2019-07-09 15:42:14 -04:00
toaster
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
Monster Iestyn
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
Monster Iestyn
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
Monster Iestyn
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
MascaraSnake
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
Steel Titanium
21c6836fe0 Some few comments 2019-07-09 00:56:22 -04:00
Steel Titanium
e112856265 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into libopenmpt-fixes 2019-07-09 00:17:27 -04:00
Steel Titanium
9c2c81ba4e Merge branch 'master' into libopenmpt-fixes 2019-07-08 23:37:56 -04:00
Monster Iestyn
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
Monster Iestyn
c5ecb392b3 Merge branch 'cezbricks' into 'master' 
Hardcode CEZ brick debris

See merge request STJr/SRB2Internal!247
 2019-07-08 17:03:31 -04:00
MascaraSnake
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
MascaraSnake
5b741d8232 Simplified checks for ML_NETONLY and ML_NONET 2019-07-08 22:56:00 +02:00
Monster Iestyn
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
toaster
b265ab6937 Merge branch 'toast_cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 2019-07-08 13:54:11 +01:00
toaster
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
toaster
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
toaster
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
toaster
5e0d18be2d Before I forget... 2019-07-08 13:36:02 +01:00
toaster
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
Steel Titanium
d2adb5e829 Update info.h 
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
 2019-07-06 18:11:49 -04:00
Steel Titanium
ef05d81a4c Change this, not that it really matters but 2019-07-06 00:39:36 -04:00
Steel Titanium
ec8f64100e Hardcode brick debris 2019-07-06 00:36:02 -04:00
toaster
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
toaster
b78fac66c4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-04 14:09:56 +01:00
toaster
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
MascaraSnake
a5074a846b Implemented a skin-based linedef executor trigger 2019-07-03 09:19:29 +02:00
toaster
4ad1703ae3 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" 
This reverts commit c04b560e92.
 2019-07-03 00:58:02 +01:00
MascaraSnake
c04b560e92 Revert "Merge branch 'metalfixes' into 'toast_cleanup'" 
This reverts merge request !239
 2019-07-02 23:49:10 +00:00
MascaraSnake
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
MascaraSnake
5cec737985 Remove character-specific flags, replace them with net-only/no-net flags 2019-07-03 00:10:22 +02:00
MascaraSnake
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
MascaraSnake
1dadc11cc8 Merge branch 'thinkerlists' of git.magicalgirl.moe:STJr/SRB2Internal into thinkerlists 2019-07-02 23:09:17 +02:00
MascaraSnake
e9978b2955 Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:08:37 +02:00
Jonas Sauer
a67900b453 Merge branch 'master' into thinkerlists 
# Conflicts:
#	src/f_finale.c
#	src/p_enemy.c
 2019-07-02 23:03:06 +02:00
toaster
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
Monster Iestyn
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
Monster Iestyn
658a3f2eea comment out unused variable 2019-06-30 19:33:41 +01:00
toaster
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
Steel Titanium
164e797670 Better loading code for modules 2019-06-29 20:35:31 -04:00
Monster Iestyn
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
MascaraSnake
e5a0bd8be3 Merge branch 'wooddebris-fix' into 'master' 
Wood debris fix

See merge request STJr/SRB2Internal!240
 2019-06-29 03:21:15 -04:00
Monster Iestyn
3a9ce483f5 Merge branch 'master' into next 
# Conflicts:
#	src/r_data.c
 2019-06-28 23:24:36 +01:00
Steel Titanium
2c906e9c29 Merge branch 'jimita-unfuck-awayview' into 'next' 
unfuck awayview

See merge request STJr/SRB2!493
 2019-06-28 18:21:52 -04:00
Steel Titanium
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
MascaraSnake
836d3d3186 Fixed Canarivore gas going through the floor 2019-06-29 00:19:46 +02:00