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

1080 commits

Author SHA1 Message Date
Sally Coolatta
a2caa2dc16 Character select can open without crashing 2020-08-15 22:40:49 -04:00
Sally Coolatta
30144d5d06 Things to get it to run 
Build is still MASSIVELY broken, you can't even get into a level, still investigating
 2020-08-15 20:09:36 -04:00
Sally Coolatta
631f698432 Cleanup 
So for whatever reason it's still giving me a warning about functions in i_threads having duplicate definitions, even though they clearly do not.

I'm completely stumped so I'm just gonna mess with my compile setup....... in the mean time, if anyone else could try to compile it, I'd appreciate it, so we know if it's just my end or if its something else
 2020-08-15 08:32:56 -04: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
c665393bd0 actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V 2020-08-14 21:21:17 -04:00
Sally Coolatta
2f2e813e52 m_anigif, m_cheat, m_cond, m_fixed 
Up to m_menu, and it's screaming, so I'm going to take a break :V
 2020-08-14 01:31:37 -04:00
Sally Coolatta
5319ef434e Compiling reaches g_demo.c again after the merge 2020-08-12 22:40:15 -04: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
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
Sally Coolatta
a442b6a4f6 Fix up D_SRB2Main 2020-08-10 21:11:46 -04:00
Sally Coolatta
76241bb26b D_AddFile fixes 2020-08-10 20:35:17 -04:00
Sally Coolatta
7ac6723e46 gamecontrol has another index for player num, instead of being duplicated for players 2-4 2020-08-10 20:08:32 -04:00
Sally Coolatta
c3ca513445 Merge d_netcmd.c 2020-08-10 12:04:24 -04:00
Sally Coolatta
e296e1309a YAY, round 2 2020-08-09 21:02:56 -04:00
Steel Titanium
913c07959e Kill CD support 2020-08-07 17:06:19 -04:00
James R
9077a4ff03 Kill MIDI 2020-08-07 12:39:08 -07:00
Sally Coolatta
178087289e Merge d_netcmd.c/h 2020-08-02 15:38:53 -04:00
James R
ed2d40b98e Unused parameter :) 2020-07-31 22:17:22 -07:00
Sal
21dfe49bf8 Merge branch 'antigrav-respawn' into 'master' 
Antigravity fixes, round 2

See merge request KartKrew/Kart!305
 2020-07-31 21:55:38 -04:00
Latapostrophe
b62ef5a51d Kill flipcam again but nothing else associated with it. 2020-07-26 21:15:32 +02:00
Latapostrophe
90cde7379c Revert "Push flipcam down the nearest staircase" 
This reverts commit 06d70c1f8e.
 2020-07-26 20:27:22 +02:00
Sally Coolatta
ba6d5e95ba Add Sneaker x2 to pad out the item table a bit better 
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
 2020-07-24 19:11:52 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02:00
Steel Titanium
058b41a834 Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
James R
71189da020 Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master' 
Adds the branch name into the version command printout when outside of DEVELOP mode.

See merge request STJr/SRB2!981
 2020-07-11 01:48:38 -04:00
James R
f1648fbf5c Followers compiler warnings 2020-07-09 16:39:47 -07:00
Ashnal
8cfc3520e5 Connection screen no longer freezes up while 
searching for addons on disk
Game will run one tic after every file status is updated
 2020-07-01 23:48:14 -04:00
GoldenTails
0fbcd7a5d2 Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with 2020-06-27 10:56:15 -05:00
Zachary McAlpin
fbe3c1a122 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-25 10:31:55 -05:00
James R
34eeb98cc4 Merge remote-tracking branch 'origin/next' into gtr-fixes 2020-06-24 19:31:19 -07:00
Zachary McAlpin
1b831c0bbe Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-11 15:02:31 -05:00
Latapostrophe
cab9c2a139 Merge branch 'v2-master' into followme-internal 2020-06-07 23:56:32 +02:00
Sally Coolatta
136bb1d252 Add K_CanChangeRules, and start a "single session" GP when warping to a map in single player 2020-06-06 19:45:13 -04:00
GoldenTails
663fcf5e61 Adds the branch name into the version command printout when outside of DEVELOP mode. 
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
 2020-06-06 04:12:27 -05:00
Latapostrophe
f33e4d62a0 Sort conflicts, fix misordered follower bubble states in dehacked 2020-06-05 02:33:39 +02:00
Sally Coolatta
f4c0011a76 Merge branch 'master' into grand-pricks 2020-06-04 14:41:56 -04:00
Latapostrophe
5412358fcf Fixed setting follower on title screen + mixed declarations 2020-06-03 01:23:32 +02:00
Latapostrophe
6ac63cca7a Merge branch 'v2-master' into followme-internal 2020-06-02 22:21:16 +02:00
Sally Coolatta
086ea73c2f Merge branch 'master' into respawn-updates 2020-06-01 15:49:30 -04:00
LJ Sonic
05e8d12427 Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/sdl/i_system.c
#   src/win32/win_sys.c
 2020-06-01 08:16:53 -04:00
Zachary McAlpin
8826eeeeb9 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-05-29 15:32:59 -05:00
Sally Coolatta
63917ffccc The start of the scary 2.2 merge 
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
 2020-05-29 13:43:38 -04:00
Sally Coolatta
d062a35a3a Huge respawn overhaul 
- Moved respawn code to its own file
- Reorganized a lot of the code related to respawning
- As a result of the massive reorganization, I squashed several bugs. Most notably: mid-game joiners having weird spawns, being able to skip laps by respawning.
- Respawn lightsnake no longer takes you straight to your nextwaypoint -- it now has a minimum distance forward that it tries to put you at when you respawn.
 2020-05-29 01:04:51 -04:00
Sally Coolatta
20b2dabae9 Merge branch 'pet-robo' into grand-pricks 2020-05-25 12:44:59 -04:00
Sally Coolatta
4916516e2e Prevent duplicate skins, fix bots not being able to be disabled, change default to "off" 2020-05-24 17:12:58 -04:00
SwitchKaze
58cac1fd73 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8 Update to 2.2.4 2020-05-22 16:47:51 -05:00