Commit Graph

211 Commits

Author SHA1 Message Date
ViktorLjung 357f370e4f fixade de små objekten 2014-03-14 01:09:30 +01:00
ViktorLjung 34263dc9a6 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 00:57:59 +01:00
ViktorLjung 4b9cb71cca Fixad FOV
Levelgen Spawnfrequency
2014-03-14 00:57:52 +01:00
Jace 23701c4ac2 GLM... radians pls. 2014-03-14 00:37:09 +01:00
ViktorLjung 11dd3ef7c3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 00:05:50 +01:00
Jace b206ca0e4f Moar files 2014-03-14 00:05:38 +01:00
ViktorLjung d7313641fc Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-14 00:01:27 +01:00
ViktorLjung 3378e75313 Powerup FOV fixed 2014-03-14 00:00:36 +01:00
Jace 3b4074cc17 Fixed setters for camera projection values 2014-03-13 23:59:39 +01:00
Jace 48f3553361 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/LevelGenerationSystem.cpp
2014-03-13 23:54:11 +01:00
Jace cbb8eac917 Children transforms relative to parents using TransformSystem::AbsolutePosition and TransformSystem::AbsoluteOrientation 2014-03-13 23:44:32 +01:00
ViktorLjung 18f7b977a3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/PlayerSystem.cpp
2014-03-13 23:08:56 +01:00
Tobias Dahl 28b83905e9 [WIP] Collisions and sun stuff 2014-03-13 23:02:08 +01:00
ViktorLjung 7013546314 powerup bugfix 2014-03-13 23:01:55 +01:00
ViktorLjung c53913f63b Powerup timer fixed 2014-03-13 22:13:59 +01:00
Tobias Dahl fe1605a158 [WIP] Saker 2014-03-13 22:00:34 +01:00
Tobias Dahl e9b83fc070 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 21:51:43 +01:00
ViktorLjung e3153fe130 freecamfixed 2014-03-13 21:50:53 +01:00
ViktorLjung b252eac7e7 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 21:42:39 +01:00
ViktorLjung 759302b789 Powerups 2014-03-13 21:42:28 +01:00
Tobias Dahl e28e26a0f3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 21:40:48 +01:00
Jace ebd54f0833 Delayed removal of entities. 2014-03-13 21:40:12 +01:00
Tobias Dahl 329262fe5a [WIP] Colliderar saker 2014-03-13 21:38:29 +01:00
Tobias Dahl 80a033e72e Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 21:01:54 +01:00
ViktorLjung d6a0cdca58 Missing powerup.obj 2014-03-13 20:59:45 +01:00
Tobias Dahl d503a28045 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 20:59:34 +01:00
Tobias Dahl 8f18fc87e3 [WIP] Frames 2014-03-13 20:59:25 +01:00
ViktorLjung 7eca33e663 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 20:51:59 +01:00
ViktorLjung 3a57a18b4f Kameran följer spelaren :3 2014-03-13 20:51:47 +01:00
Tobias Dahl 53c7609e11 Smoothare acceleration 2014-03-13 20:13:28 +01:00
Jimmy f76c0b336f Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
2014-03-13 19:58:17 +01:00
Jimmy f3ff391984 Frame And Rectangle work 2014-03-13 19:48:40 +01:00
ViktorLjung d0320477a9 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 19:39:23 +01:00
ViktorLjung f847c7ce23 Delete orig :P 2014-03-13 19:39:11 +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 47f7759566 More awesome shadows 2014-03-13 18:23:56 +01:00
ViktorLjung 36069b2c3b :O 2014-03-13 17:15:43 +01:00
Jace 235e9648ad F3: Toggle drawing bounding boxes 2014-03-13 16:46:07 +01:00
Jace 4905c17ebf I Can't Believe It's Not Shadows!® 2014-03-13 16:29:34 +01:00
Jace a711ea7db8 Fancy sounds 2014-03-13 16:28:39 +01:00
Jace b34d2d3dd0 Optimizations 2014-03-13 14:01:15 +01:00
Jace f8f9203141 Fixed fragment lights for Nvidia cards with 2048 max uniforms 2014-03-13 13:00:36 +01:00
Tobias Dahl 5478b84508 Fixed stuff 2014-03-13 04:49:19 +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