ViktorLjung
|
cb6b0a58d8
|
Resource manager OBJ vs Model conflict fixed
|
2014-04-27 08:07:18 +02:00 |
|
Jace
|
de1290bf67
|
Added a few debug messages to ResourceManager.
No longer warns about hot-loading when a resource which causes a load chain is preloaded.
|
2014-04-23 17:58:11 +02:00 |
|
Jace
|
62abb3f964
|
Merge branch 'havok'
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/RenderSystem.cpp
src/Systems/RenderSystem.h
vs11/Returngeance/Returngeance.vcxproj
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-04-16 00:38:30 +02:00 |
|
Jace
|
e4e5068727
|
Resource manager refactoring
|
2014-04-13 03:42:12 +02:00 |
|
Jace
|
14feb3659b
|
Initial work for pre-caching resources in render system
|
2014-04-13 01:25:21 +02:00 |
|
Jace
|
04cb1f1204
|
Created resource manager
|
2014-04-13 00:20:51 +02:00 |
|