Merge branch 'uncappedrevengeance' into next (12c2ddb1) · 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

12c2ddb1

Commit 12c2ddb1 authored 2 years ago by Eidolon

Downloads
- Plain Diff

Merge branch 'uncappedrevengeance' into next

Uncapped

See merge request STJr/SRB2!1856

# Conflicts:
#	src/dummy/i_system.c
#	src/win32/win_sys.c

parents 3597957a 6d1a3bfc

No related branches found

No related tags found

Loading

Changes 68

Hide whitespace changes

Inline Side-by-side

Showing

src/Makefile.d/versions.mk 1 addition, 1 deletion

src/Makefile.d/versions.mk
src/Sourcefile 3 additions, 0 deletions

src/Sourcefile
src/android/i_system.c 8 additions, 4 deletions

src/android/i_system.c
src/b_bot.c 1 addition, 1 deletion

src/b_bot.c
src/command.c 2 additions, 1 deletion

src/command.c
src/d_clisrv.c 33 additions, 5 deletions

src/d_clisrv.c
src/d_clisrv.h 4 additions, 1 deletion

src/d_clisrv.h
src/d_main.c 123 additions, 39 deletions

src/d_main.c
src/d_net.c 5 additions, 1 deletion

src/d_net.c
src/d_netcmd.c 2 additions, 1 deletion

src/d_netcmd.c
src/d_netfil.c 1 addition, 0 deletions

src/d_netfil.c
src/d_player.h 2 additions, 0 deletions

src/d_player.h
src/dummy/i_system.c 4 additions, 12 deletions

src/dummy/i_system.c
src/f_finale.c 101 additions, 102 deletions

src/f_finale.c
src/f_wipe.c 5 additions, 1 deletion

src/f_wipe.c
src/g_demo.c 2 additions, 1 deletion

src/g_demo.c
src/g_game.c 17 additions, 2 deletions

src/g_game.c
src/hardware/hw_drv.h 1 addition, 1 deletion

src/hardware/hw_drv.h
src/hardware/hw_main.c 157 additions, 46 deletions

src/hardware/hw_main.c
src/hardware/hw_md2.c 27 additions, 15 deletions

src/hardware/hw_md2.c

with 499 additions and 234 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