Jace 97e12ff550 Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.

2016-01-15 18:31:32 +01:00

..

Engine

Made EntityFileParser::MergeEntities return the base entity that was created, and also take an optional parent entity to create it under.

2016-01-15 18:31:32 +01:00

Game

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

2016-01-14 17:07:39 +01:00