Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

3f283fd2

Commit 3f283fd2 authored 6 years ago by Sal

Downloads
- Plain Diff

Merge branch 'flying-sharks-suck' into 'next'

Flying sharks suck

See merge request KartKrew/Kart-Public!46

parents 50018a3d d9f16d2a

Branches

Tags

1 merge request!2lol xd

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 2 additions, 1 deletion

src/d_player.h
src/dehacked.c 2 additions, 1 deletion

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

src/info.c
src/k_kart.c 71 additions, 35 deletions

src/k_kart.c
src/p_enemy.c 2 additions, 2 deletions

src/p_enemy.c
src/p_map.c 2 additions, 6 deletions

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

src/p_mobj.c

with 86 additions and 51 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