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

71 Commits

Author SHA1 Message Date
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
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 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 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
Adam 01743867f0 Merge remote-tracking branch 'origin/master' 
Conflicts:
	Escape-the-Dawn/GameWorld.h
 2014-03-12 21:54:22 +01:00
ViktorLjung bd5cc13d5b Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-12 21:33:40 +01:00
Adam 4459f671d5 collisionz 2014-03-12 21:30:09 +01:00
ViktorLjung 517b4db8b7 Level gen 2014-03-12 21:29:52 +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 bb6cc1a23e Ghettomerge 2014-03-11 22:32:49 +01:00
Jace 43ab2473ec Click-to-camera! 2014-03-11 16:11:12 +01:00
Jace f027773af8 F1: Wireframe, F2: Draw normals 2014-03-11 15:47:02 +01:00
Jace 6c6ce62e9a Debug draw normals. 2014-03-11 14:46:43 +01:00
Jace fb471aae51 Revamped model loading interface. 2014-03-11 13:27:01 +01:00
Tobias Dahl 6fec459a55 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/GameWorld.h
 2014-03-11 09:20:18 +01:00
Tobias Dahl 0ec0022d6a WIP Lights 2014-03-11 09:18:51 +01:00
Adam a7aad7679d attenuation on sound 2014-03-11 03:34:49 +01:00
Jace 57e2e404bc HALLELUJAH 2014-03-10 04:44:35 +01:00
Jace 6ea376fb54 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 04:40:14 +01:00
Jace c65d5ca77d OPENAL BUG FIXED, FFS 2014-03-10 04:40:08 +01:00
Tobias Dahl 2ecb34a65b Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 04:09:00 +01:00
Tobias Dahl 6a64f87176 CAMERA IS FUCKING GR8 NOW 
DRAGON HELPED ME BUILD IT
 2014-03-10 04:08:49 +01:00
Adam 00cff91a73 soundsystem strular 2014-03-10 03:46:41 +01:00
Adam b35ad2732b SOUNDEMITTER COMPLETE!?!?!? 2014-03-10 02:36:02 +01:00
Adam 0bdabe3855 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/Systems/SoundsSystem.cpp
 2014-03-10 01:59:48 +01:00
Jace 277cd7a011 Cursor reset. 2014-03-10 01:58:36 +01:00
Adam 720d9d8776 Soundsystem ALMOST DONE 2014-03-10 01:58:29 +01:00
Tobias Dahl cb16ecb5d6 WIP Camera Control 2014-03-10 01:51:00 +01:00
ViktorLjung 1baa3fc802 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 00:49:04 +01:00
ViktorLjung 928c6be1fe Rör på kameran!!! :D 2014-03-10 00:48:48 +01:00
Tobias Dahl 73fec32ab0 Renderer doneere 2014-03-10 00:42:42 +01:00