Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites (c7066118) · 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

c7066118

Commit c7066118 authored 8 years ago by toaster

Downloads
- Plain Diff

Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into flat_sprites

# Conflicts:
#	src/dehacked.c
#	src/p_inter.c
#	src/p_pspr.h

parents 28523760 31d3c09d

No related branches found

No related tags found

No related merge requests found

Changes 46

Expand all Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 21 additions, 21 deletions

.travis.yml
README.md 22 additions, 0 deletions

README.md
readme.txt 0 additions, 155 deletions

readme.txt
src/b_bot.c 7 additions, 5 deletions

src/b_bot.c
src/command.c 53 additions, 10 deletions

src/command.c
src/d_clisrv.c 8 additions, 2 deletions

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

src/d_clisrv.h
src/d_netcmd.c 8 additions, 15 deletions

src/d_netcmd.c
src/d_player.h 46 additions, 27 deletions

src/d_player.h
src/dehacked.c 154 additions, 167 deletions

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

src/doomdata.h
src/doomdef.h 61 additions, 23 deletions

src/doomdef.h
src/f_finale.c 1 addition, 1 deletion

src/f_finale.c
src/g_game.c 38 additions, 4 deletions

src/g_game.c
src/hardware/hw_light.c 3 additions, 10 deletions

src/hardware/hw_light.c
src/hardware/hw_md2.c 134 additions, 15 deletions

src/hardware/hw_md2.c
src/i_tcp.c 3 additions, 1 deletion

src/i_tcp.c
src/info.c 168 additions, 164 deletions

src/info.c
src/info.h 143 additions, 140 deletions

src/info.h
src/locale/en.po 0 additions, 5 deletions

src/locale/en.po

with 875 additions and 767 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