Merge branch 'next' into 'addplayer' (09f445f2) · Commits · STJr / SRB2 · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

SRB2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry

Snippets Groups Projects

09f445f2

Commit 09f445f2 authored 3 years ago by Claire Ellis

:speech_balloon:

Downloads
- Plain Diff

Merge branch 'next' into 'addplayer'

# Conflicts:
#   src/g_game.c

parents 18c47afc 28f44181

No related branches found

No related tags found

Loading

Changes 34

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 0 deletions

README.md
extras/conf/SRB2-22.cfg 1 addition, 0 deletions

extras/conf/SRB2-22.cfg
src/CMakeLists.txt 1 addition, 0 deletions

src/CMakeLists.txt
src/blua/Makefile.cfg 2 additions, 1 deletion

src/blua/Makefile.cfg
src/console.c 8 additions, 2 deletions

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

src/d_main.c
src/d_ticcmd.h 3 additions, 0 deletions

src/d_ticcmd.h
src/deh_tables.c 73 additions, 0 deletions

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

src/f_finale.c
src/g_demo.c 12 additions, 0 deletions

src/g_demo.c
src/g_game.c 86 additions, 74 deletions

src/g_game.c
src/g_game.h 20 additions, 0 deletions

src/g_game.h
src/g_input.c 28 additions, 20 deletions

src/g_input.c
src/g_input.h 28 additions, 5 deletions

src/g_input.h
src/hardware/hw_main.c 6 additions, 9 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 1 addition, 1 deletion

src/hardware/hw_main.h
src/i_system.h 12 additions, 0 deletions

src/i_system.h
src/lua_baselib.c 3 additions, 1 deletion

src/lua_baselib.c
src/lua_hook.h 4 additions, 0 deletions

src/lua_hook.h
src/lua_hooklib.c 73 additions, 1 deletion

src/lua_hooklib.c

with 426 additions and 115 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