stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-29 23:52:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
6784 commits 173 branches 41 tags 186 MiB
Commit graph

6784 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
c8cfc3110f Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Monster Iestyn
6eaf7625a9 Merge branch 'master' into next 2019-07-16 18:26:46 +01:00
Monster Iestyn
3e708e62e8 Merge branch 'fix-gme-free' into 'master' 
Fix crash with GME sounds when being freed

See merge request STJr/SRB2!504
 2019-07-16 13:25:51 -04:00
Monster Iestyn
e50147f7f0 Merge branch 'master' into recordattack-bg-fixes 2019-07-16 17:04:42 +01:00
James R
91502f1499 Don't send login final hashes to everyone 
Someone thought it was a good fucking idea to make logins NetXCmds. NetXCmds
are sent to everyone however. Thankfully logins are two passes. And the second
pass uses a salt based on the playernum. Therefore, in order to actually make
use of the final hash, you'd have to be the same playernum as who originally
sent it. Still a stupid exploit.

P.S. The netcode is LOL XD by VincyTM -Telos
 2019-07-15 16:14:00 -07:00
Monster Iestyn
5ef4dda9b9 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
049789025f Merge branch 'titlesky-fixes' into 'master' 
Titlemap fixes

See merge request STJr/SRB2Internal!258
 2019-07-14 19:38:07 -04:00
Monster Iestyn
d44a8ab78e 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
a1e6f5bdb3 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
f6842a80b4 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
Steel Titanium
4e839596a1
Fix crash with GME sounds when being freed 2019-07-14 14:55:04 -04:00
Monster Iestyn
fac6de9c2e 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
sphere
79cf8eb08d Add a blue variant of the pole banner & change some doomednums. 2019-07-14 17:30:33 +02:00
Monster Iestyn
5c54022a89 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Monster Iestyn
794235a848 Fix mixed code-and-declaration error 2019-07-14 16:19:48 +01:00
Monster Iestyn
6cf82fbb43 Merge branch 'libopenmpt-fixes' into 'master' 
Improved libopenmpt loading

See merge request STJr/SRB2Internal!251
 2019-07-14 11:03:14 -04:00
MascaraSnake
ca7de207d4 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
d30af084d7 Merge branch 'thinkerlists-fix' into 'master' 
Thinkerlists fix

Closes #161

See merge request STJr/SRB2Internal!253
 2019-07-14 10:52:56 -04:00
sphere
ee937c4df0 Add a blue variant of the waving flags. 2019-07-14 16:50:45 +02:00
sphere
cfc56c9541 Don't upscale the waving flags, make them twice as large instead 2019-07-14 15:30:00 +02:00
toaster
b3e953c8c3 Correct some extant fuckups. 2019-07-14 14:21:32 +01:00
MascaraSnake
441ef4b01b 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
911b0262ee Whoops, forgot to revert this. 2019-07-14 02:31:33 +02:00
sphere
9c73424b4b Add spring flags: float for horizontal & no gravity for diagonal. 2019-07-14 02:17:44 +02:00
sphere
106f6498e2 Add meleestate to MT_WALLSPIKE. 2019-07-14 01:29:36 +02:00
sphere
e68e510ca2 Assign sound to the wood debris object. 2019-07-13 23:15:56 +02:00
toaster
323d5d61d3 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
47f138ac34 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
166f1fac66 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
35adf2ce4a fix leftshift of negative value MascaraSnake also gets 2019-07-09 21:48:18 +01:00
Monster Iestyn
f62087ef30 Fix MascaraSnake's issues with sign-compare (hopefully) 2019-07-09 21:43:38 +01:00
Monster Iestyn
63d337211e 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
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