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

248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 ec25625b0a Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 
Conflicts:
	Escape-the-Dawn/plane.obj
 2014-03-12 22:42:59 +01:00
ViktorLjung 56ccc31e57 Stuff :3 2014-03-12 22:41:53 +01:00
Jace fef9c1f751 OBJ loader correct path for textures 2014-03-12 22:40:54 +01:00
Jace 29c364b28f Plane fixed. 2014-03-12 22:07:24 +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 f1f9fc4fc1 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-12 21:47:45 +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
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 3bcdb3c067 Fixade en camera 2014-03-12 18:42:03 +01:00
Tobias Dahl 4124510365 Alla obj filer (tror jag) 2014-03-12 18:31:01 +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
Tobias Dahl 33dbcc10a1 Ljus funkar 2014-03-11 21:35:24 +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 176852ebdd No moar rebuild pls. 2014-03-11 13:53:21 +01:00
Jace fb471aae51 Revamped model loading interface. 2014-03-11 13:27:01 +01:00
Tobias Dahl 15e4b35cb0 WIP Ljus Funkar typ 2014-03-11 09:59:18 +01:00
Tobias Dahl b53a921a37 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-11 09:45:03 +01:00
Jace c0c1cf113e Logging: Proper fix. 2014-03-11 09:44:25 +01:00
Tobias Dahl ed42706a0a WIP lights 2014-03-11 09:27:03 +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
Jace 2c4d8fde99 Logging hawtfix 2014-03-11 09:18:13 +01:00
Jace 8e4f44cfc5 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-11 04:19:09 +01:00
Jace 18f47b3603 OBJ class for representing .obj files. 2014-03-11 04:19:01 +01:00
Adam 5ce795be96 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-11 03:35:01 +01:00
Adam a7aad7679d attenuation on sound 2014-03-11 03:34:49 +01:00