thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
3999 commits 1 branch 12 tags 205 MiB
Commit graph

3999 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
toaster
935607cfab 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
3a2249b1af Cleaner code logic. Should make no real difference to exe, so not gonna upload another. 2018-11-05 14:28:32 +00:00
toaster
06ab5cf099 Fix "laststaff" setting 2018-11-05 14:03:09 +00:00
toaster
1dfd7ab4e5 Merge branch 'master' into staff_names 2018-11-05 13:46:10 +00:00
toaster
4568753e4c 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
5f8e8f4ab2 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
33ca25c705 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
ab9f908cad Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot). 2018-11-04 21:48:47 +00:00
Sryder
f6ff9c603e Literally a single compiler warning. 2018-11-04 17:37:18 +00:00
toaster
d950cfd9d7 Correctly disable OGL-only menus/options in software. 2018-11-04 14:41:24 +00:00
toaster
839062bc2b 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
3d90abf538 Mixed up validity check... 2018-11-03 22:53:12 -04:00
toaster
220d4d5605 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
Sal
b7f82fdcc4 Merge branch 'battle-arrow-fix' into 'master' 
Battle arrow fixes and cleanup

See merge request KartKrew/Kart!78
 2018-11-03 17:50:29 -04:00
TehRealSalt
bf4846c42b Battle arrow fixes and cleanup 2018-11-03 17:45:38 -04:00
Latapostrophe
4702c6fcf7 Merge branch 'master' into lua-hudlib 2018-11-03 22:25:33 +01:00
Latapostrophe
d52d9d4c71 Remove indents on #ifdefs and take K_drawInput in the hud_position check 2018-11-03 22:24:45 +01:00
toaster
6de4c77fe6 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
fcee38d647 Merge branch 'master' into next 2018-11-03 12:29:04 +00:00
Monster Iestyn
3e4ab68264 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
Sal
c344ec34a7 Merge branch 'update-version' into 'master' 
v1 release prep

See merge request KartKrew/Kart!24
 2018-11-03 03:39:02 -04:00
TehRealSalt
c22b3b3d76 Keep the old y offsets, though. 2018-11-03 03:38:41 -04:00
TehRealSalt
bb4dfed072 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
4781f34190 Remove NOFOURPLAYER from Makefile 
Seems that someone already removed it from the other code anyway...?
 2018-11-03 03:21:08 -04:00
TehRealSalt
87f767fad0 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
aeeedc2732 Merge branch 'master' into update-version 2018-11-02 23:57:28 -04:00
TehRealSalt
9c2767649b Check for valid source in A_JawzChase, change 1 target rule 2018-11-02 23:51:06 -04:00
Monster Iestyn
3b6e8bcf09 Merge branch 'file-loading-hotfix' into 'master' 
File loading hotfix

See merge request STJr/SRB2!310
 2018-11-02 19:03:59 -04:00
Monster Iestyn
a67dd8821f 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
c4fec80513 fullbright points 2018-11-02 15:06:56 -04:00
TehRealSalt
0ed3fb95f4 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-02 14:59:48 -04:00
TehRealSalt
e4a0c3103a Fix for "became a spectator" text repeating 2018-11-02 14:59:26 -04:00
Sal
4c08fa66ba Merge branch 'all_hardcode' into 'master' 
Truly all-hardcode

See merge request KartKrew/Kart!71
 2018-11-02 14:54:09 -04:00
TehRealSalt
03bedd870e use gfx.kart 2018-11-02 14:52:08 -04:00