Merge pull request #2 from Ewwweee/issue2

Scrollbar V2

assets/prefabs/BendingSkills.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "BendingSkills",
+    "shortName": "ASBL",
+    "description": "Don't know if it really is useful. But well. Good enough",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/CuttingSkill.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "CuttingSkills",
+    "shortName": "CS",
+    "description": "To improve your ability to slice things. Like potatoes or animalss",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/IDLE2.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "IDLE2",
+    "shortName": "ASBL",
+    "description": "To be the incarnation of sloth",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/NotAnyIdea.prefab

@@ -0,0 +1,8 @@
+{
+  "EventualSkillDescription": {
+    "name": "Dunno",
+    "shortName": "IDLE",
+    "description": "Increases laziness by 20% per level.",
+    "prerequisiteSkills": []
+  }
+}

assets/prefabs/ReadingSkills.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "ReadingSkills",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/RidingSkills.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "BikingSkills",
+    "shortName": "BKS",
+    "description": "Increase your handsomeness on every animals with four legs.",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill1.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill1",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill2.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill2",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill3.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill3",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill4.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill4",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill5.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill5",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill6.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill6",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill7.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill1",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/Skill8.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "Skill1",
+    "shortName": "RS",
+    "description": "For the intellectuals",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/prefabs/ThrowingSkills.prefab

@@ -0,0 +1,10 @@
+{
+  "EventualSkillDescription": {
+    "name": "ThrowingSkills",
+    "shortName": "TS",
+    "description": "Increase the speed and the range of the projectile. Can be useful if you want to show your anger",
+    "prerequisiteSkills": {
+      "ManualLaborEventualSkills:CraftingSkill": 3
+    }
+  }
+}

assets/ui/EventualSkillsTraining.ui

@@ -6,10 +6,13 @@
     "contents": [
       {
         "type": "RelativeLayout",
+
         "contents": [
           {
             "type": "UIBox",
             "layoutInfo": {
+            "width": 550,
+             "height": 500,
               "position-top": {
                 "target": "TOP",
                 "widget": "mainContent",
@@ -35,10 +38,11 @@
           {
             "type": "MigLayout",
             "id": "mainContent",
-            "colConstraints": "[100::200][10::200][min!]",
             "layoutInfo": {
-              "use-content-width": true,
-              "use-content-height": true,
+            "height" : 480,
+            "width" : 530,
+              "use-content-width": false,
+              "use-content-height": false,
               "position-vertical-center": {},
               "position-horizontal-center": {}
             },
@@ -59,13 +63,14 @@
               },
               {
                 "type": "MigLayout",
+                "rowConstraints": "[10::20]10[10::20]10[10::20]10[10::20]10[10::20]10[10::20]10[10::20]10[10::100]10[10::20]",
                 "layoutInfo": {
-                  "use-content-width": true,
-                  "use-content-height": true,
+                  "use-content-width": false,
+                  "use-content-height": false,
                   "position-vertical-center": {},
                   "position-horizontal-center": {}
                 },
-                "rowConstraints": "[min!][10::20][10::40]",
+
                 "layoutConstraints": "wrap 1, align left",
                 "contents": [
                   {

src/test/resources/logback-test.xml

@@ -0,0 +1,39 @@
+<!-- This file, when present as src/test/resources/logback-test.xml,
+     configures log filters during test execution.
+
+     To configure the logs generated while in-game, see
+     facades/PC/src/main/resources/logback.xml
+-->
+<configuration debug="false">
+  <!-- debug: reports all changes to this configuration on System.out -->
+
+  <include resource="org/terasology/engine/logback/setup.xml" />
+
+  <!-- JUnit collects console output during test execution
+       and include it in the report for the test. -->
+  <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+    </encoder>
+
+    <include resource="org/terasology/engine/logback/filter-reflections.xml" />
+  </appender>
+
+  <root level="${logOverrideLevel:-debug}">
+    <appender-ref ref="CONSOLE" />
+  </root>
+
+  <!-- NOTE You can add fine granular custom log-level overrides here.
+       This works in both ways; you can increase or decrease the log level
+       for specific packages or classes.
+
+       For example:
+
+        <logger name="org.terasology.engine.world" level="debug" />
+        <logger name="org.terasology.module.health.systems.HealthAuthoritySystem" level="error" />
+  -->
+  <logger name="org.terasology" level="${logOverrideLevel:-info}" />
+  <logger name="org.terasology.engine.i18n" level="warn" />
+  <logger name="org.reflections.Reflections" level="warn" />
+
+</configuration>