Merge remote-tracking branch 'remotes/SRB2/vanilla-hotplug' into unfuck-gamepads
# Conflicts: # src/d_clisrv.c # src/d_netcmd.c # src/d_netcmd.h # src/dehacked.c # src/doomdef.h # src/g_game.c # src/hu_stuff.c # src/lua_baselib.c # src/m_menu.c # src/sdl/i_system.c # src/sdl/sdlmain.h
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- appveyor.yml 1 addition, 1 deletionappveyor.yml
- src/d_clisrv.c 14 additions, 7 deletionssrc/d_clisrv.c
- src/d_netcmd.c 43 additions, 7 deletionssrc/d_netcmd.c
- src/dehacked.c 1 addition, 1 deletionsrc/dehacked.c
- src/doomdef.h 2 additions, 2 deletionssrc/doomdef.h
- src/m_menu.c 1 addition, 1 deletionsrc/m_menu.c
- src/m_menu.h 4 additions, 1 deletionsrc/m_menu.h
- src/sdl/i_system.c 100 additions, 109 deletionssrc/sdl/i_system.c
- src/sdl/i_video.c 35 additions, 0 deletionssrc/sdl/i_video.c
- src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletionssrc/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
- src/sdl/sdlmain.h 5 additions, 0 deletionssrc/sdl/sdlmain.h
- src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletionssrc/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
Loading
Please register or sign in to comment