Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
6f1ce5c1
Commit
6f1ce5c1
authored
8 years ago
by
toaster
Browse files
Options
Downloads
Plain Diff
Merge branch 'next' of
http://git.magicalgirl.moe/STJr/SRB2.git
into slopes_n_objects
parents
8ad72232
405237d3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
3 merge requests
!156
A spike bug no more
,
!130
Get any patch
,
!119
Fixing various problems with MF_SOLID collision
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/g_game.c
+1
-1
1 addition, 1 deletion
src/g_game.c
src/m_misc.c
+2
-0
2 additions, 0 deletions
src/m_misc.c
src/p_spec.c
+2
-2
2 additions, 2 deletions
src/p_spec.c
with
5 additions
and
3 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
