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

Merge remote-tracking branch 'origin/master' into Sound+Particles

Browse Source 
Conflicts:
	src/GameWorld.cpp
This commit is contained in:
Stiffly
2014-06-04 05:30:42 +02:00
parent 72a8ee9080 3c17ab6037
commit e39e1eda89
10 changed files with 326 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Components/SpawnPoint.h
+2
View File
@@ -8,6 +8,8 @@ namespace Components
struct SpawnPoint : Component
{
EntityID Player;
virtual SpawnPoint* Clone() const override { return new SpawnPoint(*this); }
};