vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
4149 commits 50 branches 7 tags 75 MiB
Commit graph

3523 commits

Author SHA1 Message Date
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
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
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
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
Monster Iestyn c47f0045d6 ST_Ticker also should not have FUNCMATH, as it also has side effects 2018-11-07 21:45:27 +00: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
Monster Iestyn b3e8a1ed88 HU_Start should not have FUNCMATH, it has side effects 2018-11-07 21:37:42 +00:00
Monster Iestyn 4a4e07e138 D_PostEvent_end is only used by Allegro (used by the DOS port) to help timers work, so check for PC_DOS in preprocessor code. Also remove FUNCMATH from said function. 2018-11-07 21:21:36 +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
Monster Iestyn f66979ba1a P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway) 2018-11-07 21:00:38 +00: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
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
GoldenTails a3bc7ddfa0 Add Lua Ultimate Mode global variable so people can use it. 2018-11-06 18:09:45 -06:00
toaster 7866e88292 No-show of debug stuff, and make karteliminatelast into a debug to justify its hiding. 2018-11-06 18:54:00 +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
MPC 1cc8619c9e Minor remote viewpoint bugfixes. 2018-11-05 20:40:51 -02: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 bb251c4fbf * Re-add support for command "help" (ie, basically no help at all). 
* Rename "suicide" command to "respawn" so the game doesn't tell you to kill yourself when you try to get help for it.
* Add a "manual" command to open the manual.
 2018-11-05 19:02:34 +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 8d4ce113e4 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +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
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
toaster f9ad07da5f Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...) 2018-11-03 13:20:02 +00:00
Monster Iestyn 02b14959cc Merge branch 'master' into next 2018-11-03 12:29:04 +00:00
Monster Iestyn 924c3164b0 Merge branch 'soc-sanitising-the-sequel' into 'next' 
SOC sanitising the sequel!

See merge request STJr/SRB2!308
 2018-11-03 08:18:16 -04:00
TehRealSalt 0d79cbdd27 Keep the old y offsets, though. 2018-11-03 03:38:41 -04:00
TehRealSalt cb1380ae51 Changed this randomly changed instance back to vanilla, due to compile errors 
https://i.imgur.com/SEdmZpC.png
 2018-11-03 03:29:06 -04:00
TehRealSalt 69faf1cbc7 Remove NOFOURPLAYER from Makefile 
Seems that someone already removed it from the other code anyway...?
 2018-11-03 03:21:08 -04:00
TehRealSalt 9de7a9d5cc Add textures.kart, re-define DEVELOP mode, 
Disabling DEVELOP can be another branch; this means this can get in master quicker
 2018-11-03 03:17:20 -04:00
TehRealSalt 0eab0c5a14 Merge branch 'master' into update-version 2018-11-02 23:57:28 -04:00
TehRealSalt 9ae9e7ec3a Check for valid source in A_JawzChase, change 1 target rule 2018-11-02 23:51:06 -04:00
Monster Iestyn 0f37411e2b Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason. 
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
 2018-11-02 20:48:12 +00:00
TehRealSalt cb699c1770 fullbright points 2018-11-02 15:06:56 -04:00
TehRealSalt 6bb33b9d16 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-02 14:59:48 -04:00
TehRealSalt ba67c7aa70 Fix for "became a spectator" text repeating 2018-11-02 14:59:26 -04:00
Sal 87dd8cd0ce Merge branch 'all_hardcode' into 'master' 
Truly all-hardcode

See merge request KartKrew/Kart!71
 2018-11-02 14:54:09 -04:00
TehRealSalt 399bccd2c7 use gfx.kart 2018-11-02 14:52:08 -04:00
Monster Iestyn 7b268d15b1 Merge branch 'lua-hudlib-addition' into 'next' 
Lua: hud.enabled and v.getLocalTransFlag()

See merge request STJr/SRB2!306
 2018-11-02 14:29:02 -04:00
TehRealSalt 8d5fb13111 wrong var fix 2018-11-02 14:01:29 -04:00
Monster Iestyn f37a573834 Merge branch 'master' into next 2018-11-02 11:02:35 +00:00
Monster Iestyn ba5f5be3bb Merge branch 'patch-offsets-fix' into 'master' 
Patch offsets fix

See merge request STJr/SRB2!305
 2018-11-02 07:00:37 -04:00
TehRealSalt 37893cc523 Merge branch 'master' into all_hardcode 2018-11-02 02:30:36 -04:00
TehRealSalt 1bdaad3f06 quick merge fix 2018-11-02 02:28:34 -04:00
TehRealSalt 5c1cc6e1df Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt 667e636631 Use chars.kart 2018-11-02 01:22:52 -04:00
TehRealSalt 6fd0f3f0ba Fix ghost rankings issue 2018-11-02 01:19:25 -04:00
TehRealSalt 89276b739f Merge branch 'master' into chars_cleanup 2018-11-01 23:48:22 -04:00
TehRealSalt 950bca1217 Actually lets just do this now, like how its done below 2018-11-01 21:05:52 -04:00
TehRealSalt 78299c5fee 0xFFFF to 0xFFFFFFFF 
I'll implement proper bit-setting later, just gotta see if it works first
 2018-11-01 20:50:19 -04:00
TehRealSalt 67dd962fb9 Change out the hex used for hnext/hprev consistancy 2018-11-01 20:46:20 -04:00
TehRealSalt e758e0f8fd Merge branch 'master' into resync 2018-11-01 20:39:50 -04:00
TehRealSalt 5c7de75592 Fix random crash on squishing 
Why does this cause a crash? I dunno, beats me, but this seemed to fix it.
 2018-11-01 19:50:31 -04:00
TehRealSalt 0c2a5cf9d3 Merge branch 'master' into more-fixes 2018-11-01 18:10:53 -04:00
TehRealSalt 7e103be393 Change default brake color from Yellow to White 2018-11-01 17:37:59 -04:00
TehRealSalt 6a31959381 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt 03d64cbced Merge branch 'master' into brake-drift 2018-11-01 17:35:45 -04:00
TehRealSalt deb51d1eb4 Merge branch 'master' into battle-visuals 2018-11-01 17:35:01 -04:00