Tobias Dahl
|
2b4616f09d
|
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
Escape-the-Dawn/GameWorld.cpp
|
2014-03-13 02:03:03 +01:00 |
|
Tobias Dahl
|
317d832e17
|
Fixa camera pos
|
2014-03-13 02:02:04 +01:00 |
|
Jace
|
db968e2902
|
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
|
2014-03-13 01:32:15 +01:00 |
|
Jace
|
99e1b4f8d6
|
Transform.Scale
|
2014-03-13 01:32:09 +01:00 |
|
Tobias Dahl
|
40cab3d448
|
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
Escape-the-Dawn/GameWorld.cpp
|
2014-03-13 01:06:07 +01:00 |
|
Tobias Dahl
|
9dd1733689
|
Ship is movable
|
2014-03-13 00:54:49 +01:00 |
|
Jace
|
21b2e3bdc1
|
AABB rendering
|
2014-03-13 00:27:21 +01:00 |
|
Jace
|
c4e7a2aade
|
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
Escape-the-Dawn/GameWorld.cpp
|
2014-03-12 21:47:26 +01:00 |
|
Jace
|
77aff3c078
|
WIP Shadow Mapping
|
2014-03-12 21:40:19 +01:00 |
|
Tobias Dahl
|
3bcdb3c067
|
Fixade en camera
|
2014-03-12 18:42:03 +01:00 |
|
Tobias Dahl
|
f48cb32008
|
Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
Escape-the-Dawn/GameWorld.cpp
Escape-the-Dawn/Renderer.cpp
Escape-the-Dawn/Systems/RenderSystem.cpp
|
2014-03-12 15:34:25 +01:00 |
|
Tobias Dahl
|
a71d10f79a
|
Lights Fixed.
Shadows not fixid.
|
2014-03-12 02:02:15 +01:00 |
|
Tobias Dahl
|
bb6cc1a23e
|
Ghettomerge
|
2014-03-11 22:32:49 +01:00 |
|
Jace
|
176852ebdd
|
No moar rebuild pls.
|
2014-03-11 13:53:21 +01:00 |
|