 Adam
|
01743867f0
|
Merge remote-tracking branch 'origin/master'
Conflicts:
Escape-the-Dawn/GameWorld.h
|
2014-03-12 21:54:22 +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 |
|
|
Adam
|
4459f671d5
|
collisionz
|
2014-03-12 21:30:09 +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 |
|
 ViktorLjung
|
9ee4890f4a
|
Viktors antivirus är efterblivet.
|
2014-03-10 04:58:34 +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
|
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 |
|