Commit graph

4081 commits

Author SHA1 Message Date
toaster
aece934083 Fix not found 40833 2018-11-10 22:27:04 +00:00
toaster
e1a28bbe1c Three more CV_NOSHOWHELP's I missed the first time around. (Not making another exe for this, it'll show up the next time one is made... not that important.) 2018-11-10 18:50:19 +00:00
toaster
45fc2c46e9 Merge branch 'fof-slope-skew-backport' of https://git.magicalgirl.moe/STJr/SRB2.git 2018-11-10 18:27:13 +00: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
toaster
5b286d89a8 Hide the numlaps change message in record attack. (It plays every time you load a demo of a map with a differing quantity of laps to the default value...) 2018-11-10 12:34:04 +00:00
toaster
a0badacd22 * Fix spectators having the "YOU ARE THIS PERSON" highlight on the minirankings be done on the person in first.
* Apply the "YOU ARE THIS PERSON" highlight to all non-splitscreen circumstances that use the tiny player icons. (New locations: Tab rankings, intermission, completed votes.)
2018-11-10 12:31:41 +00:00
TehRealSalt
fa989f2f7f Shorter Karma sticker 2018-11-10 01:03:34 -05:00
TehRealSalt
0f01e9513a Use Silver for brake drift effect 2018-11-10 00:02:21 -05:00
TehRealSalt
571ef7173e Ranking face highlights 2018-11-10 00:01:44 -05:00
TehRealSalt
60dcd3470b Separate grow & invincibility alarms, donated by VAda 2018-11-09 21:47:36 -05:00
TehRealSalt
ad625296c2 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
2f5e8ceee2 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-09 15:34:59 -05:00
toaster
b0246d6cba 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
6c5acd6e0d A few mobj_scale fixes I missed on signposts 2018-11-08 20:39:18 -05:00
TehRealSalt
3ad8d1c4ce Lap emblem gets replaced with a stopwatch in Record Attack 2018-11-08 19:36:05 -05:00
TehRealSalt
68d2d00a07 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
1e4d196e5e Merge remote-tracking branch 'srb2public/next' 2018-11-08 17:37:05 -05:00
Monster Iestyn
df28e2b2a6 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
98fd9f8e42 WHY DID I FORGET THIS 2018-11-08 21:22:45 +00:00
Monster Iestyn
316cf27a7a Merge branch 'no-hasslope' into 'next'
No hasslope

See merge request STJr/SRB2!312
2018-11-08 16:20:28 -05:00
Monster Iestyn
82c738ea4b Remove hasslope, per colette's warning about it potentially causing desyncs 2018-11-08 21:13:58 +00:00
TehRealSalt
0feb1d557d Foolish typo 2018-11-08 16:04:26 -05:00
Monster Iestyn
d8f3a20e65 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
a9cfd6a781 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
91113cb79c Merge branch 'master' into next 2018-11-08 20:50:58 +00:00
Monster Iestyn
7cc5caf69c 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
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
Alam Arias
b8c4d7ddff
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
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