 Jace
|
db1baad3c1
|
After merge fixes
|
2015-10-08 23:59:26 +02:00 |
|
|
Jace
|
7f344263da
|
Merge branch 'master' into gui
Conflicts:
include/Game/GUI/HUD.h
src/game/Core/Renderer.cpp
|
2015-10-08 23:47:25 +02:00 |
|
|
Jace
|
7ee0bbc32b
|
Added first stage story
|
2015-10-08 23:41:59 +02:00 |
|
|
Jace
|
18e2891621
|
fixup: Loading frame
|
2015-10-08 23:40:58 +02:00 |
|
|
Jace
|
4978f204a7
|
First story frame
|
2015-10-08 21:52:40 +02:00 |
|
|
Jace
|
2f09cdce4c
|
Loading frame
|
2015-10-08 21:52:22 +02:00 |
|
|
Jace
|
77b54ab988
|
Created a Storyboard frame that can fade and pan between images
|
2015-10-08 21:52:09 +02:00 |
|
|
Jace
|
856053e3f2
|
Forgot this when moving game GUI to a subfolder... I guess.
|
2015-10-08 21:51:13 +02:00 |
|
|
Jace
|
7bf1d7cf24
|
Moved game GUI to its own subfolder
|
2015-10-08 10:46:28 +02:00 |
|