Merge branch 'master' of https://bitbucket.org/Regalis11/repo

Conflicts: Subsurface_Solution.v12.suo
2015-07-06 22:48:47 +03:00
parent 0628e47b97 55b00e5ed0
commit 3af9b8183b
13 changed files with 309 additions and 144 deletions
@@ -227,7 +227,7 @@ namespace Subsurface

                GUIListBox jobList = new GUIListBox(new Rectangle(0,180,200,0), GUI.style, playerFrame);

-                foreach (Job job in Job.jobList)
+                foreach (JobPrefab job in JobPrefab.List)
                {
                    GUITextBlock jobText = new GUITextBlock(new Rectangle(0,0,0,20), job.Name, GUI.style, jobList);
                    GUIButton upButton = new GUIButton(new Rectangle(jobText.Rect.Width - 40, 0, 20, 20), "u", GUI.style, jobText);