Merge branch SRB2:next into playersetup-and-continue-lua (084f7bc4) · Commits · Lach / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Model experiments

Snippets Groups Projects

084f7bc4

Commit 084f7bc4 authored 1 year ago by Logan Aerl Arias

Downloads
- Plain Diff

Merge branch SRB2:next into playersetup-and-continue-lua

parents 7f51bb30 cf7adfc8

Branches sugoi-mac

No related tags found

No related merge requests found

Pipeline #2903 passed 1 year ago

Stage: build

Changes 66
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 6 additions, 4 deletions

src/CMakeLists.txt
src/Makefile 0 additions, 4 deletions

src/Makefile
src/Makefile.d/features.mk 0 additions, 4 deletions

src/Makefile.d/features.mk
src/Makefile.d/versions.mk 0 additions, 4 deletions

src/Makefile.d/versions.mk
src/b_bot.c 2 additions, 1 deletion

src/b_bot.c
src/blua/lvm.c 1 addition, 1 deletion

src/blua/lvm.c
src/command.c 3 additions, 3 deletions

src/command.c
src/console.c 0 additions, 6 deletions

src/console.c
src/d_main.c 12 additions, 0 deletions

src/d_main.c
src/deh_lua.c 12 additions, 3 deletions

src/deh_lua.c
src/deh_soc.c 13 additions, 9 deletions

src/deh_soc.c
src/deh_tables.c 1 addition, 0 deletions

src/deh_tables.c
src/doomdef.h 2 additions, 0 deletions

src/doomdef.h
src/doomstat.h 48 additions, 48 deletions

src/doomstat.h
src/f_finale.c 2 additions, 3 deletions

src/f_finale.c
src/f_finale.h 1 addition, 1 deletion

src/f_finale.h
src/g_demo.c 12 additions, 8 deletions

src/g_demo.c
src/g_game.c 34 additions, 25 deletions

src/g_game.c
src/g_game.h 3 additions, 2 deletions

src/g_game.h
src/g_input.c 14 additions, 15 deletions

src/g_input.c

with 166 additions and 141 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