Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode (2aa542d2) · 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

2aa542d2

Commit 2aa542d2 authored 4 years ago by toaster

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode

# Conflicts:
#	src/doomdef.h

parents e99d38ff 9cd9d2e0

No related branches found

No related tags found

Loading

Changes 21

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 1 addition, 1 deletion

src/d_clisrv.c
src/d_main.c 3 additions, 0 deletions

src/d_main.c
src/d_player.h 2 additions, 1 deletion

src/d_player.h
src/dehacked.c 2 additions, 1 deletion

src/dehacked.c
src/doomdef.h 2 additions, 2 deletions

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

src/doomstat.h
src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hu_stuff.c 2 additions, 2 deletions

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

src/hu_stuff.h
src/m_anigif.c 31 additions, 26 deletions

src/m_anigif.c
src/m_menu.c 1 addition, 1 deletion

src/m_menu.c
src/mserv.h 1 addition, 1 deletion

src/mserv.h
src/p_enemy.c 4 additions, 1 deletion

src/p_enemy.c
src/p_user.c 16 additions, 0 deletions

src/p_user.c
src/s_sound.c 5 additions, 0 deletions

src/s_sound.c
src/s_sound.h 6 additions, 6 deletions

src/s_sound.h
src/sdl/i_video.c 10 additions, 12 deletions

src/sdl/i_video.c
src/st_stuff.c 7 additions, 2 deletions

src/st_stuff.c
src/v_video.c 23 additions, 9 deletions

src/v_video.c
src/v_video.h 2 additions, 2 deletions

src/v_video.h

with 121 additions and 70 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