Merge remote-tracking branch 'upstream/next' into lua-railstuff (943ede73) · 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

943ede73

Commit 943ede73 authored 5 years ago by Nami

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/next' into lua-railstuff

# Conflicts:
#	src/p_map.c

parents d865b72b 0345a32c

No related branches found

No related tags found

Loading

Changes 100

Expand all Hide whitespace changes

Inline Side-by-side

Showing

appveyor.yml 3 additions, 12 deletions

appveyor.yml
src/android/i_system.c 2 additions, 0 deletions

src/android/i_system.c
src/android/i_video.c 6 additions, 0 deletions

src/android/i_video.c
src/b_bot.c 39 additions, 29 deletions

src/b_bot.c
src/b_bot.h 1 addition, 0 deletions

src/b_bot.h
src/command.c 95 additions, 19 deletions

src/command.c
src/command.h 24 additions, 3 deletions

src/command.h
src/console.c 18 additions, 3 deletions

src/console.c
src/d_clisrv.c 36 additions, 11 deletions

src/d_clisrv.c
src/d_clisrv.h 24 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 84 additions, 29 deletions

src/d_main.c
src/d_netcmd.c 41 additions, 60 deletions

src/d_netcmd.c
src/dehacked.c 31 additions, 11 deletions

src/dehacked.c
src/djgppdos/i_video.c 5 additions, 0 deletions

src/djgppdos/i_video.c
src/djgppdos/vid_vesa.c 5 additions, 0 deletions

src/djgppdos/vid_vesa.c
src/doomdef.h 8 additions, 0 deletions

src/doomdef.h
src/doomstat.h 30 additions, 27 deletions

src/doomstat.h
src/dummy/i_system.c 2 additions, 0 deletions

src/dummy/i_system.c
src/dummy/i_video.c 6 additions, 0 deletions

src/dummy/i_video.c
src/f_finale.c 217 additions, 188 deletions

src/f_finale.c

with 677 additions and 393 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