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

9913cc39

Commit 9913cc39 authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'public_next'

# Conflicts:
#	src/g_game.c
#	src/p_setup.c
#	src/p_user.c
#	src/r_data.c

parents e5a0bd8b 3a9ce483

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/g_game.c 2 additions, 1 deletion

src/g_game.c
src/p_mobj.c 1 addition, 1 deletion

src/p_mobj.c
src/p_setup.c 1 addition, 1 deletion

src/p_setup.c
src/p_user.c 39 additions, 10 deletions

src/p_user.c
src/r_data.c 51 additions, 18 deletions

src/r_data.c
src/w_wad.c 25 additions, 3 deletions

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

src/w_wad.h

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