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
Snippets
Deploy
Releases
Container registry
Model registry
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
colette
SRB2
Commits
b333770a
Commit
b333770a
authored
5 years ago
by
MascaraSnake
Browse files
Options
Downloads
Plain Diff
Merge branch 'next' into mapload-refactor
parents
cfadbb0f
d588e3ca
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
5
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
extras/conf/SRB2-22.cfg
+6521
-0
6521 additions, 0 deletions
extras/conf/SRB2-22.cfg
src/info.c
+4
-4
4 additions, 4 deletions
src/info.c
src/m_misc.c
+2
-0
2 additions, 0 deletions
src/m_misc.c
src/p_enemy.c
+1
-1
1 addition, 1 deletion
src/p_enemy.c
src/p_mobj.c
+1
-1
1 addition, 1 deletion
src/p_mobj.c
with
6529 additions
and
6 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
