Merge branch 'permission-overhaul'. Closes #49

Conflicts: Barotrauma/BarotraumaShared/Source/DebugConsole.cs Barotrauma/BarotraumaShared/Source/Networking/ChatMessage.cs
2017-12-20 19:35:58 +02:00
parent d03dd40336 b3c3970209
commit ce37411a29
19 changed files with 1126 additions and 268 deletions
@@ -7,12 +7,8 @@ namespace Barotrauma
    {
        public static List<GUIComponent> MessageBoxes = new List<GUIComponent>();

-        const int DefaultWidth=400, DefaultHeight=250;
-
-        //public delegate bool OnClickedHandler(GUIButton button, object obj);
-        //public OnClickedHandler OnClicked;
-
-        //GUIFrame frame;
+        public const int DefaultWidth = 400, DefaultHeight = 250;
+        
        public GUIButton[] Buttons;

        public static GUIComponent VisibleBox