BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into HEAD

Browse Source 
Conflicts:
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/DrawFinalPass.cpp
This commit is contained in:
Teejoon
2016-03-01 12:11:27 +01:00
parent df7ace6626
commit 77eaa45702
60 changed files with 1481 additions and 701 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Engine/Network/Client.h
+1
View File
@@ -19,6 +19,7 @@
#include "Core/World.h"
#include "Core/EventBroker.h"
#include "Core/ConfigFile.h"
#include "Core/EPlayerDeath.h"
#include "Input/EInputCommand.h"
#include "Core/EPlayerDamage.h"
#include "../Game/Events/EDoubleJump.h"