6318 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
toaster	27f012740b	Fix old Special Stage failure sounds not always playing.	2019-08-02 20:02:55 +01:00
Monster Iestyn	cbd408278f	Merge branch 'bustables_misc' into 'master' ... Bustables and landing events Closes #157 and #162 See merge request STJr/SRB2Internal!262	2019-08-02 13:16:53 -04:00
Monster Iestyn	6456bda2d5	Merge branch 'anglestuff' into 'master' ... Spring angles and ring angles See merge request STJr/SRB2Internal!266	2019-08-02 13:10:23 -04:00
Monster Iestyn	7af04015a2	Merge branch 'emeraldfixes' into 'master' ... Special stage related fixes See merge request STJr/SRB2Internal!269	2019-08-02 13:08:20 -04:00
Monster Iestyn	937deec106	Merge branch 'maniaspheresfix' into 'master' ... MANIASPHERES de-hardcode See merge request STJr/SRB2Internal!268	2019-08-02 13:06:52 -04:00
Monster Iestyn	a0846b2a95	Merge branch 'spring-things' into 'master' ... Additional spring flags See merge request STJr/SRB2Internal!256	2019-08-02 13:06:38 -04:00
Monster Iestyn	5b2a47b869	Merge branch 'followmobj_scale' into 'master' ... Smiles tail scale See merge request STJr/SRB2Internal!273	2019-08-02 13:05:50 -04:00
Monster Iestyn	a44faf42da	Merge branch 'diagonalrings' into 'master' ... Diagonal spring ring fixes See merge request STJr/SRB2Internal!267	2019-08-02 13:03:11 -04:00
sphere	5a1b539cd9	Merge remote-tracking branch 'origin/master' into spring-things	2019-08-02 15:11:13 +02:00
toaster	d0d43650f2	fixed sphere's CA2_MELEE stasis issue	2019-08-02 13:18:57 +01:00
toaster	1afad6f093	Was reviewing old merge requests as a procrastination technique, and discovered that the followmobj's scale was being inaccurately handled for Smiles' tails! Fixed that...	2019-08-01 08:01:29 -04:00
toaster	e97acc9775	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into bustables_misc ... # Conflicts: # src/p_user.c	2019-07-30 18:14:52 +01:00
toaster	ac91f122ce	* Fix something I neglected earlier when fixing Ghosts and Replays for 2.2 - the fact that the player's skin will change if they don't have NiGHTS sprites like Sonic does not being accomodated.	2019-07-30 17:24:21 +01:00
toaster	28e7269cc6	* Fix "exitlevel" being counted as a special stage success despite not giving you an emerald by inverting stagefailed's default value, since there's only a limited number of ways you can WIN at a special stage. ... * Correct a potential source of desync in P_GiveEmerald.	2019-07-30 16:44:40 +01:00
Alam Ed Arias	5286938853	Fix building with MSVC	2019-07-29 19:02:45 -04:00
Alam Ed Arias	644aba78d5	Merge branch 'public_next' into private	2019-07-29 18:31:01 -04:00
Alam Ed Arias	82c4cdfaca	Merge branch 'master' into next	2019-07-29 18:05:33 -04:00
Alam Ed Arias	62e45e5f5b	SDL2: fixed compiling mixer interface with MSVC	2019-07-29 17:56:35 -04:00
toaster	be14e062e8	Make MANIASPHERES' #define'd away stuff also recreatable with SOC, since I want to release it publically if the team don't want it.	2019-07-29 21:06:17 +01:00
toaster	ac133e4d2f	* Fix diagonal spring ring assortments being forced up/down with slopes.	2019-07-29 21:03:28 +01:00
toaster	cbf73014a5	Two one liners related to angles, so doin' em in a single branch. ... * If a spring has vertical speed AND horizontal speed, always set the player's angle when touching it. * If you have less than 32 rings and spill them, they now get launched away from the player's motion, rather than in the direction of the camera.	2019-07-29 20:29:02 +01:00
toaster	0692a5a5c4	Further improvements on MI's request, just to be safe.	2019-07-28 22:53:27 +01:00
toaster	b8d3e27bba	Made it possible to just call EV_CrumbleChain(rover) in Lua	2019-07-28 22:45:20 +01:00
Monster Iestyn	1f30c27c79	Merge branch 'wavingflag' into 'master' ... New CEZ scenery See merge request STJr/SRB2Internal!257	2019-07-28 15:44:00 -04:00
Monster Iestyn	14b3d97e16	Merge branch 'recordattack-bg-fixes' into 'master' ... Record Attack bg fixes See merge request STJr/SRB2Internal!259	2019-07-20 11:33:06 -04:00
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
toaster	6603b605e7	Fix !150, too	2019-07-18 00:16:01 +01:00
toaster	71e5835e66	Successfully cause landing events when the ground moves up to hit you, as opposed to just when you move down to the ground.	2019-07-17 23:25:49 +01:00
toaster	8024e686c4	Fix Knuckles-in-quicksand messup.	2019-07-17 23:24:44 +01:00
toasterbabe	32ee846c4a	* Make busting a FOF through any in-game means (or not providing a target sector to EV_CrumbleChain) bust all FOFs with the same control sector. ... * Make CA2_GUNSLINGER not get overridden by being in quicksand.	2019-07-17 21:34:04 +01:00
toaster	c9b560b083	Fix spindash being broken in quicksand ... # Conflicts: # src/p_mobj.c # src/p_user.c	2019-07-17 21:33:18 +01:00
Monster Iestyn	f266eda97b	Merge branch 'public_next'	2019-07-16 18:28:49 +01:00
Monster Iestyn	f563f95c32	Merge branch 'master' into next	2019-07-16 18:26:46 +01:00
Monster Iestyn	784fc70e7e	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	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
Steel Titanium	db525c43a7	Fix crash with GME sounds when being freed	2019-07-14 14:55:04 -04: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
sphere	76d6a96c69	Add a blue variant of the pole banner & change some doomednums.	2019-07-14 17:30:33 +02: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
sphere	aabf7ed113	Add a blue variant of the waving flags.	2019-07-14 16:50:45 +02:00
sphere	3f2f037456	Don't upscale the waving flags, make them twice as large instead	2019-07-14 15:30:00 +02:00