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
19127 commits 1 branch 12 tags 205 MiB
Commit graph

600 commits

Author SHA1 Message Date
Sally Coolatta
672c4fb763 Make aiming relative too 2020-09-25 02:06:37 -04:00
Sally Coolatta
99a1bacb81 Turning code overhaul 
Packet drops are still broken, but at least netgames are playable now.
 2020-09-22 00:35:44 -04:00
James R
ef108cbb36 Merge remote-tracking branch 'pub/next' 2020-09-20 14:07:54 -07:00
SteelT
d8bcc13fec Merge branch 'master' into trick-panels 
# Conflicts:
#	src/d_player.h
#	src/dehacked.c
#	src/k_kart.c
#	src/p_user.c
 2020-09-18 00:54:45 -04:00
SteelT
6a168ac5e9 Merge branch 'pictureformats' into 'next' 
PNG conversion refactoring

See merge request STJr/SRB2!675
 2020-09-10 15:58:18 -04:00
James R
cedb09bd92 Fix pointers on LUA_Archive and LUA_UnArchive 
(servers joinable again)
 2020-08-21 19:47:53 -07:00
James R
7d6d0f216a Fix mismatched type of followercolor in netsave 2020-08-21 18:34:10 -07:00
SteelT
ccff8dc2ba Attempt to fix joining netgames being broken 2020-08-20 20:28:48 -04:00
FlykeSpice
2d9ec1687c Remove POLYOBJECTS POLYOBJECTS_PLANES #ifdefs(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
FlykeSpice
2424418390 Remove ESLOPE #ifdef(backport from srb2 2.2) 2020-08-20 13:02:13 -04:00
Sally Coolatta
a251c3909b Lots of little fixes 
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
 2020-08-16 00:29:04 -04:00
Jaime Passos
7bc4af41ab Merge branch 'pictureformats' into patch-stuff-again-2 2020-08-15 20:48:28 -03:00
Sally Coolatta
0dc21106e5 Lua stuff is done 2020-08-15 07:47:18 -04:00
Sally Coolatta
dfd733eb80 Up to screen.o 
Lots of renderer files I didn't need to touch at all here :)
 2020-08-15 00:55:30 -04:00
Sally Coolatta
9b9ab8a2d5 Get up to p_user 2020-08-14 23:23:14 -04:00
Louis-Antoine
8471f9e71f Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate 
# Conflicts:
#	src/d_clisrv.c
#	src/d_clisrv.h
#	src/d_net.c
#	src/p_saveg.c
#	src/p_saveg.h
 2020-08-13 13:53:10 +02:00
Sally Coolatta
f9ca40e673 Merge branch 'master' into the-scary-22-merge 2020-08-12 20:59:09 -04:00
Sally Coolatta
8731c6b7a4 Another round of fixing up 
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
 2020-08-11 16:13:17 -04:00
Sally Coolatta
a50a9a1843 Lots of splitscreen fixes 
LOTS of stuff I changed to use arrays instead of constantly duplicated code
 2020-08-10 23:38:32 -04:00
Sally Coolatta
39550596f9 A few more fixes to d_clisrv.c 2020-08-10 21:50:08 -04:00
Sally Coolatta
c96bd5f64a Many removals 
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
 2020-08-10 21:45:51 -04:00
SteelT
84a4c7ba62 Fix some more ifdefs 2020-08-10 18:57:58 -04:00
Sally Coolatta
cca0afde06 Merge p_saveg.c 2020-08-10 14:42:17 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
SteelT
7d5b0adc87 Merge p_saveg.c 2020-08-02 18:37:58 -04:00
Sally Coolatta
c9b17c456d Re-attempt at hitlag 
I remember when I tried to fix wolfs' branch I was having issues, but this ended up working pretty much fine? Don't remember why the old branch was messed up though (it was simply too old & not substantial enough to try and work off of imo)
 2020-07-29 09:30:29 -04:00
Sally Coolatta
b08459cbee Buffer time before countdown depends on player count, no intro spin in 1v1 2020-07-27 23:31:46 -04:00
Sally Coolatta
f0044e05c1 Crossing the finish line first before anyone else gives you a free rainbow boost 2020-07-24 21:41:41 -04:00
Sally Coolatta
3800603243 Bruhther moment 2020-07-22 23:49:24 -04:00
Sally Coolatta
c7f19a4b83 Lazy synch drawflags on join 2020-07-20 17:49:56 -04:00
Nev3r
ebe16a66d9 Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag 
# Conflicts:
#	src/hardware/hw_main.c
#	src/p_ceilng.c
#	src/p_floor.c
#	src/p_mobj.c
#	src/p_mobj.h
#	src/p_polyobj.c
#	src/p_saveg.c
#	src/p_setup.c
#	src/p_spec.c
#	src/p_spec.h
#	src/p_user.c
#	src/r_bsp.c
#	src/r_defs.h
 2020-07-10 18:18:07 +02:00
Jaime Passos
c385eca5d2 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-06 19:29:14 -03:00
Nev3r
6b38fe4b2c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 2020-07-06 11:13:27 +02:00
LJ Sonic
080a5acd0f Merge branch 'ff_horizontalflip' into 'next' 
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)

See merge request STJr/SRB2!987
 2020-07-03 16:56:32 -04:00
Nev3r
e301d268ec Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next 
# Conflicts:
#	src/hardware/hw_main.c
 2020-06-30 20:29:48 +02:00
toaster
3b3256be8f Special saves! 
All this refactoring, just to resolve #162. Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.

Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...

One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
 2020-06-22 19:00:47 +01:00
kaysrishaq
6f859fd44d FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements) 2020-06-19 11:11:18 -04:00
SteelT
dbd5198ac2 Merge branch 'marathonmode' into 'next' 
MARATHON RUN

See merge request STJr/SRB2!941
 2020-06-17 19:36:10 -04:00
Sally Coolatta
59add5abd4 Merge branch 'master' into trick-panels 2020-06-14 20:46:01 -04:00
Latapostrophe
fbd10d0e6c Fix a bruh moment where I deleted follower from relinkpointers when fixing a conflict and it broke every netgame :oh: 2020-06-10 22:52:32 +02:00
MascaraSnake
3ce62d7780 Merge branch 'next' into udmf-next 
# Conflicts:
#	src/p_mobj.c
#	src/p_polyobj.c
 2020-06-09 09:38:01 +02:00
Latapostrophe
406d7c0b32 Remove old debug prints 2020-06-08 20:37:27 +02:00
Lachlan Wright
5263b8cf63 Merge branch 'fix-spawn-desynch' into 'next' 
Fix desynch when a player spawns

See merge request STJr/SRB2!977
 2020-06-08 05:25:41 -04:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Sally Coolatta
b7a8c1f128 Merge branch 'master' into trick-panels 2020-06-05 18:41:21 -04:00
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Monster Iestyn
cc491d0a1e Sync turnobjs for polyrotate_t thinkers in netgames 2020-06-04 21:31:26 +01:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Sally Coolatta
2a37bca626 Merge branch 'master' into respawn-updates 2020-06-04 00:16:37 -04:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00