Commit graph

257 commits

Author SHA1 Message Date
Sryder
b8477b4067 Squash various warnings
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
TehRealSalt
1201acce4b Slightly less duplication 2018-11-14 14:39:37 -05:00
TehRealSalt
887f4150c1 Hide unlockables with ???s 2018-11-14 14:15:24 -05:00
toaster
d9b1d33d89 Bugfixes:
* Use CV_NOSHOWHELP as an obstacle for CV_CompleteVar (so the hidden variables don't show up and ruin our party or anything).
* Hack around the karteliminatelast thing so we don't have to hex-edit the netids, and can release with current assets (but a different executable, of course, to get the credits).
* Fix M_HandleConnectIP not saving your current position on the menu if you use it while it's empty.
2018-11-14 15:28:17 +00:00
toaster
6fb45fa2a9 replacement quit sounds per sal 2018-11-14 01:30:26 +00:00
toaster
5d2e638e8a final menu tweaks before i fall asleep in my chair 2018-11-14 01:27:01 +00:00
TehRealSalt
13b51823ba Some tweaking
- Swap order of Silver & Gold, for menu appearances & bug fixing
- Ensure that totalplaytime and matchesplayed aren't kept when M_ClearSecrets getss called in M_EraseDataResponse
- Set sensible defaults for emblem sprite/color
2018-11-12 17:09:37 -05:00
Sryder
a0165f1ac1 Merge branch 'com_cleanup_redo' into 'master'
Improved "HELP" command

See merge request KartKrew/Kart!82
2018-11-10 12:51:51 -05:00
TehRealSalt
571ef7173e Ranking face highlights 2018-11-10 00:01:44 -05:00
TehRealSalt
69287984db Merge branch 'master' into staff_names 2018-11-08 14:47:38 -05:00
toaster
c8c7b63be6 Fix disabling music on the menu. 2018-11-07 22:18:46 +00:00
toaster
8e6ecb5e98 * Add numbers to the staff name strings as Sryder requested.
* Make the maximum number of staff ghosts 99 instead of 100. It's a minor thing, and insignificant in the grand scheme of things, but it fixes a bugbear I haven't been able to get out of my head since originally starting to maintain this code. (In the case of 100, it'd do S00, which'd have some fucky effects on ordering. If we WANTED to start with S00, we shoulda used that slot in the first place.)
2018-11-07 21:42:10 +00:00
TehRealSalt
499faec555 Merge remote-tracking branch 'srb2public/next'
(Huge change: NO_MIDI is now a define, simply because that makes it easier for me to resolve merge conflicts if I can see the original code and the new code. Also means that people who REALLY miss MIDI can compile & fix it themselves :P)
2018-11-07 16:15:14 -05:00
toaster
cf16959ad5 Clean but quick: Rename all user-facing things that say "emblem" to say "medal" instead. Don't touch SOC, don't touch code, otherwise we'll be here all year. 2018-11-07 18:05:29 +00:00
toaster
390d2b4114 Fix replaying guest demos 2018-11-06 13:38:53 +00:00
toaster
bb251c4fbf * Re-add support for command "help" (ie, basically no help at all).
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
2018-11-05 19:02:34 +00:00
toaster
a0c3283303 Merge branch 'master' into staff_names 2018-11-05 13:46:10 +00:00
toaster
9eafb61fd3 Black out the background around the GAMEQUIT picture, since we removed the automatic doing of that for non-green resolutions. 2018-11-05 12:52:15 +00:00
toaster
b8446effe8 Correctly disable OGL-only menus/options in software. 2018-11-04 14:41:24 +00:00
toaster
e2f57e5ca0 Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things.
https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
2018-11-04 12:15:13 +00:00
toaster
6604d0181c Staff attack ghost names on the REPLAY... menu.
Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00:00
TehRealSalt
0d79cbdd27 Keep the old y offsets, though. 2018-11-03 03:38:41 -04:00
TehRealSalt
cb1380ae51 Changed this randomly changed instance back to vanilla, due to compile errors
https://i.imgur.com/SEdmZpC.png
2018-11-03 03:29:06 -04:00
toaster
659e6fa617 That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case.
* Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'!
* Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites.
* Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
2018-11-01 00:10:34 +00:00
toaster
f36d58dd09 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup 2018-10-30 22:08:17 +00:00
toaster
a9b4a56d23 Stupidbad-big commit, but PLEASE don't ask me to re-do this on another branch, I swear to god. I know it makes things more difficult on you, and I'm sorry for that, but I'm definitely feeling the goddamn crunch right now and I wanna take a step back from this spaghetti nightmare and clear my head.
* Do that thing where the character icons are ALWAYS 1x sized, through having two seperate lumps.
* Revamp the S_SKIN parameters to be `facerank` (rankings - equivalent of half-scale old face), `facewant` (WANTED - equivalent of old face), and `facemmap` (equivalent of old iconprefix).
* Do that thing Oni wanted where it shows two postions above and two positions below your current ranking (and you) to the left of the screen, instead of always the top 4, with some limits to avoid drawing outside of everything.
* Replace the last few shitty Mario numbers (for the left rankings) with cool, new Oni numbers.
* Change a bunch of offsets and things so the tab rankings and the intermission work nicer with 9+ players.
2018-10-28 16:27:55 +00:00
toaster
8b382d2e40 As requested by Jeck:
* gr_md2 on the menu.
* Disable interpolerated model option completely for now.

Also, tweaked the GL menus a bit to suck less, since I was ferreting around in that area.
2018-10-27 21:16:19 +01:00
toaster
68da56671e Make it so hitting enter on the ipv4 option doesn't close all menus with the warning, only if you start trying to connect. 2018-10-27 20:44:18 +01:00
Latapostrophe
20cfd80767 Fixed the menu highlight thing 2018-10-25 19:41:14 +02:00
Latapostrophe
e5d4020f3e Spectate / enter game in chat + New console colours + Highlight chat scroll arrow + small cleanup for consolefill 2018-10-25 13:21:44 +02:00
Sal
3e556cde44 Merge branch 'last-netgame-tweaks' into 'master'
Last netgame tweaks

See merge request KartKrew/Kart!57
2018-10-24 19:33:47 -04:00
TehRealSalt
3dc02a4eb4 Minor mistakes on my part 2018-10-22 17:24:58 -04:00
TehRealSalt
685ccf53cc Remove restart audio system from the menu
Learned the cause of the seemingly random crashes it causes; doesn't seem easy to fix, so it can stay a relatively-unknown console command until it does
2018-10-22 17:03:02 -04:00
TehRealSalt
40b9644e0c Use COM_ImmedExecute("restartaudio") instead of duplicated code 2018-10-22 16:32:06 -04:00
toaster
cbb1a0dd28 Fix gametype being clobbered when starting up a one-player server by marking it as netgame.
(There were other ways to fix this, but I figured we'd want to keep the netgame pause menu, so this was the simplest solution...)
2018-10-21 12:51:18 +01:00
TehRealSalt
553066b48b Merge branch 'master' into net-screen 2018-10-19 15:59:13 -04:00
Sal
adb2fad43c Merge branch 'sp_fixes' into 'master'
Singleplayer fixes (no, not record attack, the *other* one)

See merge request KartKrew/Kart!46
2018-10-19 15:50:06 -04:00
Sal
d6cf424aed Merge branch 'unlock-hard' into 'master'
Hard Mode is an unlockable

See merge request KartKrew/Kart!40
2018-10-19 15:49:32 -04:00
toaster
ce443712b2 Some token efforts to make singleplayer mode (accessible only via -warp and map mapxx -force) not COMPLETELY broken.
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 13:40:17 +01:00
toaster
41b684e63e Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen 2018-10-16 22:13:45 +01:00
toaster
b34cbe4032 [22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it
The Menu Queen is in the house~ 

* Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional.
* Death to NOFOURPLAYER, now that the cat's out the bag.
* Clean up NONET, assuming people try to make DD builds on release.
* Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 22:11:47 +01:00
TehRealSalt
8024ad74b5 Quick fix for banana cheat not showing all unlockables
Plus, this is generally better, as a mod could let you unlock stuff "out-of-order"
2018-10-15 22:02:10 -04:00
TehRealSalt
bca6e9165b Merge branch 'master' into net-screen 2018-10-15 21:57:11 -04:00
TehRealSalt
ec048b73c4 Show Spectator controls for P2-P3 again 2018-10-15 20:31:26 -04:00
TehRealSalt
ba16f2bfcf Spectate/Enter menu for online splitscreen
Just like the menu option
2018-10-15 20:28:35 -04:00
toaster
880e4c0631 Final weather stuff.
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
2018-10-14 22:32:34 +01:00
toaster
6a0b1526b9 Merge branch 'hellattack' into 'master'
Hell Attack

See merge request KartKrew/Kart!35
2018-10-10 13:33:57 -04:00
TehRealSalt
7900af2a0a Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
aa12bbf039 Fix tabbing 2018-10-09 15:28:52 -04:00
TehRealSalt
640e0e09c6 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00