Commit graph

4016 commits

Author SHA1 Message Date
TehRealSalt
0feb1d557d Foolish typo 2018-11-08 16:04:26 -05:00
TehRealSalt
11595a501a Fix connecting w/ -splitscreen set 2018-11-08 15:24:10 -05:00
Sal
fd5a8d663b Merge branch 'lua-improvement' into 'master'
General Lua improvements

See merge request KartKrew/Kart!86
2018-11-08 15:12:06 -05:00
TehRealSalt
df3c6051e8 Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe 2018-11-08 15:11:22 -05:00
TehRealSalt
03bf72bf9e This fake Lua function is probably no longer needed, now. 2018-11-08 15:02:19 -05:00
TehRealSalt
f5a45534fa Make the texture stuff completely integer-based again, but expose R_TextureNumForName
Decided that being able to set a string and then have it return an integer when retrieving would ultimately be confusing, so let's just let the user handle the string functions.
2018-11-08 14:58:31 -05:00
TehRealSalt
ed1c108992 Merge branch 'master' into lua-improvement 2018-11-08 14:50:30 -05:00
TehRealSalt
94066638bc Merge branch 'master' into lua-improvement 2018-11-08 14:49:56 -05:00
Sal
1079c55f72 Merge branch 'staff_names' into 'master'
Staff Attack improvements

See merge request KartKrew/Kart!79
2018-11-08 14:47:23 -05:00
TehRealSalt
69287984db Merge branch 'master' into staff_names 2018-11-08 14:47:38 -05:00
Sal
c32d0df6c2 Merge branch 'lua-hudlib' into 'master'
Small Lua hud library improvements

See merge request KartKrew/Kart!73
2018-11-08 14:43:58 -05:00
TehRealSalt
393fee317e Fix for the Y_FollowIntermission change hurting Record Attack
Should probably be ported to vanilla
2018-11-08 14:43:06 -05:00
TehRealSalt
aa3ad733af Textures' string bits are now optional.
I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.
2018-11-07 22:01:57 -05:00
TehRealSalt
bc7e865e6b Serious deep-cleaning to most of the kartstuff
More optional fields, more careful eye placed on return values and other checks
2018-11-07 21:04:57 -05:00
TehRealSalt
2b9b1e3bff These are integers, whoops 2018-11-07 18:37:06 -05:00
TehRealSalt
95a1637437 Add Kart globals 2018-11-07 18:31:07 -05:00
TehRealSalt
b9161871a1 typo 2018-11-07 18:24:44 -05:00
TehRealSalt
7ad0347ab0 Add missing K_ functions 2018-11-07 18:23:28 -05:00
TehRealSalt
868118d0cd IsPlayerAdmin support, since admin was removed 2018-11-07 18:07:34 -05:00
TehRealSalt
68c46cdca3 toptexture, bottomtexture, and midtexture use strings instead of magic numbers 2018-11-07 17:53:49 -05:00
toaster
c8c7b63be6 Fix disabling music on the menu. 2018-11-07 22:18:46 +00:00
toaster
e1d46e0122 Merge branch 'master' into 'lua-hudlib'
# Conflicts:
#   src/lua_hudlib.c
2018-11-07 16:57:11 -05: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
TehRealSalt
e63099f3de Log this 2018-11-07 14:56:36 -05:00
Sal
a09d7489d8 Merge branch 'info_tidy' into 'master'
Murder the fancharacters and associated

See merge request KartKrew/Kart!83
2018-11-07 14:50:10 -05:00
Sal
ef0ab3da24 Merge branch 'fix_startbumps' into 'master'
Fix startbumps.

See merge request KartKrew/Kart!84
2018-11-07 14:50:00 -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
935c0da7d2 Fix startbumps.
A more detailed explanation:
* P_CheckPosition is the function which determines collisions.
* In Vanilla, collisions do not happen between players unless tailspickup is off (which it basically never is).
* Even with tailspickup off, on-spawn player collisions do not affect momentum.
* However, in kart, player collisions cause the player to get bumped.
* It would succeed at the P_CheckPosition call because players aren't *solid* solid, even though they cause bumps.
* It would fail at the K_CheckPlayersRespawnColliding call, but that would be too late, *as the player already has been bumped.*
* The player would therefore be moved to a new location, but still retain bump momentum, and the bump sound would have played for both players.
* Therefore, the obvious solution is to swap P_CheckPosition and K_CheckPlayersRespawnColliding, so that it checks for players BEFORE it performs object collisions at that spot.
* The reason we didn't see this MUCH before is that it can only ever happen in the case of ties.

I could've easily done this into master, but obviously I figure yalls'd at least like to check this first.
2018-11-06 13:33:27 +00:00
toaster
5ccfc111e8 Disable attempt at preventing replays with the same staff member back to back, based on Discord discussion. If the RNG does this to you, you're on your own. 2018-11-05 23:18:34 +00:00
toaster
e958dfc909 MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
toaster
77d6e578f5 Blank out the fancharacters as requested, but don't remove them from the info lists... a fun thing for TCRF to look at eventually, maybe, and I don't want to have to do a from-scratch build at this stage in the game or risk any instability that could arise from sweeping info cleanups.
In fact, the only reason I even considered doing this is that the sprites had to be removed, leaving these actively causing errors when placed.
2018-11-05 19:58:20 +00:00
toaster
f2e9186c7b You were right, Sal, "%s ran out of time." should've died back when you were working on the branch to remove all the prints. 2018-11-05 14:33:39 +00:00
toaster
7be7c600bf Cleaner code logic. Should make no real difference to exe, so not gonna upload another. 2018-11-05 14:28:32 +00:00
toaster
0d0eaf5f99 Fix "laststaff" setting 2018-11-05 14:03:09 +00:00
toaster
a0c3283303 Merge branch 'master' into staff_names 2018-11-05 13:46:10 +00:00
toaster
75d08f2048 TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!!
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
2018-11-05 13:45:40 +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
263b29a4a6 Merge branch 'fix-mixed-declarations' into 'master'
Literally a single compiler warning.

See merge request KartKrew/Kart!80
2018-11-04 16:49:45 -05:00
toaster
3a53d6d3b9 Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot). 2018-11-04 21:48:47 +00:00
Sryder
6c0fae421c Literally a single compiler warning. 2018-11-04 17:37:18 +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
TehRealSalt
34baa5ae74 Mixed up validity check... 2018-11-03 22:53:12 -04: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
Sal
a4129d22f9 Merge branch 'battle-arrow-fix' into 'master'
Battle arrow fixes and cleanup

See merge request KartKrew/Kart!78
2018-11-03 17:50:29 -04:00
TehRealSalt
d3944fe29b Battle arrow fixes and cleanup 2018-11-03 17:45:38 -04:00
Latapostrophe
4cbc270b6d Merge branch 'master' into lua-hudlib 2018-11-03 22:25:33 +01:00
Latapostrophe
e7f35307c9 Remove indents on #ifdefs and take K_drawInput in the hud_position check 2018-11-03 22:24:45 +01:00