Merge branch 'nextmerge' into 'master' (b3f24ecb) · Commits · Andrew Bradley / Kart-Public · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Kart-Public
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents

Snippets Groups Projects

b3f24ecb

Commit b3f24ecb authored 6 years ago by Sryder

Downloads
- Plain Diff

Merge branch 'nextmerge' into 'master'

Merge In Vanilla Next

See merge request KartKrew/Kart!87

parents aece9340 799efd5b

No related branches found

No related tags found

Loading

Changes 38

Expand all Hide whitespace changes

Inline Side-by-side

Showing

README.md 0 additions, 2 deletions

README.md
SRB2.cbp 33 additions, 0 deletions

SRB2.cbp
src/CMakeLists.txt 2 additions, 0 deletions

src/CMakeLists.txt
src/Makefile 6 additions, 6 deletions

src/Makefile
src/byteptr.h 5 additions, 3 deletions

src/byteptr.h
src/command.c 12 additions, 0 deletions

src/command.c
src/d_main.c 12 additions, 14 deletions

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

src/d_main.h
src/d_netcmd.c 0 additions, 103 deletions

src/d_netcmd.c
src/d_netcmd.h 1 addition, 5 deletions

src/d_netcmd.h
src/doomdef.h 7 additions, 0 deletions

src/doomdef.h
src/doomtype.h 112 additions, 90 deletions

src/doomtype.h
src/f_finale.c 1 addition, 0 deletions

src/f_finale.c
src/hardware/hw_bsp.c 29 additions, 27 deletions

src/hardware/hw_bsp.c
src/hardware/hw_clip.c 465 additions, 0 deletions

src/hardware/hw_clip.c
src/hardware/hw_clip.h 24 additions, 0 deletions

src/hardware/hw_clip.h
src/hardware/hw_data.h 0 additions, 4 deletions

src/hardware/hw_data.h
src/hardware/hw_drv.h 0 additions, 15 deletions

src/hardware/hw_drv.h
src/hardware/hw_main.c 277 additions, 134 deletions

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

src/hardware/hw_md2.c

with 996 additions and 406 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