Merge branch 'master' into hud-cleaning (a4832638) · 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

a4832638

Commit a4832638 authored 6 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' into hud-cleaning

# Conflicts:
#	src/y_inter.c

parents aee7dce8 900cbf72

No related branches found

No related tags found

Loading

Changes 20

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 1 addition, 1 deletion

src/d_netcmd.c
src/d_player.h 9 additions, 0 deletions

src/d_player.h
src/dehacked.c 4 additions, 0 deletions

src/dehacked.c
src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/g_game.c 23 additions, 15 deletions

src/g_game.c
src/lua_maplib.c 2 additions, 0 deletions

src/lua_maplib.c
src/lua_playerlib.c 36 additions, 0 deletions

src/lua_playerlib.c
src/m_cheat.c 57 additions, 30 deletions

src/m_cheat.c
src/m_cheat.h 1 addition, 2 deletions

src/m_cheat.h
src/p_inter.c 3 additions, 7 deletions

src/p_inter.c
src/p_map.c 16 additions, 5 deletions

src/p_map.c
src/p_saveg.c 18 additions, 0 deletions

src/p_saveg.c
src/p_setup.c 7 additions, 2 deletions

src/p_setup.c
src/p_spec.c 3 additions, 3 deletions

src/p_spec.c
src/p_user.c 42 additions, 5 deletions

src/p_user.c
src/r_data.c 11 additions, 11 deletions

src/r_data.c
src/r_plane.c 13 additions, 2 deletions

src/r_plane.c
src/r_things.c 3 additions, 2 deletions

src/r_things.c
src/v_video.c 17 additions, 12 deletions

src/v_video.c
src/y_inter.c 6 additions, 2 deletions

src/y_inter.c

with 273 additions and 99 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