OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into qzdoom

Browse source 
# Conflicts:
#	src/r_plane.cpp
#	src/r_plane.h
This commit is contained in:
Magnus Norddahl 2017-01-16 06:03:21 +01:00
commit 1c3440e391
104 changed files with 3243 additions and 2832 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/r_utility.cpp
View file

@ -57,6 +57,7 @@
#include "r_utility.h"
#include "d_player.h"
#include "p_local.h"
#include "g_levellocals.h"
#include "p_maputl.h"
#include "math/cmath.h"