Commit Graph

5 Commits

Author SHA1 Message Date
ViktorLjung cb6b0a58d8 Resource manager OBJ vs Model conflict fixed 2014-04-27 08:07:18 +02:00
Jace 530b16e31b Extended OBJ loader to parse specular and normal maps 2014-04-23 17:56:04 +02:00
Jace 3470a80f40 Revert "Indentation style changed to Horstmann"
This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
2014-04-12 01:48:15 +02:00
Jace f2259f712d Indentation style changed to Horstmann 2014-04-11 21:53:05 +02:00
Jace a7985b1686 Adapted Escape the Dawn engine. 2014-04-05 21:20:48 +02:00