Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD (9ff8b739) · Commits · brokenspleentec / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

9ff8b739

Commit 9ff8b739 authored 6 years ago by fickleheart

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD

# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c

parents c30c3f7a 0e6083cf

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 1 addition, 0 deletions

src/d_player.h
src/g_game.c 3 additions, 0 deletions

src/g_game.c
src/info.c 2 additions, 2 deletions

src/info.c
src/k_kart.c 59 additions, 24 deletions

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

src/k_kart.h
src/p_enemy.c 1 addition, 0 deletions

src/p_enemy.c
src/p_inter.c 1 addition, 0 deletions

src/p_inter.c
src/p_mobj.c 34 additions, 14 deletions

src/p_mobj.c
src/p_spec.c 2 additions, 1 deletion

src/p_spec.c

with 104 additions and 41 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