 Jace
|
d197ec07ad
|
Merge branch 'master' into directx
Conflicts:
include/Core/Engine.h
|
2015-10-20 15:13:20 +02:00 |
|
 Stiffly
|
cda75de366
|
Subarashii... Subarashiiiii ~
|
2015-10-19 14:59:05 +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 |
|
 tleety
|
4857e387ad
|
Added some new fonts
|
2015-10-13 17:02:20 +02:00 |
|
|
tleety
|
c431193764
|
Some debug code
|
2015-10-13 15:09:00 +02:00 |
|
|
Jace
|
cc9f868d5d
|
Frame is now sized to parent by default
|
2015-10-08 21:50:04 +02:00 |
|
|
Jace
|
08972919ae
|
Fixed texture rendering order when fading
|
2015-10-08 21:49:32 +02:00 |
|
|
Jace
|
371d21cb35
|
Buttons are now not clickable when they're hidden
|
2015-10-05 14:27:27 +02:00 |
|
|
Jace
|
c821fbfc25
|
Futile attempts to fix memory corruption bug
|
2015-10-01 16:12:53 +02:00 |
|
|
Jace
|
ff27eafccf
|
WORKING number frame
|
2015-10-01 13:09:27 +02:00 |
|
|
Jace
|
b42a09fce1
|
Semi-working number frame
|
2015-10-01 11:01:33 +02:00 |
|
|
Jace
|
7d9e3e00a4
|
Fixed out-of-range error in NumberFrame
|
2015-09-25 08:23:41 +02:00 |
|
|
Jace
|
7b47385674
|
Working NumberFrame and score indicator
|
2015-09-25 05:30:59 +02:00 |
|
|
Jace
|
8b3d9eb842
|
WIP HUD
|
2015-09-25 03:04:37 +02:00 |
|
|
Jace
|
c9854d2b83
|
Working volume sliders!
|
2015-09-25 02:19:37 +02:00 |
|
|
Jace
|
5f1963b8bc
|
Complete main menu without event bindings.
|
2015-09-25 01:29:14 +02:00 |
|
|
Jace
|
b83de44715
|
Working GUI Button
|
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 |
|