Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next (4128f826) · 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

4128f826

Commit 4128f826 authored 5 years ago by Nev3r

Downloads
- Plain Diff

Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next

# Conflicts:
#	src/lua_hooklib.c

parents ab133e50 d460e1e8

Loading

Changes 55

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 1 addition, 0 deletions

src/Makefile
src/android/i_video.c 4 additions, 6 deletions

src/android/i_video.c
src/b_bot.c 15 additions, 0 deletions

src/b_bot.c
src/console.c 47 additions, 13 deletions

src/console.c
src/d_clisrv.c 4 additions, 3 deletions

src/d_clisrv.c
src/d_main.c 2 additions, 3 deletions

src/d_main.c
src/d_netcmd.c 4 additions, 3 deletions

src/d_netcmd.c
src/d_player.h 4 additions, 0 deletions

src/d_player.h
src/dehacked.c 9 additions, 3 deletions

src/dehacked.c
src/djgppdos/i_video.c 1 addition, 4 deletions

src/djgppdos/i_video.c
src/djgppdos/vid_vesa.c 2 additions, 4 deletions

src/djgppdos/vid_vesa.c
src/dummy/i_video.c 4 additions, 6 deletions

src/dummy/i_video.c
src/g_demo.c 2501 additions, 0 deletions

src/g_demo.c
src/g_demo.h 86 additions, 0 deletions

src/g_demo.h
src/g_game.c 21 additions, 2479 deletions

src/g_game.c
src/g_game.h 1 addition, 64 deletions

src/g_game.h
src/hardware/hw_draw.c 2 additions, 2 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 17 additions, 11 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 2 additions, 2 deletions

src/hardware/hw_md2.c

with 2729 additions and 2603 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