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

ba77b235

Commit ba77b235 authored 9 years ago by Yukita Mayako

Downloads
- Plain Diff

Merge branch 'match-rebalancing' into damage-control

Conflicts:
	src/p_inter.c
	src/p_user.c
	src/st_stuff.c

parents 6bc1a5fd bed8dc4c

Branches

Tags

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/g_game.c 1 addition, 0 deletions

src/g_game.c
src/lua_baselib.c 34 additions, 0 deletions

src/lua_baselib.c
src/p_inter.c 151 additions, 46 deletions

src/p_inter.c
src/p_local.h 2 additions, 0 deletions

src/p_local.h
src/p_mobj.c 11 additions, 9 deletions

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

src/p_mobj.h
src/p_setup.c 1 addition, 0 deletions

src/p_setup.c
src/p_user.c 64 additions, 68 deletions

src/p_user.c
src/st_stuff.c 1 addition, 1 deletion

src/st_stuff.c

with 266 additions and 124 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