BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
195 Commits 1 Branch 0 Tags
e9b83fc0709d3f534ddbbe5068dd585a52989166
Commit Graph

32 Commits

Author SHA1 Message Date
ViktorLjung 3a57a18b4f Kameran följer spelaren :3 2014-03-13 20:51:47 +01:00
ViktorLjung 01f2ebfa20 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
 2014-03-13 19:36:03 +01:00
Jace 4905c17ebf I Can't Believe It's Not Shadows!® 2014-03-13 16:29:34 +01:00
Jace b34d2d3dd0 Optimizations 2014-03-13 14:01:15 +01:00
Tobias Dahl c38cd38aae Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/Renderer.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
 2014-03-13 03:56:39 +01:00
Tobias Dahl 461a039d87 Fixat med ljus 2014-03-13 03:52:19 +01:00
Adam 192589f9e5 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
 2014-03-13 03:01:53 +01:00
Adam 76da942fdb Collision with everything omfg 2014-03-13 02:56:29 +01:00
Tobias Dahl 7991efedf8 Fix 2014-03-13 02:30:17 +01:00
ViktorLjung ab637c957e Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 02:05:56 +01:00
ViktorLjung c32d941171 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/Systems/PlayerSystem.cpp
 2014-03-13 02:05:47 +01:00
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
ViktorLjung 2e85efd826 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/plane.obj
 2014-03-13 02:02:41 +01:00
Tobias Dahl 317d832e17 Fixa camera pos 2014-03-13 02:02:04 +01:00
Adam 41e0c7b07a COLLIBRI 2014-03-13 01:49:42 +01:00
Adam ca09d03d2b Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
 2014-03-13 01:49:08 +01:00
Adam 5ae8a15bcf Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/GameWorld.h
 2014-03-13 01:45:27 +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
ViktorLjung 5629312960 Mer LevelGeneration 2014-03-13 00:30:01 +01:00
Adam 2beaa22758 moar collisionz 2014-03-13 00:29:47 +01:00
Jace 21b2e3bdc1 AABB rendering 2014-03-13 00:27:21 +01:00
ViktorLjung 56ccc31e57 Stuff :3 2014-03-12 22:41:53 +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