Commit graph

24347 commits

Author SHA1 Message Date
mazmazz
d406809ee8 Hide Tutorial menu option if no tutorialmap 2018-11-10 01:17:11 -05:00
TehRealSalt
6b534b6d1d Shorter Karma sticker 2018-11-10 01:03:34 -05:00
mazmazz
bf9b5c5d5b Prompt HUD hiding implementation 2018-11-10 01:00:18 -05:00
mazmazz
aaf0a0a3df Merge branch 'text-prompts' into text-prompts-hidehud 2018-11-10 00:10:42 -05:00
mazmazz
19dd2b500b Actually fix empty prompt text crash 2018-11-10 00:10:16 -05:00
TehRealSalt
8ed0428e9e Use Silver for brake drift effect 2018-11-10 00:02:21 -05:00
TehRealSalt
56bd4f1a45 Ranking face highlights 2018-11-10 00:01:44 -05:00
mazmazz
b25cf9e0d9 Text prompt Hide HUD dehacked 2018-11-09 23:50:25 -05:00
mazmazz
2106ff30f0 Make gray/black text prompt backcolor darker in OpenGL 2018-11-09 22:52:13 -05:00
mazmazz
b7af1e385b Set up separate background color for prompts vs. console 2018-11-09 22:38:55 -05:00
mazmazz
90c83962d1 Fix tmthing crash in EndTextPrompt when loading an invalid prompt on level start 2018-11-09 22:07:32 -05:00
mazmazz
6c785cff56 Fix crash when page text is empty; add checks for MAX_PROMPTS and MAX_PAGES 2018-11-09 21:55:14 -05:00
TehRealSalt
092caa59fc Separate grow & invincibility alarms, donated by VAda 2018-11-09 21:47:36 -05:00
Steel Titanium
8d714f8522 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
5532882303 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
cdf6ef7cc5 Merge pull request #320 from monster-psychic-cat/remote_view_fixes
Minor remote viewpoint bugfixes.
2018-11-09 16:09:20 -05:00
Steel Titanium
25bbfe0610 Update readme 2018-11-09 16:01:29 -05:00
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
Monster Iestyn
ebb27b1c3c Merge branch 'public-op-nightsbumper-fix' into 'next'
Objectplace: Fix NiGHTS bumper angle being reset when WRITETHINGS

See merge request STJr/SRB2!299
2018-11-09 12:11:11 -05:00
Monster Iestyn
32a2c6dc3c Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
Monster Iestyn
74f221d73f Merge branch 'music-clean' into 'master'
Some code cleanup.

See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05: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
Monster Iestyn
91a44addd9 d_main.c: remove the _MAX_PATH define, the file hasn't used it since v2.0 2018-11-08 20:09:00 +00: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
Monster Iestyn
389b39d541 byteptr.h: include endian.h to help define WRITE/READ macros correctly according to endianness 2018-11-08 17:16:54 +00:00
Monster Iestyn
1d0065f16a More doomtype.h cleaning up:
* Move the misc types in the file to bottom, so that ATTRPACK at least is usable for RGBA_t
* Include endian.h, so that UINT2RGBA can be defined correctly for big endian builds
* Add more comments to make clear the main sections of the file
2018-11-08 17:05:35 +00:00