Commit graph

4064 commits

Author SHA1 Message Date
TehRealSalt
0d95cd9fb2 Buff the fuck out of item drop speed
no, dude, don't turn right back around and pick your shit right back up, stop
2018-11-09 15:37:33 -05:00
TehRealSalt
22fc21228d Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-09 15:34:59 -05:00
toaster
4172503675 Prevent using kartdebug cvars in Time Attack.
(None of this should invalidate any of YOUR existing ghosts, because none of them use these obvious cheats like, say, setting kartdebugitem 2.)
2018-11-09 20:16:12 +00:00
TehRealSalt
f780e1535e A few mobj_scale fixes I missed on signposts 2018-11-08 20:39:18 -05:00
TehRealSalt
fea8fe9ee7 Lap emblem gets replaced with a stopwatch in Record Attack 2018-11-08 19:36:05 -05:00
TehRealSalt
69740101ed Log "Speeding off to level..."
It's not disruptive, but it looks a bit goofy since the "Map is now x" print is no longer directly printed either, so it's the only thing sticking around in the console :V
2018-11-08 17:56:26 -05:00
TehRealSalt
5b6efcba0c Merge remote-tracking branch 'srb2public/next' 2018-11-08 17:37:05 -05:00
Monster Iestyn
c1a4a62d87 Merge branch 'no-hasslope' into next
yes I'm an idiot for rushing things like this
2018-11-08 21:25:51 +00:00
Monster Iestyn
7d31440ca6 WHY DID I FORGET THIS 2018-11-08 21:22:45 +00:00
Monster Iestyn
150fe29988 Merge branch 'no-hasslope' into 'next'
No hasslope

See merge request STJr/SRB2!312
2018-11-08 16:20:28 -05:00
Monster Iestyn
8440664c2f Remove hasslope, per colette's warning about it potentially causing desyncs 2018-11-08 21:13:58 +00:00
TehRealSalt
bf1b9d2042 Foolish typo 2018-11-08 16:04:26 -05:00
Monster Iestyn
1200793a94 Merge branch 'Playerquit_hook' into 'next'
"PlayerQuit" Lua Hook

See merge request STJr/SRB2!127
2018-11-08 15:53:35 -05:00
Monster Iestyn
5f7c333625 Merge branch 'lua-slopes' into 'next'
Lua support for slopes

See merge request STJr/SRB2!307
2018-11-08 15:52:44 -05:00
Monster Iestyn
68305c3b18 Merge branch 'master' into next 2018-11-08 20:50:58 +00:00
Monster Iestyn
8c2a163f5d Merge branch 'winsock-error-handling-fixes' into 'master'
Winsock error handling fixes

See merge request STJr/SRB2!303
2018-11-08 15:49:35 -05:00
TehRealSalt
05ebf7f30c Fix connecting w/ -splitscreen set 2018-11-08 15:24:10 -05:00
Sal
0c03fbb970 Merge branch 'lua-improvement' into 'master'
General Lua improvements

See merge request KartKrew/Kart!86
2018-11-08 15:12:06 -05:00
TehRealSalt
6017bf8064 Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe 2018-11-08 15:11:22 -05:00
TehRealSalt
6a240e9c32 This fake Lua function is probably no longer needed, now. 2018-11-08 15:02:19 -05:00
TehRealSalt
f027f2038e 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
2dce8e4552 Merge branch 'master' into lua-improvement 2018-11-08 14:50:30 -05:00
TehRealSalt
39dbe0b60b Merge branch 'master' into lua-improvement 2018-11-08 14:49:56 -05:00
Sal
2c197cee92 Merge branch 'staff_names' into 'master'
Staff Attack improvements

See merge request KartKrew/Kart!79
2018-11-08 14:47:23 -05:00
TehRealSalt
ab1faaeec5 Merge branch 'master' into staff_names 2018-11-08 14:47:38 -05:00
Sal
fffdefbd5c 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
2b92c1abfa Fix for the Y_FollowIntermission change hurting Record Attack
Should probably be ported to vanilla
2018-11-08 14:43:06 -05:00
TehRealSalt
fa3bb9b317 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
a146024cfd 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
95759f3fa8 These are integers, whoops 2018-11-07 18:37:06 -05:00
TehRealSalt
7410ddad12 Add Kart globals 2018-11-07 18:31:07 -05:00
TehRealSalt
3009c22312 typo 2018-11-07 18:24:44 -05:00
TehRealSalt
f2598898cf Add missing K_ functions 2018-11-07 18:23:28 -05:00
TehRealSalt
fc9bd81910 IsPlayerAdmin support, since admin was removed 2018-11-07 18:07:34 -05:00
TehRealSalt
cf61784f5f toptexture, bottomtexture, and midtexture use strings instead of magic numbers 2018-11-07 17:53:49 -05:00
Alam Arias
899452e9bc Merge pull request #321 from GoldenTails/next-add-a-lua-variable-to-ultimate-mode-so-people-can-check-it
Add Lua Ultimate Mode global variable so people can use it.
2018-11-07 17:53:20 -05:00
toaster
d1f6584c6a Fix disabling music on the menu. 2018-11-07 22:18:46 +00:00
toaster
f5bec0d2e5 Merge branch 'master' into 'lua-hudlib'
# Conflicts:
#   src/lua_hudlib.c
2018-11-07 16:57:11 -05:00
toaster
13dea76a81 * 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
c7b0df8172 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
fbbddfff0a Log this 2018-11-07 14:56:36 -05:00
Sal
80de0a74f1 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
378202e2eb Merge branch 'fix_startbumps' into 'master'
Fix startbumps.

See merge request KartKrew/Kart!84
2018-11-07 14:50:00 -05:00
toaster
94cd2bb354 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
GoldenTails
71f97a4a92 Add Lua Ultimate Mode global variable so people can use it. 2018-11-06 18:09:45 -06:00
toaster
424a62c3cc Fix replaying guest demos 2018-11-06 13:38:53 +00:00
toaster
2890e726c1 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
2282beec32 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
886613164f MT_POKEY, MT_ENEMYFLIP and the fancharacters - and the associated states/thinker modifications - gone. 2018-11-05 23:06:28 +00:00
toaster
c2b790d14a 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