Commit Graph

246 Commits

Author SHA1 Message Date
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 93b2a18a6e Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 02:36:13 +01:00
Adam b35ad2732b SOUNDEMITTER COMPLETE!?!?!? 2014-03-10 02:36:02 +01:00
Jace 58c4a5e9d0 OpenAL libraries. 2014-03-10 02:35:33 +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
Tobias Dahl da62ed5ac6 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 00:50:04 +01:00
Tobias Dahl 5ef1e17ca4 Fixat ljus position 2014-03-10 00:49:55 +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 efb5a2c813 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 00:43:01 +01:00
Tobias Dahl 73fec32ab0 Renderer doneere 2014-03-10 00:42:42 +01:00
ViktorLjung 622533c9b9 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-10 00:25:16 +01:00
ViktorLjung 19e5ea1a66 Ny textur till skeppet 2014-03-10 00:25:07 +01:00
Jace 8be97a7871 Quaternion camera. 2014-03-10 00:24:26 +01:00
ViktorLjung 56d871cf54 Lite mer rendersystem 2014-03-10 00:08:32 +01:00
Adam ba6cc660ca Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-09 23:43:17 +01:00
Adam 14d6958675 Soundsystem 2014-03-09 23:43:04 +01:00
Tobias Dahl 9eb3b2cb4b Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/RenderSystem.cpp
2014-03-09 23:42:12 +01:00
Tobias Dahl 0e0293692c iug 2014-03-09 23:41:14 +01:00
Jace ce6b570520 Rendering FIXED :D 2014-03-09 23:39:54 +01:00
Adam 1b005cb84a Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
2014-03-09 22:42:49 +01:00
Adam 40e4fc610f soundsystem upd 2014-03-09 22:41:05 +01:00
ViktorLjung 3138eea0c2 Fixade lite i obj load 2014-03-09 21:27:33 +01:00
Tobias Dahl 9198c2dcb5 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-09 21:15:51 +01:00
Tobias Dahl d749bd3464 WIP Renderer 2014-03-09 21:15:40 +01:00
ViktorLjung fc4f1adf5f Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-09 21:08:07 +01:00
ViktorLjung 1cf158b3a2 RenderSystem 2014-03-09 21:07:51 +01:00
Tobias Dahl 0b67d7cc7b Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Renderer.cpp
2014-03-09 20:43:04 +01:00
Tobias Dahl a9e3e91203 WIP Renderer 2014-03-09 20:36:19 +01:00
Jace fcbf802cc2 Added Camera. 2014-03-09 20:32:57 +01:00
Tobias Dahl b5349ba93c Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn 2014-03-09 20:15:39 +01:00
Tobias Dahl 7a69bb3fac WIP Renderer 65% 2014-03-09 20:13:02 +01:00
Adam 6be310d248 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Systems/SoundsSystem.cpp
2014-03-09 20:10:34 +01:00
Adam 5c142d98ec Soundsystem update 2014-03-09 20:04:38 +01:00
Jace bca46de9e1 Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn
Conflicts:
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
2014-03-09 20:01:59 +01:00
Jace 34889b3b0e Entity properties using boost::any. You'll need Boost now. 2014-03-09 19:05:57 +01:00
Adam e4c443042b SoundSystem påbörjat 2014-03-09 18:13:14 +01:00
Jace c952953787 SystemFactory for dynamic creation and fetching of systems in a world. 2014-03-09 03:37:39 +01:00
Jace f767cdbc9c Fixed renderer shaders. Derp. 2014-03-07 22:18:32 +01:00
Jace f837a119b3 Viktor stuff even more fixed than before. 2014-03-07 21:27:41 +01:00
Jace 00c893b0dc Viktor stuff fixed 2014-03-07 21:25:41 +01:00
Jace 2e3afc7c7f Merge /cygdrive/d/Escape-the-Dawn 2014-03-07 21:24:56 +01:00
Jace 293e571c28 SOIL library files added. 2014-03-07 21:24:36 +01:00