thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-07 02:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
23092 commits 2 branches 14 tags 206 MiB
Commit graph

23092 commits

This branch
This branch
All branches
Author SHA1 Message Date
wolfy852
40ad082bcf SOC_CHAO hardcode 
TODO: fix comment alignment
 2018-10-30 20:35:33 -05:00
Steel Titanium
9847e6d181 Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs 2018-10-30 21:06:06 -04:00
Steel Titanium
2f62a03f6c Fix up 64-bit gme 2018-10-30 20:50:36 -04:00
TehRealSalt
5c5894202b 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
bac297b658 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
c71e71a4b4 Fix ping alignment. 2018-10-30 22:44:05 +00:00
TehRealSalt
adf988f2c9 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
c7b8836f90 I'm a genius and forgot to rename the stuff correctly 2018-10-30 23:10:56 +01:00
toaster
76a5f98c62 Make the horizontal line at the bottom of the tab rankings use the duptweaks. 2018-10-30 22:09:04 +00:00
Latapostrophe
7c5ccd7019 Removed some useless stuff 2018-10-30 23:08:58 +01:00
toaster
ee4cbe4b51 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chars_cleanup 2018-10-30 22:08:17 +00:00
toaster
ae47951a2e 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
24580087d0 got rid of the settop as well 2018-10-30 22:51:05 +01:00
Latapostrophe
5ef97a6ec8 remove gL check 2018-10-30 22:29:28 +01:00
TehRealSalt
53e22e5769 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
TehRealSalt
e3bf06432a Add hnext/hprev to consistancy, add marescore to resynchend 2018-10-30 16:24:27 -04:00
Sal
9db0c385f1 Merge branch 'toast_pokes' into 'master' 
toast-pokes

See merge request KartKrew/Kart!65
 2018-10-30 15:01:04 -04:00
Latapostrophe
6ca6c094db Small hud library additions 2018-10-30 19:40:59 +01:00
Latapostrophe
295bf081a7 A few additions to the hud library 2018-10-30 18:24:03 +01:00
Monster Iestyn
18871da721 now that V_FLIP's effects are always supported in V_DrawFixedPatch, there's no need for the "flip" variable anymore 2018-10-30 14:22:21 +00:00
Monster Iestyn
a56074b238 Fix an error I made in HWR_DrawFixedPatch 2018-10-30 13:44:01 +00:00
toaster
6909bd25f9 No fucking wonder these weren't showing up, I set their duration to 1 tic instead of -1 tic 
(The Volcanic Valley issue is because the most recent Volcanic Valley update in maps.kart lost all the Objectspecial flags from mapthing 2018)
 2018-10-30 11:08:53 +00:00
TehRealSalt
6efab5bae5 House keeping 
- Remove the potentially GPL-infringing discord_pass.h file.
- Let DISCORD_APPID be a public #define.
- Use server_context as party ID.
- Add more states ("Watching Demo", "Menu").
- Only show map images on supported maps. Falls back to an image of a dice.
- Displays "???" as the map name for Hell maps.
- Voting displays an image of the BG planet, depending on the gamemode.
- Added a fallback title screen large image.
- Added a fallback character image.
- General code cleanup & safety checks.
- Give CV_NETVAR to cv_maxplayers (I should come up with a better way of sending this information without overwriting user settings, but this'll do for now)
 2018-10-30 05:44:29 -04:00
TehRealSalt
88227a1f83 Clean up resync pak 2018-10-30 01:23:21 -04:00
toaster
97274177d3 Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:47:34 +00:00
TehRealSalt
4bf4bcadda Fix SMK RR thwomps casuing bounce-up 2018-10-29 17:45:59 -04:00
toaster
8d575c9b56 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 2018-10-29 21:37:06 +00:00
toaster
381264580d Merge branch 'sal-hardcode' of https://git.magicalgirl.moe/KartKrew/Kart.git into all_hardcode 
# Conflicts:
#	src/info.c
#	src/info.h
#	src/p_mobj.c
 2018-10-29 21:36:39 +00:00
LJSonik
3a8ee79cb1 Merge branch 'master' into analog-flipcam-synch-fix 2018-10-29 19:52:08 +01:00
toaster
081c9c36e5 Make dropped floatingitems not carry player momentum (sorry for leaving this so long, Oni!) 2018-10-29 14:43:21 +00:00
Monster Iestyn
ffe3b57f29 add missing SHORTs in HWR_DrawPatch and HWR_DrawCroppedPatch as well 2018-10-29 13:34:54 +00:00
Monster Iestyn
80573f266f HWR_DrawFixedPatch: Add V_OFFSET support for V_FLIP in hardware code as well, also add missing SHORTs for gpatch fields 2018-10-29 13:29:16 +00:00
Monster Iestyn
2b16b8241f Make V_OFFSET no thing without V_NOSCALESTART, to remove any potential glitches with using it on its own 2018-10-29 12:36:09 +00:00
Monster Iestyn
81fb42a2b4 V_DrawFixedPatch: Tinker with the left/top offsets code so that V_OFFSET can support V_FLIP 2018-10-29 12:06:22 +00:00
toaster
4766d3fbea Merge branch 'master' into 'toast_pokes' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-29 07:04:35 -04:00
toaster
d1ac57e4ec Fix Sonic's minimap icon not being properly initialised. (Experimenting with the online editor, since I'm low on time, but this is 100% correct and I'll make a new exe later.) 2018-10-29 06:57:45 -04:00
toaster
1c01e1af14 Merge branch 'master' into 'chars_cleanup' 
# Conflicts:
#   src/hu_stuff.c
 2018-10-29 06:48:18 -04:00
Sal
76778baa90 Merge branch 'grow-shrink-fixes' into 'master' 
Invincibility item & Shrink fixes

See merge request KartKrew/Kart!68
 2018-10-29 05:32:20 -04:00
Sal
916fb49be6 Merge branch 'splitscreen-tuneup' into 'master' 
Splitscreen tuneup

See merge request KartKrew/Kart!67
 2018-10-29 05:30:49 -04:00
Sal
02e74a3010 Merge branch 'div-sounds' into 'master' 
Divide sound with number of local players

See merge request KartKrew/Kart!66
 2018-10-29 05:26:51 -04:00
TehRealSalt
fc156e6fb5 Preface with splitscreen checks 2018-10-29 05:26:17 -04:00
Sal
79dd2236aa Merge branch 'spinout-speedup' into 'master' 
Spinout speedup

See merge request KartKrew/Kart!63
 2018-10-29 05:24:50 -04:00
TehRealSalt
37f949bb38 Make shadows more consistent on slopes for non-players 2018-10-29 05:21:47 -04:00
TehRealSalt
193941945e The motherload: all of my Lua is hardcoded 
This took like 6 straight hours of work, never ask me for anything ever again
 2018-10-29 05:00:08 -04:00
Louis-Antoine
2dc6a102bb Fix desynch when toggling analog mode or flipcam 
Special thanks to Lat' for asking weird questions
 2018-10-29 00:49:23 +01:00
TehRealSalt
f9d8ebd4e6 Camera crash fixes 
UNRELATED, but they made this branch a pain in the ass to test so I needed to fix this here :V
 2018-10-28 17:31:59 -04:00
TehRealSalt
d106cf701b Use k_itemtype as the additional check instead of pw_shield 2018-10-28 14:45:01 -04:00
TehRealSalt
5496803ced Fix kartspeed/kartweight writes 2018-10-28 14:43:58 -04:00
toaster
6ab0faae6f Ping offset fixed even more 2018-10-28 18:06:21 +00:00
TehRealSalt
c6d18edf7c Move lap animation up slightly 
(I'm not gonna remember to do this later either)
 2018-10-28 13:52:25 -04:00