Merge branch 'master' into newcontrols (a9b80bf1) · Commits · STJr / SRB2 · GitLab

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

a9b80bf1

Commit a9b80bf1 authored 5 years ago by fickleheart

Downloads
- Plain Diff

Merge branch 'master' into newcontrols

# Conflicts:
#	src/d_netcmd.c
#	src/g_game.c
#	src/g_game.h
#	src/m_menu.c

parents 1f88c70d c27d062c

No related branches found

No related tags found

Loading

Changes 75

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 37 additions, 17 deletions

.travis.yml
CMakeLists.txt 0 additions, 1 deletion

CMakeLists.txt
appveyor.yml 145 additions, 145 deletions

appveyor.yml
assets/CMakeLists.txt 6 additions, 1 deletion

assets/CMakeLists.txt
debian-template/control 2 additions, 0 deletions

debian-template/control
deployer/travis/deployer_defaults.sh 8 additions, 8 deletions

deployer/travis/deployer_defaults.sh
extras/conf/SRB2-22.cfg 5 additions, 5 deletions

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 1 addition, 5 deletions

src/CMakeLists.txt
src/d_clisrv.c 3 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 22 additions, 5 deletions

src/d_main.c
src/d_net.h 2 additions, 0 deletions

src/d_net.h
src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/dehacked.c 26 additions, 10 deletions

src/dehacked.c
src/dehacked.h 1 addition, 1 deletion

src/dehacked.h
src/doomdef.h 5 additions, 0 deletions

src/doomdef.h
src/f_finale.c 9 additions, 5 deletions

src/f_finale.c
src/f_finale.h 6 additions, 1 deletion

src/f_finale.h
src/f_wipe.c 190 additions, 44 deletions

src/f_wipe.c
src/g_game.c 125 additions, 40 deletions

src/g_game.c
src/hardware/hw_cache.c 98 additions, 72 deletions

src/hardware/hw_cache.c

with 692 additions and 364 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