Merge remote-tracking branch 'lat/awful-mix' into awful-mix-fucked (0cdfaaa5) · 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

0cdfaaa5

Commit 0cdfaaa5 authored 4 years ago by James R.

Downloads
- Plain Diff

Merge remote-tracking branch 'lat/awful-mix' into awful-mix-fucked

parents 273b20d8 aad2401b

Loading

Changes 17

Hide whitespace changes

Inline Side-by-side

Showing

src/g_game.c 1 addition, 1 deletion

src/g_game.c
src/hardware/hw_defs.h 4 additions, 5 deletions

src/hardware/hw_defs.h
src/hardware/hw_drv.h 0 additions, 2 deletions

src/hardware/hw_drv.h
src/hardware/hw_glob.h 0 additions, 3 deletions

src/hardware/hw_glob.h
src/hardware/hw_main.c 115 additions, 203 deletions

src/hardware/hw_main.c
src/hardware/hw_main.h 3 additions, 5 deletions

src/hardware/hw_main.h
src/hardware/hw_md2.c 258 additions, 68 deletions

src/hardware/hw_md2.c
src/hardware/r_opengl/r_opengl.c 68 additions, 63 deletions

src/hardware/r_opengl/r_opengl.c
src/k_kart.c 6 additions, 3 deletions

src/k_kart.c
src/lua_hud.h 1 addition, 0 deletions

src/lua_hud.h
src/lua_hudlib.c 1 addition, 0 deletions

src/lua_hudlib.c
src/m_menu.c 15 additions, 53 deletions

src/m_menu.c
src/p_user.c 13 additions, 0 deletions

src/p_user.c
src/r_main.c 1 addition, 3 deletions

src/r_main.c
src/sdl/i_system.c 1 addition, 1 deletion

src/sdl/i_system.c
src/sdl/i_video.c 2 additions, 2 deletions

src/sdl/i_video.c
src/v_video.c 2 additions, 3 deletions

src/v_video.c

with 491 additions and 415 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