Merge remote-tracking branch 'origin/master' into software-clownery (7b54846a) · 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

7b54846a

Commit 7b54846a authored 5 years ago by Lactozilla

:speech_balloon:

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into software-clownery

parents a04834d1 5e5f3c4f

No related branches found

No related tags found

2 merge requests!734Rebase Keycodes only branch.,!578Software clownery

Changes 44

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/android/i_video.c 6 additions, 0 deletions

src/android/i_video.c
src/command.c 62 additions, 9 deletions

src/command.c
src/command.h 12 additions, 3 deletions

src/command.h
src/console.c 14 additions, 3 deletions

src/console.c
src/d_main.c 68 additions, 7 deletions

src/d_main.c
src/d_netcmd.c 2 additions, 0 deletions

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

src/dehacked.c
src/djgppdos/i_video.c 5 additions, 0 deletions

src/djgppdos/i_video.c
src/djgppdos/vid_vesa.c 5 additions, 0 deletions

src/djgppdos/vid_vesa.c
src/doomdef.h 3 additions, 0 deletions

src/doomdef.h
src/dummy/i_video.c 6 additions, 0 deletions

src/dummy/i_video.c
src/f_finale.c 216 additions, 187 deletions

src/f_finale.c
src/hardware/hw_bsp.c 3 additions, 1 deletion

src/hardware/hw_bsp.c
src/hardware/hw_cache.c 19 additions, 2 deletions

src/hardware/hw_cache.c
src/hardware/hw_draw.c 8 additions, 8 deletions

src/hardware/hw_draw.c
src/hardware/hw_main.c 18 additions, 1 deletion

src/hardware/hw_main.c
src/hardware/hw_main.h 1 addition, 0 deletions

src/hardware/hw_main.h
src/hu_stuff.c 3 additions, 0 deletions

src/hu_stuff.c
src/i_video.h 2 additions, 0 deletions

src/i_video.h
src/lua_consolelib.c 2 additions, 2 deletions

src/lua_consolelib.c

with 456 additions and 223 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