Commit graph

4161 commits

Author SHA1 Message Date
TehRealSalt
60dcd3470b Separate grow & invincibility alarms, donated by VAda 2018-11-09 21:47:36 -05:00
Steel Titanium
038dfb4aff Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into readme-update 2018-11-09 18:24:42 -05:00
Monster Iestyn
4b8232d777 Merge branch 'master' into next 2018-11-09 23:18:14 +00:00
Alam Arias
1c22c6a1f9
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
e937d1bacb Update readme 2018-11-09 16:01:29 -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
Monster Iestyn
b3befae143 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
17223aa520 Merge branch 'master' into next 2018-11-09 16:09:49 +00:00
Monster Iestyn
f974bb96ac Merge branch 'music-clean' into 'master'
Some code cleanup.

See merge request STJr/SRB2!298
2018-11-09 10:58:57 -05: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
Monster Iestyn
f50f10ef30 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
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
Monster Iestyn
fa80d61799 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
fd20bbb54e 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
Monster Iestyn
5c61c40551 Clean up doomtype.h a bit, add indenting and comments to make some preprocessor code more readable 2018-11-08 16:31:20 +00:00
Monster Iestyn
0bdbdd1b1e Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified) 2018-11-08 16:26:55 +00: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