Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '224c94e89089317fac33aacb9319ab250301c98e' into develop

Browse Source
This commit is contained in:
Michael Nguyen
2013-10-28 15:37:24 -07:00
parent 89472eeccd 224c94e890
commit ed474d6b5d
24 changed files with 183 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/include/SimpleMenu.h
View File

@@ -8,7 +8,7 @@ A class for very simple menus structure
#include <JGui.h>
#include "WFont.h"
#include "hge/hgeparticle.h"
#include "WResourceManager.h"
#include "WResource_Fwd.h"
class SimpleMenu: public JGuiController
@@ -37,7 +37,7 @@ private:
public:
bool autoTranslate;
bool isMultipleChoice;
SimpleMenu(JGE*, int id, JGuiListener* listener, int fontId, float x, float y, const char * _title = "", int _maxItems = 7, bool centerHorizontal = true, bool centerVertical = true);
SimpleMenu(JGE*, WResourceManager*, int id, JGuiListener* listener, int fontId, float x, float y, const char * _title = "", int _maxItems = 7, bool centerHorizontal = true, bool centerVertical = true);
virtual ~SimpleMenu();
virtual void Render();
virtual bool CheckUserInput(JButton key);

2
projects/mtg/include/Wagic_Version.h
View File

@@ -1,6 +1,6 @@
/*
This file was auto-generated by ant build script on Sun, 06-May-2012 11::58:10
This file was auto-generated by ant build script on Sat, 26-Oct-2013 23::59:07
To make changes please edit the ant build script, otherwise your changes will be lost
Author: Michael Nguyen