thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6279 commits 1 branch 12 tags 205 MiB
Commit graph

6279 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
0cc9cc0acf On second thoughts I'll go back to 8 for length in these variables, since as far as I can tell the code doesn't need it to be longer anyway 2019-07-20 16:30:30 +01:00
Monster Iestyn
82cfd76402 Merge branch 'master' into recordattack-bg-fixes 2019-07-16 17:04:42 +01:00
Monster Iestyn
b0f30ca0df Instead of ignoring blank menutypes in M_IterateMenuTree, ignore them in the MIT_ functions instead. 
(I'm doing this because MIT_GetMenuAtLevel appears to actually care about whether menutype is zero or not unlike the others; I don't want to break the code designed around that)
 2019-07-15 20:25:57 +01:00
Monster Iestyn
b53f5ec41f Merge branch 'titlesky-fixes' into 'master' 
Titlemap fixes

See merge request STJr/SRB2Internal!258
 2019-07-14 19:38:07 -04:00
Monster Iestyn
a424fce29d Slightly unrelated tweak: bghide && titlemapinaction clearly takes precedence over bgname if both are present, so reorder these if statement blocks 2019-07-14 22:36:14 +01:00
Monster Iestyn
1ec917f44e remove some of the GS_TIMEATTACK hacks I added because I now realise I can just turn titlemapinaction off when entering the menus \o/ 2019-07-14 22:28:19 +01:00
Monster Iestyn
5303475033 Fixes for menus: 
* add gamestate != GS_TIMEATTACK checks to prevent Record Attack or NiGHTS Mode losing their backgrounds
* increase bgname to 9 to include the extra NULL byte? (is this a good idea actually)
* make M_IterateMenuTree ignore menu levels without a menutype value
 2019-07-14 21:58:48 +01:00
Monster Iestyn
157808c0b5 The titlemap glitches turned out to be linked to deathmatchstarts, which wasn't actually properly cleared out each level load ...let's actually fix that, lol. 
(Neither were the CTF starts but those didn't directly cause any problems luckily)
 2019-07-14 18:10:03 +01:00
Monster Iestyn
3fec42c436 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Monster Iestyn
1ba1318f37 Fix mixed code-and-declaration error 2019-07-14 16:19:48 +01:00
Monster Iestyn
97404e9b8c Merge branch 'libopenmpt-fixes' into 'master' 
Improved libopenmpt loading

See merge request STJr/SRB2Internal!251
 2019-07-14 11:03:14 -04:00
MascaraSnake
1b79c29559 Merge branch 'wallspike-fix' into 'master' 
Fix wall spikes that start retracted

See merge request STJr/SRB2Internal!255
 2019-07-14 10:55:10 -04:00
Monster Iestyn
a001167bb4 Merge branch 'thinkerlists-fix' into 'master' 
Thinkerlists fix

Closes #161

See merge request STJr/SRB2Internal!253
 2019-07-14 10:52:56 -04:00
toaster
85d46b49e1 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
MascaraSnake
d506e70c51 Merge branch 'wood-debris-unmute' into 'master' 
Unmute wood debris

See merge request STJr/SRB2Internal!254
 2019-07-14 04:07:38 -04:00
sphere
af3089cda5 Add meleestate to MT_WALLSPIKE. 2019-07-14 01:29:36 +02:00
sphere
d244f7d18e Assign sound to the wood debris object. 2019-07-13 23:15:56 +02:00
toaster
6a90505009 Correct some more minor issues with hw_light.c and the ALAM_LIGHTING. (Hi Alam! ^u^) 2019-07-13 14:07:40 +01:00
toaster
2fbb0bbb52 I know this isn't my branch, but found several reference haemmoragers and figured it'd be appropriate to commit here. 2019-07-13 13:43:22 +01:00
Jonas Sauer
b7c783223a Fixed the thinkerlist issues by removing THINK_LIMBO. Delay-removed thinkers now stay in their list. 
Also includes toaster's assorted fixes and improvements from target_painted_on_your_ass.
 2019-07-13 01:42:03 +02:00
Monster Iestyn
b7b32167f7 fix leftshift of negative value MascaraSnake also gets 2019-07-09 21:48:18 +01:00
Monster Iestyn
b820635130 Fix MascaraSnake's issues with sign-compare (hopefully) 2019-07-09 21:43:38 +01:00
Monster Iestyn
8151360ca7 Merge branch 'eggcolosseum' into 'master' 
Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248
 2019-07-09 16:32:24 -04:00
Monster Iestyn
7a8843a295 Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Monster Iestyn
6105275e42 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
c0927754a1 Seperate declarations from code 2019-07-09 15:51:11 -04:00
Steel Titanium
7088a5d534 Merge branch 'master' into libopenmpt-fixes 2019-07-09 15:44:58 -04:00
Steel Titanium
d9ed4be606 Fix compiling on Linux 2019-07-09 15:42:14 -04:00
toaster
3c5cbd5980 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
dcbe0f7f46 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
d9048f2c39 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
11bf294a74 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
193b86efab 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
ccecb4c6cd Some few comments 2019-07-09 00:56:22 -04:00
Steel Titanium
86c8a0a5d9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into libopenmpt-fixes 2019-07-09 00:17:27 -04:00
Steel Titanium
f4275cf4ce Merge branch 'master' into libopenmpt-fixes 2019-07-08 23:37:56 -04:00
Monster Iestyn
a10514b5ef 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
ba0455ab47 Merge branch 'cezbricks' into 'master' 
Hardcode CEZ brick debris

See merge request STJr/SRB2Internal!247
 2019-07-08 17:03:31 -04:00
MascaraSnake
2a700e12d0 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
d066fdc82f Simplified checks for ML_NETONLY and ML_NONET 2019-07-08 22:56:00 +02:00
Monster Iestyn
59b346b6d1 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
9282e8cd7e Merge branch 'toast_cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 2019-07-08 13:54:11 +01:00
toaster
e5cdfe998b 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
823ea62e7c 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
83ca8e065d 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
bc53be177e Before I forget... 2019-07-08 13:36:02 +01:00
toaster
0124e248ee 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
5dc55712e1 Update info.h 
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
 2019-07-06 18:11:49 -04:00
Steel Titanium
c7527ad58b Change this, not that it really matters but 2019-07-06 00:39:36 -04:00
Steel Titanium
0374101ca1 Hardcode brick debris 2019-07-06 00:36:02 -04:00