Merge branch 'pretty_stuff' into 'master' (66733d96) · 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

66733d96

Commit 66733d96 authored 7 years ago by toaster

Downloads
- Plain Diff

Merge branch 'pretty_stuff' into 'master'

Pretty stuff

See merge request STJr/SRB2Internal!131

parents a3b86a73 4f3c9b5f

No related branches found

No related tags found

No related merge requests found

Changes 32

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/console.c 46 additions, 40 deletions

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

src/console.h
src/d_clisrv.c 1 addition, 1 deletion

src/d_clisrv.c
src/d_netcmd.c 5 additions, 1 deletion

src/d_netcmd.c
src/dehacked.c 54 additions, 17 deletions

src/dehacked.c
src/doomdef.h 0 additions, 3 deletions

src/doomdef.h
src/doomstat.h 1 addition, 0 deletions

src/doomstat.h
src/f_finale.c 17 additions, 17 deletions

src/f_finale.c
src/g_game.c 5 additions, 3 deletions

src/g_game.c
src/hardware/hw_draw.c 184 additions, 31 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.h 1 addition, 1 deletion

src/hardware/hw_main.h
src/hu_stuff.c 49 additions, 67 deletions

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

src/hu_stuff.h
src/info.c 148 additions, 113 deletions

src/info.c
src/info.h 37 additions, 2 deletions

src/info.h
src/lua_baselib.c 1 addition, 10 deletions

src/lua_baselib.c
src/lua_hudlib.c 108 additions, 2 deletions

src/lua_hudlib.c
src/m_cheat.c 1 addition, 1 deletion

src/m_cheat.c
src/m_menu.c 25 additions, 52 deletions

src/m_menu.c
src/p_enemy.c 1 addition, 8 deletions

src/p_enemy.c

with 686 additions and 372 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