7250 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James R	dfdbc0afe3	Don't fade to character select from secret level select	2019-10-19 12:42:53 -07:00
James R	25d8b7d5ea	Don't fade to Server Options	2019-10-19 12:25:02 -07:00
Steel Titanium	3e0a9cf742	Revert my old attempt of making the level music fade out before game over jingle	2019-10-19 14:36:30 -04:00
toaster	c8629c2aab	Adjust hardcoded skin numbers for character-related events, to fit with the re-ordered skins.	2019-10-19 18:16:52 +01:00
toaster	bf761a26d6	* Implement fixes/tweaks as written on the gitlab. ... * `SPR2_NTAG` last vestiges removal. * Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`. * Fixed nametag colour issues. * Support widescreen with nametags. * Fix a metric SHITTON of compiler errors. * Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`) * GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`) * Redefining `lines` within the scope of the global. * Redefining `string` within the function-specific `string`. * It would be recommended for y'alls to turn ERRORMODE on!	2019-10-19 18:15:54 +01:00
Steel Titanium	28607a81b5	Kill off SPR2_NTAG	2019-10-16 18:25:20 -04:00
Steel Titanium	edea290b0f	Show "Press ESC to exit" string on NiGHTS Attack menu too	2019-10-16 18:00:54 -04:00
Steel Titanium	dc0a1899ec	Fix ifselectvalnextmapnobrace indentation	2019-10-16 17:49:21 -04:00
Steel Titanium	38d044e475	Seperate name tag sprite into SPR2_NTAG	2019-10-16 00:22:05 -04:00
Steel Titanium	58ef85d591	Make nametag SPR2 frame be the last frame of SPR_XTRA	2019-10-15 23:41:01 -04:00
Steel Titanium	9c33f160a6	Lots of changes ... * Show emblem requirement on record attack menu * Use bigger emblems on the menu. * Display your best number of collected rings in yellow if reached perfect bonus. * Adjusted XTRA frames (again)	2019-10-15 22:54:21 -04:00
Steel Titanium	313b534911	More record attack stuff. ... Show emblem requirements. Committed because I need sleep...	2019-10-15 01:55:50 -04:00
Jaime Passos	edd016690d	A bunch of stuff	2019-10-14 02:24:44 -03:00
Steel Titanium	9e9a40cadb	Merge branch 'master' into newmenus	2019-10-13 20:12:48 -04:00
Steel Titanium	cb228c4938	Undo this	2019-10-13 20:12:28 -04:00
MascaraSnake	63a7fb6956	Merge branch 'anotherctgfix' into 'master' ... Fix reverse gravity cacti (and all other A_ConnectToGround stuffs) See merge request STJr/SRB2Internal!378	2019-10-13 13:27:24 -04:00
toaster	46268214fc	Fix reverse gravity cacti (and all other A_ConnectToGround stuffs).	2019-10-13 17:48:40 +01:00
MascaraSnake	05a3023cb0	Merge branch 'nightsangle' into 'master' ... Fixed NiGHTS spawnpoint angle camera jump fuckups See merge request STJr/SRB2Internal!376	2019-10-13 12:47:32 -04:00
MascaraSnake	39a0644477	Merge branch 'hidegrade' into 'master' ... Hide NiGHTS grade in singleplayer if ranking is below GRADE_A Closes #250 See merge request STJr/SRB2Internal!377	2019-10-13 12:47:11 -04:00
toaster	dabd0b2e01	Hide NiGHTS grade in singleplayer if ranking is below GRADE_A, on Rob's request. ... (Resolves #250)	2019-10-13 16:30:29 +01:00
toaster	a5b5712be9	Fixed NiGHTS spawnpoint angle camera jump fuckups.	2019-10-13 16:15:46 +01:00
MascaraSnake	9bdb38df64	Merge branch 'lenient_acz3' into 'master' ... Make ACZ3 Boss damage while bouncing more lenient See merge request STJr/SRB2Internal!375	2019-10-13 11:08:26 -04:00
MascaraSnake	16a05d996e	Merge branch 'scrollwep' into 'master' ... Add scroll-wheel weapon changing to default controls Closes #248 See merge request STJr/SRB2Internal!374	2019-10-13 11:08:13 -04:00
MascaraSnake	01fbb91f7e	Merge branch 'bogus_requestskin' into 'master' ... Fix bogus "requested skin not found!" print Closes #247 See merge request STJr/SRB2Internal!373	2019-10-13 11:07:59 -04:00
MascaraSnake	008e232d78	Merge branch 'connect-to-ground-fix' into 'master' ... Fix for A_ConnectToGround on gravflipped objects See merge request STJr/SRB2Internal!372	2019-10-13 11:07:46 -04:00
MascaraSnake	aa06696359	Merge branch 'kartport_bugfixes' into 'master' ... Kart-port bugfixes (round 1) See merge request STJr/SRB2Internal!371	2019-10-13 11:07:24 -04:00
toaster	57f756ddf1	Fix condition which was MEANT to allow attacking Fangboss from the side while bouncing, but instead made it extremely difficult to pull off.	2019-10-13 15:30:51 +01:00
toaster	d9129db5ed	Add scroll-wheel weapon changing to default controls ... (resolves #248)	2019-10-13 15:19:31 +01:00
toaster	e62d097265	Fix "requested skin not found!" print happening whenever you select an unlockable character. ... Also, since I'm less paranoid now - readd the skin number to its print.	2019-10-13 15:10:19 +01:00
sphere	636760760f	Fix for A_ConnectToGround on gravflipped objects, courtesy of toaster.	2019-10-13 14:41:17 +02:00
toaster	0350262a0f	On the recommendation of Sryder, revert everything relating to the cpusleep changes except for the new default value of 1.	2019-10-13 13:12:07 +01:00
toaster	6033f70b01	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into kartport_bugfixes	2019-10-13 12:18:00 +01:00
toaster	4b965fe43b	Mixed declaration + out-of-bounds GCC error fixes for OpenMPT fixes (can't believe I didn't catch the former earlier)	2019-10-13 12:17:24 +01:00
toaster	9ca227237a	Better cpusleep command. Sal said it better than I can, so in her words: ... * Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog * New minimum is 0, since -1 just did the exact same thing as 0 except slightly more optimized.	2019-10-13 12:05:12 +01:00
toaster	5502242e8b	MD2 crash fix.	2019-10-13 11:59:38 +01:00
toaster	008f576560	Revert stupid 2.1-compat fuckup I did in slopes code.	2019-10-13 11:55:50 +01:00
toaster	a550eb79d3	Additional crash fix for papersprites.	2019-10-13 11:53:53 +01:00
MascaraSnake	a03ecac921	Merge branch 'openglskydome2' into 'master' ... OpenGL sky dome See merge request STJr/SRB2Internal!350	2019-10-12 11:06:47 -04:00
MascaraSnake	a7c0fe9672	Merge branch 'openmpt-crash-fix' into 'master' ... libopenmpt related changes See merge request STJr/SRB2Internal!351	2019-10-12 11:02:45 -04:00
MascaraSnake	71f93e7071	Merge branch 'sneakers-reduction' into 'master' ... Reduce speed sneaker factor to 1.67x See merge request STJr/SRB2Internal!368	2019-10-12 11:00:24 -04:00
MascaraSnake	6fab3d28b2	Merge branch 'OGL_regressions' into 'master' ... Correct minor OGL regressions See merge request STJr/SRB2Internal!361	2019-10-12 09:53:20 -04:00
MascaraSnake	8af715eb36	Merge branch 'left-right-ra-level-select' into 'master' ... Left and Right Arrow keys also select level in Record Attack See merge request STJr/SRB2Internal!363	2019-10-12 09:53:05 -04:00
MascaraSnake	d401862714	Merge branch 'amytweaks' into 'master' ... Amy tweaks See merge request STJr/SRB2Internal!366	2019-10-12 09:52:44 -04:00
toaster	a2a5983256	Prevent Time Attack level handler always beeping.	2019-10-12 09:42:03 -04:00
MascaraSnake	d735e1b9c2	Merge branch 'rvz-hardcode' into 'master' ... RVZ hardcode Closes #178 See merge request STJr/SRB2Internal!357	2019-10-12 09:37:23 -04:00
MascaraSnake	68a82c3849	Merge branch 'amycameo' into 'master' ... Amy for Frozen Hillside (full pitch in description) See merge request STJr/SRB2Internal!356	2019-10-12 07:16:26 -04:00
MascaraSnake	15bba9e1b0	Merge branch 'hoop_drawdist' into 'master' ... Only apply NiGHTS draw distance to hoops See merge request STJr/SRB2Internal!370	2019-10-12 03:10:53 -04:00
MascaraSnake	0f562d27d7	Merge branch 'fastgoop' into 'master' ... Increased THZ goop speed by 25% Closes #229 See merge request STJr/SRB2Internal!367	2019-10-12 03:10:26 -04:00
lachwright	3600e1b140	Allow rollout rock's splash sound delay reduction to occur above water	2019-10-12 04:41:50 +08:00
lachwright	a01373741b	Don't spam splash sounds on the rollout rock	2019-10-12 04:35:51 +08:00