Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

ee2d88d4

Commit ee2d88d4 authored 5 years ago by toaster

Downloads
- Plain Diff

Merge branch 'internal-hotplug-stableid' into 'master'

Controller hotplug support.

See merge request STJr/SRB2Internal!342

parents 73146a83 e69dd9bd

Branches

Tags

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 8 additions, 8 deletions

src/d_netcmd.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/m_menu.c 124 additions, 15 deletions

src/m_menu.c
src/m_menu.h 4 additions, 1 deletion

src/m_menu.h
src/sdl/i_system.c 179 additions, 144 deletions

src/sdl/i_system.c
src/sdl/i_video.c 130 additions, 0 deletions

src/sdl/i_video.c
src/sdl/sdlmain.h 10 additions, 0 deletions

src/sdl/sdlmain.h

with 458 additions and 168 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment