576 commits

Author	SHA1	Message	Date
James R	5cdbde25c1	All for a cvar...	2019-09-23 20:23:40 -07:00
Steel Titanium	6a870b4467	Various of changes ... Changed any instance of "joystick" in strings to "gamepad" Renamed some cvars Added a define for MAX_JOYSTICK Added back the missing command line params.	2019-09-23 22:46:44 -04:00
Steel Titanium	dfee7efd33	Merge branch 'master' into internal-hotplug-stableid	2019-09-23 00:44:34 -04:00
Alam Ed Arias	8d3d5566b8	Undo file mode change on menu files	2019-09-20 12:18:57 -04:00
toaster	7da89e3bc9	Merge branch 'camerafix' into 'master' ... Camera fixes Closes #105 See merge request STJr/SRB2Internal!303	2019-09-20 11:51:30 -04:00
toaster	880c2cdada	Merge branch 'playerfixes' into 'master' ... Some Player fixes and enhancements Closes #216, #219, #222, and #224 See merge request STJr/SRB2Internal!334	2019-09-20 11:39:32 -04:00
toaster	20d098de8f	Merge branch 'betterdirs' into 'master' ... Better directory structure See merge request STJr/SRB2Internal!321	2019-09-20 11:36:56 -04:00
lachwright	5015f8e142	Added Camera Options submenu (provided my files aren't broken again (please D:))	2019-09-19 17:34:04 +08:00
toaster	45a99ce318	Change startchar's default value to 0 (Resolves #222).	2019-09-18 12:26:34 +01:00
Nev3r	777e7f8760	Merge branch 'deathstuff' into 'master' ... Lots of death stuff Closes #207 See merge request STJr/SRB2Internal!306	2019-09-16 16:32:45 -04:00
toaster	71cc09c8c2	Merge branch 'luabanks' into 'master' ... Lua save-banks! See merge request STJr/SRB2Internal!295	2019-09-16 07:56:49 -04:00
Jaime Passos	9b0e2b8991	Make nametags compatible with current player.dta ... (again)	2019-09-11 22:18:03 -03:00
Jaime Passos	f2915817a7	Merge remote-tracking branch 'origin/master' into newmenus	2019-09-11 22:17:42 -03:00
toaster	440b63ef13	Merge branch 'musicplus-resetmusic-followup' into 'master' ... Follow-up fixes for reset-upon-dying music See merge request STJr/SRB2Internal!284	2019-09-11 14:14:09 -04:00
toaster	fe7e374e3b	Fix the Save Select platter drawing for the new player signpost art. ... This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!	2019-09-11 13:32:12 +01:00
toaster	2b0344a22f	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff	2019-09-09 15:25:48 +01:00
Monster Iestyn	c696063260	Merge branch 'mprelated-tweaks' into 'master' ... Various improvements and changes to multiplayer menu See merge request STJr/SRB2Internal!300	2019-09-08 16:45:14 -04:00
Steel Titanium	995ab1c84d	Merge branch 'master' into internal-hotplug-stableid ... Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.	2019-09-08 01:55:36 -04:00
Steel Titanium	8ee0a9309b	Better directory structure	2019-09-08 01:29:09 -04:00
Steel Titanium	807614d02d	Add _ to the record and nights attack tracks for organization	2019-09-07 22:57:20 -04:00
mazmazz	b7c9f15225	Fix NiGHTS attack menu not drawing correct background	2019-09-07 22:00:38 -04:00
Jaime Passos	f3cf3ca453	Cleanup.	2019-09-06 16:05:46 -03:00
Jaime Passos	56abc63c29	Ignore key held events.	2019-09-06 15:25:11 -03:00
toaster	5bc034bc3e	[slightly off-topic commit] don't allow MP Special Stages to be selectable via the MP level platter	2019-09-04 15:52:25 +01:00
mazmazz	57974168c8	WIP 2.2 title screen (Alacroix)	2019-09-02 22:40:28 -04:00
James	577a8fd387	Merge branch 'camorbit-sev' into camerafix	2019-08-31 14:53:43 -04:00
Steel Titanium	8167a88bec	Rename private mode to unlisted mode	2019-08-30 00:38:58 -04:00
Steel Titanium	5c295d285b	Capitalize the 'if'	2019-08-30 00:36:10 -04:00
Steel Titanium	7e47117afa	Add warning message when attempting to use the master server browser while modifiedgame is true.	2019-08-28 20:24:30 -04:00
Steel Titanium	b4d8126675	Rename offline mode to private mode	2019-08-27 18:05:30 -04:00
Steel Titanium	a98862b3ed	Allow letters to be used on ipv4 address field	2019-08-26 22:00:07 -04:00
Steel Titanium	b2712af2d0	Reorder the main multiplayer menu	2019-08-26 21:49:12 -04:00
Jaime Passos	015216b9ac	Don't draw borders or patches if not necessary.	2019-08-26 20:49:04 -03:00
toaster	4e256b73b2	Lua save-banks! ... * Array of 8 INT32's natively embedded into savedata (net and SP)! * Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game. * Requires reservation to avoid clobber-conflicts. * Access via `reserveLuabanks()` - returns a read-write userdata. * Assign userdata to local variable or global rawset to use later. Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.	2019-08-24 18:25:27 +01:00
Jaime Passos	f90a6540d6	NiGHTS Attack menu: Let patch offsets control the alignment of the top border.	2019-08-20 21:45:55 -03:00
James R	c6c0a9dd1a	Old string drawing functions are dumb	2019-08-20 16:33:39 -07:00
Jaime Passos	1a1f4136e8	Fix character select menu to use the new Color_Opposite array.	2019-08-20 19:08:45 -03:00
Jaime Passos	403eafb003	Merge remote-tracking branch 'origin/master' into newmenus	2019-08-20 19:07:34 -03:00
Steel Titanium	5ef4b938be	Draw record attack foreground even if a message is currently on-screen.	2019-08-20 00:15:35 -04:00
Jaime Passos	12a6479521	Unlock all cached patches, fix accidental merge conflict.	2019-08-20 00:41:06 -03:00
Jaime Passos	d59febb5aa	Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus	2019-08-20 00:21:28 -03:00
Jaime Passos	e4e3af7be0	Remove new character select screen transitions. ... I should not have implemented it in the first place.	2019-08-20 00:18:34 -03:00
Jaime Passos	61866f326a	New Record Attack menu.	2019-08-20 00:12:22 -03:00
Steel Titanium	15b363773f	Fix record attack foreground not appearing. ... I'm not sure why it suddenly broke when the same condition worked before.	2019-08-19 22:10:52 -04:00
Jaime Passos	e2dde4412d	Fix character description text rendering.	2019-08-19 18:49:23 -03:00
Jaime Passos	5290f4c80b	Cool defines	2019-08-19 16:19:25 -03:00
Jaime Passos	15957bf13f	hghdfhdjhdhkdlfh	2019-08-19 15:34:12 -03:00
Jaime Passos	94e21c7b03	slight cleanup	2019-08-19 15:27:20 -03:00
Jaime Passos	29dc1119e5	uh	2019-08-19 14:43:48 -03:00
Jaime Passos	85499040d3	did The Thing	2019-08-19 14:23:03 -03:00
Jaime Passos	381258883e	More character select work	2019-08-18 22:26:52 -03:00
Jaime Passos	f13a014c4c	Tweak Record Attack screen just a little bit	2019-08-18 20:35:16 -03:00
Jaime Passos	6a66057a60	how do i code	2019-08-18 19:46:55 -03:00
Jaime Passos	feac7b56ec	Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus	2019-08-18 19:35:14 -03:00
Jaime Passos	778461028e	Character select WIP	2019-08-18 19:34:54 -03:00
Steel Titanium	59cdfa8e27	New music for record attack and nights attack menus	2019-08-18 17:32:52 -04:00
Steel Titanium	a40d5a2a45	Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal into newmenus	2019-08-18 13:46:50 -04:00
Jaime Passos	5e11c5fbe7	Merge remote-tracking branch 'origin/master' into newmenus	2019-08-18 14:46:34 -03:00
Steel Titanium	ff9766beee	Merge branch 'master' into newmenus	2019-08-14 22:51:06 -04:00
Monster Iestyn	7ba4bbf867	Turn Color_Opposite into a 2D array to simplify usage somewhat. Also fix ColorOpposite for Lua	2019-08-12 14:00:26 +01:00
Alam Ed Arias	fd77fe819b	curbgname need one more byte to hold the NULL	2019-08-08 23:46:08 -04:00
Alam Ed Arias	b5279c34fa	Fix compiling without MixerX support	2019-08-07 12:42:07 -04:00
mazmazz	46993268ae	* Added FORCERESETMUSIC level header ... * cv_resetmusicbyheader toggle to disable said override * Never reset music during time attack * Change cv_resetmusic default back to off	2019-08-04 20:02:38 -04:00
Steel Titanium	dacee0665d	More menu stuff	2019-08-04 13:26:25 -04:00
toaster	384dc0674e	Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" ... This reverts commit 603d5805f7.	2019-08-04 12:03:57 +01:00
toaster	603d5805f7	Revert "Merge branch 'musicplus-aug2019-b' into 'master'" ... This reverts commit 56bfdb7113, reversing changes made to c29cfbef9b.	2019-08-04 11:32:55 +01:00
mazmazz	ce39341c31	Merge branch 'musicplus-sdlmixerx' into musicplus-aug2019	2019-08-04 02:52:33 -04:00
mazmazz	fd4d3a6a69	Mixer X menu touchup	2019-08-04 02:30:34 -04:00
mazmazz	b99f06c0c9	Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx	2019-08-04 01:10:21 -04:00
mazmazz	5f2a45befd	Merge remote-tracking branch 'origin/master' into musicplus-feature-dying-fp	2019-08-03 22:49:20 -04:00
mazmazz	1b59b224c0	Merge branch 'master' into musicplus-feature-dying-fp	2019-08-03 22:22:39 -04:00
Steel Titanium	00b73e2209	Stuff	2019-08-03 21:21:01 -04:00
Steel Titanium	9ea7a6dfca	Work on menus	2019-08-03 17:30:51 -04:00
Steel Titanium	e8caa8538d	Merge branch 'master' into newmenus	2019-08-01 18:36:42 -04:00
toaster	063e350c63	A good and bad ending cutscene now exist. ... Also: * SPR2_XTRA - instead of defining lumpnames in S_SKIN, those kinds of assets can just be bundled into the spriteset. Required for ending cutscene stuff, I guess, but also done for HUD life icon and character select image (aside from Sonic&Tails, still SOC'd in). * Minor oversights in SPR2 support corrected. * Better evaluation, featuring ending assets. * Intro has warping-in blackrock, reusing ending assets. * Cutscene text now supports lowercase (intro and custom). * Disable the asset-fucking "gamma correction" I put in over two years ago when implementing colour cube. (This is the only thing I could move into another branch if you MUST, but it's basically invisble in the diff so w/e.) * Don't blank the screen if the top left pixel of a screen-covering patch is transparent. (Checked via nonzero topdelta for first column) Bugs: * OPENGL ONLY: The first ~20 frames of both endings are fucked. A little help here? Might be HWR_DrawFadeFill's fault, which I just created. OR it could be in f_finale, but I doubt it, since it doesn't appear in Software.	2019-07-28 00:32:57 +01:00
Steel Titanium	2075b525a9	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into musicplus-sdlmixerx	2019-07-22 22:22:12 -04:00
Steel Titanium	c35afa2c96	Merge branch 'master' into musicplus-sdlmixerx	2019-07-22 22:20:08 -04:00
Steel Titanium	af959ee309	Some fixup	2019-07-22 22:01:05 -04:00
Steel Titanium	147815b87c	menu stuff	2019-07-16 00:07:55 -04: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	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
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
mazmazz	5b0f7d2850	Merge branch 'master' into musicplus-sdlmixerx	2019-06-29 19:31:01 -04:00
Monster Iestyn	e2859aab5d	Merge branch 'titlemap-fix' into 'master' ... Fix Titlemap with mazmazz's fancy menu stuff See merge request STJr/SRB2Internal!228	2019-06-28 18:15:46 -04:00
Monster Iestyn	e63e36f5e4	Merge branch 'levelselect-tweaks' into 'master' ... Some small tweaks to level select See merge request STJr/SRB2Internal!230	2019-06-25 16:50:44 -04:00
toaster	6cf376a9b5	Support backspace for resetting various menu values, just like Kart.	2019-06-22 16:50:46 +01:00
toaster	6371de806b	Improve rain/weather. ... * Like Kart, remove cv_precipdensity. * Like Kart, replace "Infinite" draw distance value with "None". * Better thinker with more return optimisation. * Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.	2019-06-22 16:50:30 +01:00
Nev3r	0e162f8f61	Add Sryder's orbital camera thing as an option.	2019-06-20 13:33:31 +02:00
Steel Titanium	58bb05be00	Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt ... # Conflicts: # .travis.yml # src/m_menu.c # src/sdl/Srb2SDL-vc10.vcxproj # src/sdl/Srb2SDL.props	2019-06-11 17:48:00 -04:00
toaster	6c6ed6a349	Fix Titlemap with mazmazz's fancy menu stuff ... Handled by changing some defaults. Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please	2019-06-10 15:43:47 -04:00
Steel Titanium	742c43cf1c	Some small tweaks	2019-06-03 17:34:51 -04:00
Steel Titanium	81dec89aeb	Merge branch 'next' into public-musicplus-libopenmpt	2019-06-03 15:36:50 -04:00
Steel Titanium	91767a7740	Merge branch 'master' into public-musicplus-libopenmpt	2019-05-20 21:33:10 -04:00
mazmazz	89ab777c40	Merge remote-tracking branch 'origin/master' into menu-execs	2019-05-02 18:47:43 -04:00
Monster Iestyn	27147a9e0b	fix slipup of mine that would have prevented this thing compiling	2019-03-31 14:11:27 +01:00
Monster Iestyn	2fb569857a	Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa ... gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names # Conflicts: # src/doomstat.h # src/m_menu.c	2019-03-18 22:00:23 +00:00
mazmazz	7346684bd8	Fade out music upon dying or level change: 2.1 frontport	2019-03-15 04:21:17 -04:00
Monster Iestyn	8920693159	Saving work made so far improving and optimizing addons menu code, also adding some macros and comments for readability	2019-02-28 21:52:01 +00:00