Changeset 10224

Timestamp:

Feb 1, 2015, 2:03:23 PM (9 years ago)

Author:

landauf

Message:

merged leveljoemeHS14

Location:

code/branches/presentationHS14merge

Files:

• . (modified) (1 prop)
• data/levels/AnihilationThreat.oxw (copied) (copied from code/branches/leveljoemeHS14/data/levels/AnihilationThreat.oxw)
• src/modules/notifications/NotificationQueueCEGUI.cc (modified) (1 diff)

code/branches/presentationHS14merge/src/modules/notifications/NotificationQueueCEGUI.cc

@@ -73 +73 @@
         this->position_ = Vector4(0.0, 0.0, 0.0, 0.0);
         this->alignment_ = "LeftAligned";
-        this->fontSize_ = 12;
+        this->fontSize_ = 10;
         this->fontColor_ = Vector4(1.0, 1.0, 1.0, 1.0);
         this->fontColorStr_ = "FFFFFFFF";