 Jace
|
47f7759566
|
More awesome shadows
|
2014-03-13 18:23:56 +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 |
|
|
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 |
|
|
Jace
|
ad082e89d8
|
Debug: red bounding boxes when colliding
|
2014-03-13 03:29:21 +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 |
|
 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
|
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 |
|
|
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 |
|