Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook (b973b432) · Commits · Ors / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

b973b432

"README.md" did not exist on "bbe93a6d31d9d9f7ac1c77c60800e9c2f2f5d810"

Commit b973b432 authored 4 years ago by ChaoLoveIceMDBoy

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook

parents b14f18c1 7317bbb6

No related branches found

No related tags found

Loading

Changes 18

Hide whitespace changes

Inline Side-by-side

Showing

src/d_netcmd.c 7 additions, 7 deletions

src/d_netcmd.c
src/g_game.c 58 additions, 20 deletions

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

src/g_game.h
src/hardware/hw_glob.h 0 additions, 3 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 53 additions, 111 deletions

src/hardware/hw_main.c
src/hu_stuff.c 1 addition, 1 deletion

src/hu_stuff.c
src/lua_baselib.c 9 additions, 0 deletions

src/lua_baselib.c
src/p_enemy.c 4 additions, 4 deletions

src/p_enemy.c
src/p_inter.c 7 additions, 7 deletions

src/p_inter.c
src/p_map.c 1 addition, 1 deletion

src/p_map.c
src/p_mobj.c 4 additions, 4 deletions

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

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

src/p_spec.c
src/p_tick.c 1 addition, 1 deletion

src/p_tick.c
src/p_user.c 25 additions, 24 deletions

src/p_user.c
src/st_stuff.c 9 additions, 10 deletions

src/st_stuff.c
src/y_inter.c 33 additions, 33 deletions

src/y_inter.c
src/y_inter.h 4 additions, 0 deletions

src/y_inter.h

with 224 additions and 233 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