OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom

Browse source 
# Conflicts:
#	src/dobject.h
This commit is contained in:
Christoph Oelckers 2017-02-14 19:10:02 +01:00
commit 2234d36c7a
40 changed files with 1970 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/r_things.cpp
View file

@ -66,6 +66,7 @@
#include "p_maputl.h"
#include "g_levellocals.h"
#include "r_thread.h"
#include "events.h"
EXTERN_CVAR(Bool, st_scale)
EXTERN_CVAR(Bool, r_shadercolormaps)