thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-07 00:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
11667 commits 2 branches 14 tags 206 MiB
Commit graph

11667 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steel Titanium
26a2677863 Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong 2020-06-17 14:31:49 -04:00
Steel Titanium
aab378fe1a Reduce code duplication by creating get_zlib_error function 
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
 2020-06-17 14:19:19 -04:00
Steel Titanium
e247ef0251 Fix facecolor may be used uninitialized. 2020-06-17 14:09:49 -04:00
lachwright
47b9a296b3 Whoops, forgot hu_stuff.c 2020-06-17 05:27:42 +08:00
lachwright
ab7b4a29e5 Add SF_NOSUPERSPRITES 2020-06-17 04:53:42 +08:00
lachwright
2215505c2b Merge branch 'next' into more-platform-fixes 2020-06-17 01:53:19 +08:00
lachwright
92a43f2f2e Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain 2020-06-17 01:46:36 +08:00
lachwright
b2b0fc435b Platform fixes 2020-06-14 12:17:30 +08:00
Zachary McAlpin
8376c8e987 I forgot to pop the error handler 2020-06-12 07:50:57 -05:00
Zachary McAlpin
1ed6d49931 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-12 07:32:44 -05:00
Nev3r
ef7a95e7d7 Merge branch 'dofile' into 'next' 
Add dofile() to Lua

See merge request STJr/SRB2!969
 2020-06-12 02:32:16 -04:00
Steel Titanium
2986739fd7 Merge branch 'master' into next 2020-06-11 20:11:26 -04:00
SteelT
9e85267b36 Merge branch 'next-lc-uint16' into 'next' 
Custom skincolor bugfixes

See merge request STJr/SRB2!971
 2020-06-11 20:08:50 -04:00
Zachary McAlpin
75932c45d4 Updated LUAh_GameQuit to use new error handler 2020-06-11 15:11:01 -05: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
lachwright
62183201c9 Allow macOS builds to be launched through Steam 2020-06-12 01:19:06 +08:00
LJ Sonic
4eb8b25d1f Merge branch 'better-download' into 'next' 
Improvements to the in-game file downloader

See merge request STJr/SRB2!976
 2020-06-11 13:02:13 -04:00
mazmazz
23bd0bc15c CMAKE: Move launch-c into more sensible location 2020-06-10 15:08:09 -04:00
LJ Sonic
3203d4a62e Merge branch 'next' into 'better-download' 
# Conflicts:
#   src/d_clisrv.c
 2020-06-10 07:57:49 -04:00
LJ Sonic
5e7ffb055f Merge branch 'snake' into 'next' 
Add a Snake minigame to the file transfer screen

See merge request STJr/SRB2!903
 2020-06-10 07:38:37 -04:00
Zachary McAlpin
3a8e053d9d Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-09 19:54:47 -05:00
mazmazz
121d4c87e3 CMAKE: Fix toggle fullscreen breakage due to missing define 
This is lazy. The correct solution is to eliminate the define in the program code
 2020-06-09 17:32:14 -04:00
MascaraSnake
5bbbb16837 Compiling fix 2020-06-09 22:10:02 +02:00
mazmazz
89bd419a06 CMAKE: Fix OS X ccache scripts 2020-06-09 11:12:52 -04:00
MascaraSnake
c685328268 Adapt POF_SPLAT to UDMF setup 2020-06-09 09:44:49 +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
Steel Titanium
2b1b7b763f Fix these "may be used uninitialized in this function" errors with batching 2020-06-08 20:18:32 -04:00
Steel Titanium
468a9b96b7 Fix no previous prototype for TimeFunction 2020-06-08 19:56:24 -04:00
Steel Titanium
b8bbf5d9f4 Merge branch 'next' into sal-oglshaderport 2020-06-08 19:36:23 -04:00
SteelT
025b883eb0 Merge branch 'ogl-batching' into 'sal-oglshaderport' 
OpenGL draw call batching

See merge request STJr/SRB2!986
 2020-06-08 18:10:18 -04:00
SteelT
7e5a09ee3b Merge branch 'shaders-224-next-merge' into 'sal-oglshaderport' 
Shaders next merge

See merge request STJr/SRB2!985
 2020-06-08 18:07:53 -04:00
mazmazz
0ce8bdaea1 Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments 2020-06-08 11:57:57 -04:00
Digiku
cb99260b8a Merge branch 'buffer-offset-fix' into 'master' 
Strike null-pointer-arithmetic error in BUFFER_OFFSET

See merge request STJr/SRB2!989
 2020-06-08 11:56:48 -04:00
Digiku
885350dc9c Merge branch 'openmpt-deprecated-fix' into 'master' 
Fix OPENMPT deprecation error, openmpt_module_ctl_set

See merge request STJr/SRB2!990
 2020-06-08 10:37:46 -04: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
Lachlan Wright
f9c3a93cf3 Merge branch 'dashmode-fixes' into 'next' 
Dashmode fixes

See merge request STJr/SRB2!909
 2020-06-08 05:25:30 -04:00
Lachlan Wright
d7e7d977e6 Merge branch 'fix-continuing-mouse' into 'next' 
Fix mouse being grabbed in continue screen

See merge request STJr/SRB2!983
 2020-06-08 05:25:24 -04:00
mazmazz
156e194d82 CMAKE: Fix OSX CCache error 2020-06-08 03:08:58 -04:00
mazmazz
29c66c579c CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package 2020-06-08 00:38:13 -04:00
mazmazz
c6c83830e9 CMAKE: Add CCACHE support 2020-06-08 00:35:31 -04:00
mazmazz
167e889046 Fix OPENMPT deprecation error, openmpt_module_ctl_set 2020-06-08 00:09:29 -04:00
mazmazz
b62497911c Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
mazmazz
96124286e6 CMAKE: Configurable CPACK generator 2020-06-08 00:01:15 -04:00
mazmazz
502de28d38 CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo 2020-06-08 00:01:15 -04:00
mazmazz
c74eed0a2c Added SDL Mixer X to CMAKE (Windows only) 2020-06-08 00:01:15 -04:00
Zachary McAlpin
5495fef76c Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook 2020-06-07 22:42:43 -05:00
Hannu Hanhi
6cdb8c3320 Change some unsigned ints to UINT32 2020-06-07 21:32:52 +03:00
Hannu Hanhi
8ea66e3813 OpenGL draw call batching system 2020-06-07 21:20:52 +03:00
MascaraSnake
31bdf38f89 Merge branch 'nospinmovecut' into 'next' 
Don't cut momentum if landing in a roll

See merge request STJr/SRB2!972
 2020-06-07 13:24:19 -04:00
Hannu Hanhi
6961bba693 Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge 2020-06-07 20:01:05 +03:00