Commit Graph

29 Commits

Author SHA1 Message Date
ViktorLjung c53913f63b Powerup timer fixed 2014-03-13 22:13:59 +01:00
ViktorLjung e3153fe130 freecamfixed 2014-03-13 21:50:53 +01:00
ViktorLjung 759302b789 Powerups 2014-03-13 21:42:28 +01:00
ViktorLjung 3a57a18b4f Kameran följer spelaren :3 2014-03-13 20:51:47 +01:00
ViktorLjung d0320477a9 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 19:39:23 +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
Tobias Dahl 7398cf09dd Smooth axeleration 2014-03-13 19:34:28 +01:00
Jace 4905c17ebf I Can't Believe It's Not Shadows!® 2014-03-13 16:29:34 +01:00
ViktorLjung 6f2ace6de7 tfgyhg 2014-03-13 03:57: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
ViktorLjung 8d88c33d80 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 03:29:27 +01:00
Jace ad082e89d8 Debug: red bounding boxes when colliding 2014-03-13 03:29:21 +01:00
ViktorLjung 1cff0571d3 Obstacles följer spelaren :) 2014-03-13 03:29:16 +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 f79d146232 :3 2014-03-13 02:15:44 +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
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
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
Tobias Dahl bb6cc1a23e Ghettomerge 2014-03-11 22:32:49 +01:00
Jace 43ab2473ec Click-to-camera! 2014-03-11 16:11:12 +01:00
Tobias Dahl 6a64f87176 CAMERA IS FUCKING GR8 NOW
DRAGON HELPED ME BUILD IT
2014-03-10 04:08:49 +01:00
Tobias Dahl cb16ecb5d6 WIP Camera Control 2014-03-10 01:51:00 +01:00
Tobias Dahl c60b490d01 Fixat lite classer osv 2014-03-03 19:47:12 +01:00