Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop (6f6fcc96) · Commits · X.organic / 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

6f6fcc96

Commit 6f6fcc96 authored 6 years ago by toaster

Downloads
- Plain Diff

Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop

# Conflicts:
#	src/info.c
#	src/sounds.c
#	src/sounds.h

parents 1e8ae8aa a794386d

Loading

Changes 15

Hide whitespace changes

Inline Side-by-side

Showing

src/d_player.h 3 additions, 1 deletion

src/d_player.h
src/dehacked.c 9 additions, 7 deletions

src/dehacked.c
src/g_game.c 41 additions, 4 deletions

src/g_game.c
src/g_input.c 20 additions, 34 deletions

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

src/g_input.h
src/info.c 38 additions, 36 deletions

src/info.c
src/info.h 7 additions, 7 deletions

src/info.h
src/k_kart.c 170 additions, 42 deletions

src/k_kart.c
src/m_menu.c 7 additions, 3 deletions

src/m_menu.c
src/p_inter.c 0 additions, 1 deletion

src/p_inter.c
src/p_mobj.c 9 additions, 105 deletions

src/p_mobj.c
src/p_user.c 4 additions, 3 deletions

src/p_user.c
src/sounds.c 1 addition, 0 deletions

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

src/sounds.h
src/w_wad.c 6 additions, 1 deletion

src/w_wad.c

with 317 additions and 244 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