Merge branch 'public_next' (1935a2ff) · 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

1935a2ff

Commit 1935a2ff authored 8 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/d_clisrv.c
#	src/doomdef.h
#	src/p_map.c

parents 90166d7b c5717f8e

No related branches found

No related tags found

No related merge requests found

Changes 24

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
appveyor.yml 1 addition, 1 deletion

appveyor.yml
src/CMakeLists.txt 8 additions, 1 deletion

src/CMakeLists.txt
src/d_clisrv.c 139 additions, 70 deletions

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

src/d_clisrv.h
src/d_net.c 81 additions, 21 deletions

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

src/d_net.h
src/d_netcmd.c 20 additions, 9 deletions

src/d_netcmd.c
src/d_netfil.c 104 additions, 32 deletions

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

src/d_netfil.h
src/doomdef.h 1 addition, 1 deletion

src/doomdef.h
src/f_finale.c 3 additions, 2 deletions

src/f_finale.c
src/hu_stuff.c 14 additions, 2 deletions

src/hu_stuff.c
src/i_net.h 1 addition, 1 deletion

src/i_net.h
src/i_tcp.c 75 additions, 16 deletions

src/i_tcp.c
src/p_inter.c 2 additions, 2 deletions

src/p_inter.c
src/p_map.c 2 additions, 2 deletions

src/p_map.c
src/screen.c 1 addition, 1 deletion

src/screen.c
src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

src/sdl/macosx/Srb2mac.xcodeproj/project.pbxproj
src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj 2 additions, 2 deletions

src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj

with 466 additions and 167 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