 Jace
|
d197ec07ad
|
Merge branch 'master' into directx
Conflicts:
include/Core/Engine.h
|
2015-10-20 15:13:20 +02:00 |
|
|
Jace
|
a782e6b40a
|
Successful DirectX context through GLFW, praise Gaben!
|
2015-10-19 13:39:00 +02:00 |
|
|
Jace
|
13360856f9
|
Separated OpenGL specific code into its own "compilation unit"
|
2015-10-19 13:37:59 +02:00 |
|
 Stiffly
|
64f903a6b6
|
WIP
|
2015-10-15 13:48:05 +02:00 |
|
|
Jace
|
08972919ae
|
Fixed texture rendering order when fading
|
2015-10-08 21:49:32 +02:00 |
|
|
Jace
|
7b47385674
|
Working NumberFrame and score indicator
|
2015-09-25 05:30:59 +02:00 |
|
|
Jace
|
5f1963b8bc
|
Complete main menu without event bindings.
|
2015-09-25 01:29:14 +02:00 |
|
|
Jace
|
8e00b76036
|
Error texture for texture frames when texture is missing
|
2015-09-25 01:29:13 +02:00 |
|
|
Jace
|
1d500eb4f6
|
First iteration of GUI code. GUI is rendered on top of everything, world still separate.
|
2015-09-25 01:29:13 +02:00 |
|