-
- Downloads
Merge branch 'master' into leveltitle-tinkering
# Conflicts: # src/hu_stuff.h # src/st_stuff.c
Showing
- src/console.c 50 additions, 43 deletionssrc/console.c
- src/console.h 1 addition, 1 deletionsrc/console.h
- src/d_clisrv.c 21 additions, 6 deletionssrc/d_clisrv.c
- src/d_main.c 12 additions, 10 deletionssrc/d_main.c
- src/d_netcmd.c 5 additions, 1 deletionsrc/d_netcmd.c
- src/d_netfil.c 29 additions, 7 deletionssrc/d_netfil.c
- src/dehacked.c 54 additions, 29 deletionssrc/dehacked.c
- src/doomdef.h 0 additions, 3 deletionssrc/doomdef.h
- src/doomstat.h 1 addition, 0 deletionssrc/doomstat.h
- src/f_finale.c 35 additions, 27 deletionssrc/f_finale.c
- src/g_game.c 7 additions, 4 deletionssrc/g_game.c
- src/hardware/hw_cache.c 18 additions, 6 deletionssrc/hardware/hw_cache.c
- src/hardware/hw_defs.h 5 additions, 4 deletionssrc/hardware/hw_defs.h
- src/hardware/hw_draw.c 422 additions, 62 deletionssrc/hardware/hw_draw.c
- src/hardware/hw_drv.h 2 additions, 0 deletionssrc/hardware/hw_drv.h
- src/hardware/hw_main.c 607 additions, 519 deletionssrc/hardware/hw_main.c
- src/hardware/hw_main.h 1 addition, 1 deletionsrc/hardware/hw_main.h
- src/hardware/r_opengl/r_opengl.c 152 additions, 60 deletionssrc/hardware/r_opengl/r_opengl.c
- src/hu_stuff.c 49 additions, 67 deletionssrc/hu_stuff.c
- src/hu_stuff.h 1 addition, 2 deletionssrc/hu_stuff.h
Loading
Please register or sign in to comment