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

183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam d5ed8fc4f3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/Systems/CollisionSystem.cpp
	Escape-the-Dawn/Systems/SoundSystem.h
	Escape-the-Dawn/Systems/SoundsSystem.cpp
 2014-03-13 20:09:41 +01:00
Adam 5afb3932e9 Doppler effect 2014-03-13 20:00:41 +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
Jace 85c6a7db0d Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 03:05:28 +01:00
Jace 788582276d Red debug bounding boxes boilerplate 2014-03-13 03:05:22 +01:00
ViktorLjung 40725bd2d4 :) 2014-03-13 03:03:11 +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
ViktorLjung fad346d76f Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 02:40:02 +01:00
ViktorLjung e117d8d519 Moar lvls! 2014-03-13 02:39:55 +01:00
Jace 61b0d9e7d3 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-13 02:39:12 +01:00
Jace ded88eaadd Changed type of components container to make deleting more efficient 2014-03-13 02:39:08 +01:00
Jace e20516f993 Also scale bounds origin 2014-03-13 02:38:22 +01:00
Tobias Dahl 7991efedf8 Fix 2014-03-13 02:30:17 +01:00
ViktorLjung 80eb38f373 Missing .OBJ files 2014-03-13 02:23:03 +01:00
ViktorLjung be04c07333 :3 2014-03-13 02:16:51 +01:00
ViktorLjung f79d146232 :3 2014-03-13 02:15:44 +01:00
ViktorLjung 938dc0b7b2 LevelGen 2014-03-13 02:10:02 +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