 Jace
|
0b7c383e8a
|
Merge branch 'havok'
Conflicts:
src/GameWorld.cpp
src/Systems/PhysicsSystem.cpp
src/Systems/PhysicsSystem.h
vs11/Returngeance/Returngeance.vcxproj.filters
|
2014-04-24 23:11:16 +02:00 |
|
 ViktorLjung
|
613610d5b1
|
Fixed camera view matrix.
|
2014-04-24 19:49:14 +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
|
d13c19d654
|
Removed unused components
|
2014-04-12 18:36:06 +02:00 |
|
|
ViktorLjung
|
04fff4a27b
|
Changed toolset to vs11, for future Havok implementation.
|
2014-04-12 01:59:55 +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
|
4c081d0e1c
|
Indentation style changed to Allman
Using Artistic Style (http://astyle.sourceforge.net/)
Options:
--style=allman
--indent=tab
--keep-one-line-blocks
--align-pointer=type
--align-reference=name
|
2014-04-11 20:59:42 +02:00 |
|
|
Jace
|
ad2862bf84
|
A gray tank! :D
|
2014-04-05 21:20:49 +02:00 |
|
|
Jace
|
a7985b1686
|
Adapted Escape the Dawn engine.
|
2014-04-05 21:20:48 +02:00 |
|