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

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

Browse Source 
# Conflicts:
#	resources/Schema/Entities/Player.xml
This commit is contained in:
viktorljung
2016-02-12 00:28:24 +01:00
parent a36ed76a4e 04f77da6f1
commit 0370775820
51 changed files with 6688 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Game.cpp
+1 -1
View File
@@ -15,7 +15,7 @@
#include "Game/Systems/CapturePointHUDSystem.h"
#include "Game/Systems/PickupSpawnSystem.h"
#include "Game/Systems/DamageIndicatorSystem.h"
#include "Game/Systems/WeaponSystem.h"
#include "Game/Systems/Weapon/WeaponSystem.h"
#include "Rendering/AnimationSystem.h"
#include "Game/Systems/HealthHUDSystem.h"
#include "Rendering/BoneAttachmentSystem.h"