RingRacers/src/sdl
Monster Iestyn 7989e9a482 Merge branch 'public_next'
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
2018-11-10 15:41:57 +00:00
..
macosx Change version number to 2.1.20 2017-11-08 15:06:42 +00:00
SDL_main
SRB2Pandora
CMakeLists.txt
dosstr.c
endtxt.c Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 2017-09-16 20:26:04 +01:00
endtxt.h
hwsym_sdl.c Revert "Fix screenshot functionality in fullscreen in SDL2" 2018-03-18 18:33:53 +00:00
hwsym_sdl.h
i_cdmus.c FUNCMATH fun 2016-06-12 16:08:48 -04:00
i_main.c SDL: disable check for noreturn 2018-01-04 14:29:29 -05:00
i_net.c Revert "Merge branch 'RemoveINetC' into 'master'" 2016-07-21 14:42:00 -04:00
i_system.c Merge branch 'public_next' 2018-11-10 15:41:57 +00:00
i_ttf.c Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 2017-09-16 20:26:04 +01:00
i_ttf.h Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 2017-09-16 20:26:04 +01:00
i_video.c Merge branch 'public_next' 2018-11-10 15:41:57 +00:00
IMG_xpm.c SDL: update IMG_xpm.c 2018-08-10 17:09:11 -04:00
MakeCYG.cfg
Makefile.cfg Removed references to console ports and WinCE in sdl/Makefile.cfg 2017-09-15 17:12:53 +01:00
MakeNIX.cfg Removed all support for Dreamcast, XBox, PSP, PS3, GP2X, Wii, and WinCE from files in the sdl/ folder. If you wanted these ports, use the SDL 1.2 code in sdl12 2017-09-16 20:26:04 +01:00
mixer_sound.c Update copyright info on some files 2018-11-01 14:47:19 -04:00
ogl_sdl.c Fix wipes in low resolutions 2018-03-18 17:12:12 +00:00
ogl_sdl.h Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
SDL_icon.xpm Fix white being treated as transparent. 2018-08-10 19:02:03 -04:00
sdl_sound.c Merge branch 'public_next' 2018-10-20 15:31:48 +01:00
sdlmain.h Clipboard copy/paste testing 2016-11-03 01:43:57 -07:00
srb2.ttf
Srb2SDL-vc9.vcproj
Srb2SDL-vc10.vcxproj MSVC2015: fixup 2018-01-02 13:22:10 -05:00
Srb2SDL-vc10.vcxproj.filters MSVC2015: fixup 2018-01-02 13:22:10 -05:00
Srb2SDL.dsp
Srb2SDL.dsw
Srb2SDL.ico
Srb2SDL.props MSVC: Move x86/x64 settings into commons props 2016-05-22 21:55:55 -04:00