16435 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Lactozilla	74777eeb81	Only show level select option if started a session from a level select	2025-01-21 17:56:02 -03:00
Lactozilla	20a72e2ece	Merge branch 'selectcuts' into 'next' ... Fix single player level select conditions (resolves #1385) Closes #1385 See merge request STJr/SRB2!2609	2025-01-21 20:55:26 +00:00
Neon	f1006ece34	Spawn Torchflower's flame after the original object is scaled from a mapthing	2025-01-21 01:31:57 +00:00
MIDIMan	fe0fd35bbc	Merge branch SRB2:next into fix-blockmap-bugs	2025-01-20 21:07:44 +00:00
pastel	18e39ee42e	Fix single player level select conditions	2025-01-20 14:32:56 -06:00
Gustaf Alhäll	83de7c93a4	Fix in-game masterserver listing	2025-01-20 16:52:58 +01:00
Lactozilla	507e72a4a8	Merge remote-tracking branch 'public/next' into 2215	2025-01-20 01:39:55 -03:00
Lactozilla	e7970fc59a	Merge branch 'fix-miscolored-chat' into 'next' ... Make chat aware of team colors on normal chat plus custom team colors See merge request STJr/SRB2!2588	2025-01-20 02:12:30 +00:00
Lactozilla	f53086896c	Merge branch 'remove-redundant-mobj-state' into 'next' ... Remove redundant P_CyclePlayerMobjState function See merge request STJr/SRB2!2601	2025-01-20 02:09:26 +00:00
Lactozilla	c935d0a5a2	Merge branch 'getsprite2patch-fallback' into 'next' ... Make v.getSprite2Patch able to fallback to non-super sprites See merge request STJr/SRB2!2597	2025-01-20 02:08:24 +00:00
Lactozilla	d0096ff89d	Fix order of spr2defaults	2025-01-19 18:05:00 -03:00
Gustaf Alhäll	8f388ef9ae	Remove redundant P_CyclePlayerMobjState function	2025-01-19 18:21:16 +01:00
Lactozilla	9142bfbf7d	Don't make Metal Sonic or Amy grayscale when spawning them using objectplace	2025-01-19 02:29:33 -03:00
Lactozilla	8ca2b44ccd	Fix map thing type check in OP_CreateNewMapThing	2025-01-19 02:27:50 -03:00
Krabs	f86a7382a6	Use SPR_PLAY for all npc player boss/cameo objects	2025-01-19 02:26:15 -03:00
Lactozilla	398c51dac0	Merge remote-tracking branch 'public/next' into 2215	2025-01-19 01:39:34 -03:00
Lactozilla	5d79cf674c	Merge branch '1378-2-2-14-character-continue-icon-xtrac0-doesn-t-properly-show-for-all-characters-both-vanilla' into 'next' ... Fix #1378 Closes #1378 See merge request STJr/SRB2!2599	2025-01-19 04:39:09 +00:00
Lactozilla	60764362e3	Merge remote-tracking branch 'public/next' into 2215	2025-01-19 01:38:16 -03:00
Lactozilla	00c928d930	Fix #1378	2025-01-18 21:50:30 -03:00
Lactozilla	9506ec138a	Merge branch 'fix-team-scoreboard-again' into 'next' ... Fix team scoreboards: The sequel See merge request STJr/SRB2!2598	2025-01-18 21:40:35 +00:00
Lugent	3e4df506d0	Better formatting	2025-01-18 17:22:37 -04:00
Lugent	be9adc3883	Fix it team scoreboard properly	2025-01-18 17:05:17 -04:00
Eidolon	668a6f7541	Re-add inadvertently removed orbitalviolet credit	2025-01-18 14:30:48 -06:00
Eidolon	7062fe394c	Revert "Most Pipe Towers stuff, I'm tired" ... This reverts commit db5d9053f2.	2025-01-18 13:55:53 -06:00
Eidolon	70df636bb6	Revert "Add Evertone to credits and adjust some objs" ... This reverts commit b91854fa25.	2025-01-18 13:54:32 -06:00
Eidolon	5cc68e23d5	Revert "Trampolines!" ... This reverts commit ae0886e279.	2025-01-18 13:54:31 -06:00
Eidolon	6a453d11fd	Revert "Mario power up hardcoding" ... This reverts commit fd60588262.	2025-01-18 13:54:20 -06:00
Eidolon	7eaa7ca85b	Begin version 2.2.15 cycle	2025-01-18 13:52:26 -06:00
Lactozilla	d92e293385	Merge branch 'wrongfiles' into 'next' ... Fix file downloader checking the old asset file names See merge request STJr/SRB2!2596	2025-01-18 18:05:54 +00:00
Lactozilla	52b88d63fe	Make v.getSprite2Patch able to fallback to non-super sprites	2025-01-18 14:57:09 -03:00
pastel	6f1a11567c	Fix file download checking the old asset file names	2025-01-18 09:34:20 -06:00
pastel	d263182981	Revert "Revert invcolor tweaks for Red/Rosy/Lavender" ... This reverts commit 50fc1abf9a. Conflicts: src/info.c	2025-01-18 09:18:40 -06:00
Radicalicious	a67a6ca3b8	Merge branch 'fix-ugly-knux' into 'next' ... Fix freeslots + add DeltaSanic to the credits See merge request STJr/SRB2!2592	2025-01-18 13:05:48 +00:00
Logan Aerl Arias	977ce7b34c	Merge branch SRB2:next into push-back-acktosend	2025-01-18 10:44:31 +00:00
Logan Aerl Arias	c9257f003d	Merge branch 'master' into fix-ugly-knux	2025-01-18 05:36:11 -05:00
Gustaf Alhäll	094dfe9fba	Fix crash when listing servers in the MS	2025-01-18 10:18:32 +01:00
Gustaf Alhäll	3578f17373	Fix short freeze when disconnecting from a server	2025-01-18 10:14:07 +01:00
Gustaf Alhäll	07738b61d2	Remove acktosend	2025-01-18 10:14:07 +01:00
Gustaf Alhäll	14020edacf	Clear acktosend when initializing node	2025-01-18 10:14:07 +01:00
Gustaf Alhäll	369c327e7c	Clean up d_net.c and push back missed acks to acktosend	2025-01-18 10:14:07 +01:00
Logan Aerl Arias	04c67be84a	Merge branch 'parenthesaurus' into 'master' ... Fix pipeline broken on clang See merge request STJr/SRB2!2593	2025-01-18 05:04:16 +00:00
pastel	1e58ccb8aa	Fix pipeline broken on clang	2025-01-18 05:04:16 +00:00
Radicalicious	d1013fdd66	Update m_menu.c	2025-01-17 21:08:35 -06:00
Radicalicious	b22c89ed22	Fix freeslots + add DeltaSanic to the credits	2025-01-17 20:32:00 -06:00
Radicalicious	7b6bf97664	2.2.14 - final asset updates	2025-01-16 19:09:33 -06:00
Radicalicious	60bd1527de	Update m_menu.c	2025-01-16 18:26:54 -06:00
Lactozilla	2dd5f664ac	Merge remote-tracking branch 'public/next' into 2214	2025-01-16 15:04:32 -03:00
Lactozilla	92022bd509	Reapply "Merge branch 'slopecontrast-fix' into 'next'" ... This reverts commit 1bb51b0ed3.	2025-01-16 15:03:36 -03:00
Lactozilla	b58ad6492b	Revert "Remove OpenGL-only fake contrast cvars" ... This reverts commit 64aefe7322.	2025-01-16 14:57:21 -03:00
Lactozilla	8fbbf802e6	Update copyrights to 2025	2025-01-16 14:13:30 -03:00