Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Kart-Public
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
brokenspleentec
Kart-Public
Commits
b9264821
Commit
b9264821
authored
6 years ago
by
wolfs
Browse files
Options
Downloads
Plain Diff
Merge branch 'upsidedown-brain' into next
# Conflicts: # src/k_kart.c # src/k_kart.h
parents
32d1f751
4c19c36f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/k_kart.c
+59
-20
59 additions, 20 deletions
src/k_kart.c
src/k_kart.h
+1
-0
1 addition, 0 deletions
src/k_kart.h
src/p_enemy.c
+1
-0
1 addition, 0 deletions
src/p_enemy.c
src/p_mobj.c
+24
-11
24 additions, 11 deletions
src/p_mobj.c
with
85 additions
and
31 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
