Merge branch 'ring-penalty-graphic' into 'master' (602154fe) · Commits · Fancy2209 / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

602154fe

Commit 602154fe authored 5 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'ring-penalty-graphic' into 'master'

Weapon ammo penalty indicator

See merge request STJr/SRB2Internal!297

parents 121d8b78 89c49899

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/d_clisrv.c 8 additions, 0 deletions

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

src/d_clisrv.h
src/d_player.h 4 additions, 0 deletions

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

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

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

src/g_game.h
src/lua_playerlib.c 12 additions, 0 deletions

src/lua_playerlib.c
src/p_saveg.c 8 additions, 0 deletions

src/p_saveg.c
src/p_user.c 39 additions, 18 deletions

src/p_user.c
src/st_stuff.c 15 additions, 12 deletions

src/st_stuff.c

with 96 additions and 30 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