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

fb7741a3

Commit fb7741a3 authored 9 years ago by Monster Iestyn

Downloads
- Plain Diff

Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git

parents 892776ee fbd9cb73

No related branches found

No related tags found

Loading

Changes 39

Hide whitespace changes

Inline Side-by-side

Showing

src/am_map.c 45 additions, 0 deletions

src/am_map.c
src/d_clisrv.c 13 additions, 11 deletions

src/d_clisrv.c
src/d_clisrv.h 6 additions, 5 deletions

src/d_clisrv.h
src/d_main.c 23 additions, 45 deletions

src/d_main.c
src/d_netcmd.c 3 additions, 3 deletions

src/d_netcmd.c
src/doomdef.h 1 addition, 4 deletions

src/doomdef.h
src/g_game.c 5 additions, 5 deletions

src/g_game.c
src/hardware/hw3sound.c 3 additions, 3 deletions

src/hardware/hw3sound.c
src/hardware/hw_draw.c 3 additions, 0 deletions

src/hardware/hw_draw.c
src/hardware/hw_light.c 2 additions, 2 deletions

src/hardware/hw_light.c
src/hardware/hw_main.h 2 additions, 0 deletions

src/hardware/hw_main.h
src/lua_baselib.c 33 additions, 6 deletions

src/lua_baselib.c
src/lua_hook.h 1 addition, 1 deletion

src/lua_hook.h
src/lua_mathlib.c 9 additions, 2 deletions

src/lua_mathlib.c
src/m_cheat.c 73 additions, 18 deletions

src/m_cheat.c
src/m_menu.c 49 additions, 21 deletions

src/m_menu.c
src/m_random.c 94 additions, 64 deletions

src/m_random.c
src/m_random.h 27 additions, 17 deletions

src/m_random.h
src/p_enemy.c 63 additions, 70 deletions

src/p_enemy.c
src/p_inter.c 62 additions, 34 deletions

src/p_inter.c

with 517 additions and 311 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