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

1313 commits

Author SHA1 Message Date
mazmazz
8ab76b50c6 Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx 2019-08-04 01:10:21 -04:00
mazmazz
ae05d8c0dd Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle 2019-08-03 23:38:49 -04:00
Alam Ed Arias
cc977161e6 SDL2: more consts 2019-07-29 19:22:14 -04:00
Alam Ed Arias
9e6c358a5b SDL2: more const in xpm code 2019-07-29 19:08:55 -04:00
Alam Ed Arias
827bd7e123 Merge remote-tracking branch 'private/master' into newicon 2019-07-29 19:04:19 -04:00
Alam Ed Arias
5286938853 Fix building with MSVC 2019-07-29 19:02:45 -04:00
Alam Ed Arias
644aba78d5 Merge branch 'public_next' into private 2019-07-29 18:31:01 -04:00
Alam Ed Arias
62e45e5f5b SDL2: fixed compiling mixer interface with MSVC 2019-07-29 17:56:35 -04:00
Steel Titanium
2778068921 Change it back to const char 2019-07-28 18:19:00 -04:00
Steel Titanium
1624338f10 Update mac icon 2019-07-28 17:06:01 -04:00
Steel Titanium
2cccab7655 More icon stuff 2019-07-27 01:13:54 -04:00
Steel Titanium
e6332f97d8 Fix crash with GME sounds when being freed 2019-07-27 01:13:54 -04:00
Steel Titanium
490e3fe9a9 Merge branch 'master' into musicplus-sdlmixerx 2019-07-22 22:20:08 -04:00
Steel Titanium
d44702cb0e Some fixup 2019-07-22 22:01:05 -04:00
Steel Titanium
1d5f417a86 Let's not use this 2019-07-16 19:26:16 -04:00
Steel Titanium
93acb98aa7 New icons 
Also update IMG_xpm.c
 2019-07-16 19:20:00 -04:00
Monster Iestyn
f266eda97b Merge branch 'public_next' 2019-07-16 18:28:49 +01:00
Steel Titanium
db525c43a7 Fix crash with GME sounds when being freed 2019-07-14 14:55:04 -04:00
Monster Iestyn
3fec42c436 Add static keyword to these variables for correctness 2019-07-14 16:23:01 +01:00
Steel Titanium
c0927754a1 Seperate declarations from code 2019-07-09 15:51:11 -04:00
Steel Titanium
ccecb4c6cd Some few comments 2019-07-09 00:56:22 -04:00
Steel Titanium
2b3118b288 Better loading code for modules 2019-06-29 20:35:31 -04:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
mazmazz
7bbd05e85d Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle 2019-06-29 18:33:45 -04:00
mazmazz
53fe455a8f Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle 2019-06-29 18:10:44 -04:00
mazmazz
14df513db6 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
mazmazz
11955ba838 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-06-29 15:02:07 -04:00
James R
9579f6ea9e Add font system to Makefile and Visual Studio project files 2019-06-26 16:33:59 -07:00
Steel Titanium
8e5593c207 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
 2019-06-11 17:48:00 -04:00
Latapostrophe
a35cea9243 chaos conflict 2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b Merge remote-tracking branch 'upstream/master' into gl_shaders 2019-06-10 16:21:46 -03:00
Monster Iestyn
67392baae0 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-06-09 20:04:08 +01:00
Monster Iestyn
c21b9e632a Merge branch 'next' into 2.1.24-prep 
# Conflicts:
#	debian-template/control
#	debian/changelog
 2019-06-07 23:18:31 +01:00
Alam Ed Arias
cd1c87ea71 Merge branch 'master' into next 2019-06-07 18:07:32 -04:00
Alam Ed Arias
d5c1fe6467 Merge branch 'gme-msvc' into 'master' 
Add GME to MSVC 10 solution

See merge request STJr/SRB2!448
 2019-06-07 18:06:51 -04:00
Steel Titanium
8d5207975d Merge branch 'master' into travis-deployer 
# Conflicts:
#	.travis.yml
 2019-06-07 16:56:19 -04:00
Monster Iestyn
474b70aa69 Update version to 2.1.24 2019-06-07 15:48:33 +01:00
Steel Titanium
813ccf71e5 Merge branch 'next' into public-musicplus-libopenmpt 2019-06-03 15:36:50 -04:00
Steel Titanium
ff040ccced Update libopenmpt to 0.4.4 2019-05-23 22:05:28 -04:00
Steel Titanium
ea29bae39e Forgot some references 2019-05-20 23:31:23 -04:00
Steel Titanium
991181afa2 circleci: Fix compiling error 2019-05-20 23:22:23 -04:00
Steel Titanium
2ede6dd29f Merge branch 'master' into public-musicplus-libopenmpt 2019-05-20 21:33:10 -04:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00
Monster Iestyn
c8e3748a1c Merge branch 'master' into next 2019-05-13 16:07:30 +01:00
Steel Titanium
2c4555493d Merge branch 'perpetual-modifier-updates' into 'master' 
Set modifiers in a non-reactive manner

See merge request STJr/SRB2!456
 2019-05-13 00:36:06 -04:00
TehRealSalt
da7e79ac83 Adjust file loading 
Many files converted to pk3, and we now have a distinct IWAD
 2019-05-12 20:58:26 -04:00
wolfy852
9ac41cca73 Merge remote-tracking branch 'remotes/pub/next' into v1 
# Conflicts:
#	src/d_netcmd.c
#	src/r_main.c
#	src/v_video.c
 2019-05-12 03:40:02 -05:00
wolfy852
93c706bfb8 Don't skip frames when connecting or paused 2019-05-08 09:39:45 -05:00
wolfy852
1136d88bd6 Merge remote-tracking branch 'remotes/srb2pub/next' into upstream-merge 2019-05-07 21:43:12 -05:00
wolfy852
2222738e1c Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next 
# Conflicts:
#	src/d_netcmd.c
#	src/doomdef.h
#	src/doomstat.h
#	src/f_finale.c
#	src/g_game.c
#	src/hu_stuff.c
#	src/m_menu.c
#	src/p_spec.c
#	src/p_user.c
#	src/r_main.c
#	src/r_things.c
#	src/s_sound.c
#	src/v_video.c
#	src/y_inter.c
 2019-05-06 22:40:12 -05:00