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

Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

Browse Source 
# Conflicts:
#	resources/DefaultConfig.ini
This commit is contained in:
stiffly
2016-03-03 17:32:04 +01:00
parent b7fac7103d fe36e8b423
commit 20c6caa408
154 changed files with 24530 additions and 1614 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/Game/Systems/Weapon/WeaponSystem.h
+2 -2
View File
@@ -9,8 +9,8 @@
#include "Core/EShoot.h"
#include "Core/EPlayerSpawned.h"
#include "Input/EInputCommand.h"
#include "Core/EntityFile.h"
#include "Core/EntityFileParser.h"
#include "Core/EntityXMLFile.h"
#include "Core/EntityXMLFileParser.h"
#include "Core/Octree.h"
#include "Collision/EntityAABB.h"
#include "Systems/SpawnerSystem.h"