Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2
# Conflicts: # src/common/rendering/gl/gl_shader.cpp # src/common/rendering/hwrenderer/data/buffers.h # src/common/rendering/v_video.h
This commit is contained in:
commit
57112742fe
298 changed files with 7614 additions and 3373 deletions
|
|
@ -128,6 +128,7 @@ EXTERN_CVAR(Int, vr_mode)
|
|||
EXTERN_CVAR(Bool, cl_customizeinvulmap)
|
||||
EXTERN_CVAR(Bool, log_vgafont)
|
||||
EXTERN_CVAR(Bool, dlg_vgafont)
|
||||
CVAR(Int, vid_renderer, 1, 0) // for some stupid mods which threw caution out of the window...
|
||||
|
||||
void DrawHUD();
|
||||
void D_DoAnonStats();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue