stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 21:31:04 +00:00
Code Issues Projects Releases Packages Wiki Activity
4081 commits 60 branches 11 tags 94 MiB
Commit graph

3463 commits

Author SHA1 Message Date
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
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
TehRealSalt
a2da81243e Double length of msg 2018-11-01 17:08:30 -04:00
TehRealSalt
43d72d72f9 Properly center this 2018-11-01 17:06:10 -04:00
TehRealSalt
7e9300c420 Lap hands touch-up 2018-11-01 16:15:25 -04:00
TehRealSalt
4cf9476510 First frame lasts longer 2018-11-01 13:44:09 -04:00
TehRealSalt
7891a11fba Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt
a193a4adf2 YOU GOT EM 
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
 2018-10-31 23:34:13 -04:00
TehRealSalt
6c557407d5 Added judging hands (if'd out) 2018-10-31 23:10:38 -04:00
TehRealSalt
4369917912 Fix offsets, add colormapping 2018-10-31 22:38:43 -04:00
TehRealSalt
ea4ca2eb1f Brake drfit effect 2018-10-31 21:35:17 -04:00
toaster
659e6fa617 That's it for me. No new features, no major sprite replacements. Maybe bugfixing stuff like this I did while half-asleep just in case it turns out I missed a test case. 
* Oni's new 1x Bumpers and Out-Of-Bumpers competition-style 'X'!
* Modify alignment for `GOTITx` emblem drawing to match new Chaos Coin sprites.
* Adjust m_cond.c list to use new Chaos Coin Emblem sprite slots.
 2018-11-01 00:10:34 +00:00
Monster Iestyn
4dd5abf534 Merge branch 'master' into next 2018-10-31 23:10:57 +00:00
Monster Iestyn
c450a1aee2 Merge branch 'mi-minor-refactoring-backport' into 'master' 
MI minor refactoring

See merge request STJr/SRB2!294
 2018-10-31 16:49:30 -04:00
Monster Iestyn
61c1b12960 Merge branch 'multipatchtex-translucent-cyanpixel-fix-backport' into 'master' 
Multi-patch texture support for transparency AND translucency

See merge request STJr/SRB2!293
 2018-10-31 16:48:38 -04:00
Monster Iestyn
e9ea1b47d5 Fix the game crashing if you put params with no "=" for some reason in some of the SOC blocks, just stop going through the lines if that happens 2018-10-31 19:26:29 +00:00
TehRealSalt
2999c45d05 Item distribution experiments based on my experience in netgames 
Needs tested tonight.

- Grow & Rocket Sneakers are slightly more in the back
- Sneaker x3 gets handed out more in the back-middle
- Removed 5% from Ballhog towards the front
- Removed 5% from Shrink in the forward-most column it was in
 2018-10-31 15:14:53 -04:00
toaster
007ef084c6 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-31 16:19:50 +00:00
toaster
668acad8a7 Order of state enums was different to that of info table, so corrected. 2018-10-31 16:18:44 +00:00
Latapostrophe
1928dd86f1 I forgot a }, you may slap me. 2018-10-31 17:14:32 +01:00
toaster
8370064706 Merge branch 'wolfs_hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
 2018-10-31 15:19:39 +00:00
Latapostrophe
7a04fd1097 Resolved merge conflict and renamed gamerankings to minirankings 2018-10-31 15:18:05 +01:00
TehRealSalt
80b8aefdb2 Nerfed squishing 
After fixing flashing tics not being set properly, 2 seconds of being fully stopped and then another 1.5 seconds minimum of being unable to be hit just feels like an eternity :V
 2018-10-31 05:35:06 -04:00
TehRealSalt
e76da7d5ca No item usage while squished or respawning 2018-10-31 05:32:59 -04:00
TehRealSalt
54f71d3dbf Use frameangle for rocket sneakers so they rotate around you when you spinout 2018-10-31 05:28:39 -04:00
TehRealSalt
6da700629f Fix incorrect scale of player arrows in non-splitscreen 
whoops
 2018-10-31 04:55:00 -04:00
TehRealSalt
66a7adfc34 Push fakes away from other items 
Prevents stupid item stacking in Battle (you can still do it with bananas, but THOSE are removable, and don't have a similar sprite)
 2018-10-31 04:46:24 -04:00
TehRealSalt
cc5d248c90 Time over cam & signposts support mobjscale 2018-10-31 03:13:56 -04:00
TehRealSalt
20d86f01c7 Cancel pogo spring when bumping a wall 
Prevents instances where you can use it to stick in one spot in Battle
 2018-10-31 03:07:33 -04:00
TehRealSalt
db731209e5 Fix ENTER GAME option not working 2018-10-31 03:06:36 -04:00
TehRealSalt
69354856b7 "Joined with" kicks display in the chat instead of console 2018-10-31 02:46:16 -04:00
wolfy852
932f1f929a SOC_CHAO hardcode 
TODO: fix comment alignment
 2018-10-30 20:35:33 -05:00
TehRealSalt
aea453f6f2 Set stats to what we want them to be for R2 anyway 
(Eggman's will need updating in the wad)
 2018-10-30 20:11:15 -04:00
toaster
26241d32ce Have HU_DrawRankings and K_drawKartPositionFaces learn a thing or two from each other, considering the latter was originally copypasted code from the former but then diverged a bit. 
Hopefully this solves our disconnect woes.
 2018-10-30 23:01:17 +00:00
toaster
fe177975ca Fix ping alignment. 2018-10-30 22:44:05 +00:00
TehRealSalt
f1ea725319 Clean up for player->mo resyncing 
Make most of the order match the struct, make sure proper type conversions are used when needed
 2018-10-30 18:20:56 -04:00
Latapostrophe
f2eea0b31a I'm a genius and forgot to rename the stuff correctly 2018-10-30 23:10:56 +01:00
toaster
ad78c75430 Make the horizontal line at the bottom of the tab rankings use the duptweaks. 2018-10-30 22:09:04 +00:00
Latapostrophe
b6b19c8250 Removed some useless stuff 2018-10-30 23:08:58 +01:00
toaster
f36d58dd09 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup 2018-10-30 22:08:17 +00:00
toaster
6c020aab2e Some adjustments to the position faces. (Currently untested, but I need to merge master in and accidentially did this before that and I still have to compile from scratch for this branch, so...) 2018-10-30 22:07:35 +00:00
Latapostrophe
6841458546 got rid of the settop as well 2018-10-30 22:51:05 +01:00
Latapostrophe
799d8d2749 remove gL check 2018-10-30 22:29:28 +01:00
TehRealSalt
f9d559b03c Fuck it, add back in the old vars 
If we want a smaller resync packet, let's actually remove these FOR REAL
 2018-10-30 17:03:11 -04:00