Merge remote-tracking branch 'origin/master' into ResolutionChange

This commit is contained in:
Tleety
2016-02-19 13:17:31 +01:00
28 changed files with 639 additions and 69 deletions
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Events
{
struct ButtonClicked : public Event {
std::string EntityName = "DEFAULT STRING USED";
std::string EntityName;
EntityWrapper Entity;
};
}
+2 -1
View File
@@ -7,7 +7,8 @@ namespace Events
{
struct ButtonPressed : public Event {
std::string EntityName = "DEFAULT STRING USED";
std::string EntityName;
EntityWrapper Entity;
};
}
+4 -1
View File
@@ -6,7 +6,10 @@
namespace Events
{
struct ButtonReleased : public Event { };
struct ButtonReleased : public Event {
std::string EntityName;
EntityWrapper Entity;
};
}