diff --git a/android/assets/1280x720/teleport-cloak.p b/android/assets/1280x720/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/1280x720/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/1280x800/teleport-cloak.p b/android/assets/1280x800/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/1280x800/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/1366x768/teleport-cloak.p b/android/assets/1366x768/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/1366x768/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/1920x1080/teleport-cloak.p b/android/assets/1920x1080/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/1920x1080/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/1920x1200/teleport-cloak.p b/android/assets/1920x1200/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/1920x1200/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/2560x1440/teleport-cloak.p b/android/assets/2560x1440/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/2560x1440/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/800x480/teleport-cloak.p b/android/assets/800x480/teleport-cloak.p new file mode 100755 index 0000000..4b35fe9 --- /dev/null +++ b/android/assets/800x480/teleport-cloak.p @@ -0,0 +1,138 @@ +hexagon +- Delay - +active: false +- Duration - +lowMin: 400.0 +lowMax: 400.0 +- Count - +min: 0 +max: 25 +- Emission - +lowMin: 0.0 +lowMax: 0.0 +highMin: 45.0 +highMax: 45.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Life - +lowMin: 0.0 +lowMax: 0.0 +highMin: 400.0 +highMax: 655.0 +relative: false +scalingCount: 4 +scaling0: 0.8235294 +scaling1: 0.47058824 +scaling2: 0.50980395 +scaling3: 0.7254902 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.39726028 +timeline2: 0.5684931 +timeline3: 1.0 +- Life Offset - +active: false +- X Offset - +active: false +- Y Offset - +active: false +- Spawn Shape - +shape: square +- Spawn Width - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.39923224 +timeline2: 0.59884834 +- Spawn Height - +lowMin: 0.0 +lowMax: 0.0 +highMin: 3.0 +highMax: 3.0 +relative: false +scalingCount: 3 +scaling0: 1.0 +scaling1: 1.0 +scaling2: 0.0 +timelineCount: 3 +timeline0: 0.0 +timeline1: 0.40115163 +timeline2: 0.59692895 +- Scale - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 1 +scaling0: 1.0 +timelineCount: 1 +timeline0: 0.0 +- Velocity - +active: false +- Angle - +active: true +lowMin: 90.0 +lowMax: 90.0 +highMin: 45.0 +highMax: 135.0 +relative: false +scalingCount: 2 +scaling0: 0.0 +scaling1: 0.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Rotation - +active: false +- Wind - +active: false +- Gravity - +active: false +- Tint - +colorsCount: 6 +colors0: 0.047058824 +colors1: 0.627451 +colors2: 1.0 +colors3: 0.078431375 +colors4: 0.047058824 +colors5: 1.0 +timelineCount: 2 +timeline0: 0.0 +timeline1: 1.0 +- Transparency - +lowMin: 0.0 +lowMax: 0.0 +highMin: 1.0 +highMax: 1.0 +relative: false +scalingCount: 4 +scaling0: 0.1754386 +scaling1: 0.7719298 +scaling2: 0.4385965 +scaling3: 0.21052632 +timelineCount: 4 +timeline0: 0.0 +timeline1: 0.25342464 +timeline2: 0.82191783 +timeline3: 1.0 +- Options - +attached: true +continuous: false +aligned: false +additive: true +behind: false +premultipliedAlpha: false +- Image Path - +magic-tech.png diff --git a/android/assets/sounds/MainMenuLoop1.ogg b/android/assets/sounds/MainMenuLoop1.ogg deleted file mode 100755 index 85794cc..0000000 Binary files a/android/assets/sounds/MainMenuLoop1.ogg and /dev/null differ diff --git a/android/assets/sounds/SFX_close.ogg b/android/assets/sounds/SFX_close.ogg new file mode 100755 index 0000000..4f88838 Binary files /dev/null and b/android/assets/sounds/SFX_close.ogg differ diff --git a/android/assets/sounds/SFX_open.ogg b/android/assets/sounds/SFX_open.ogg new file mode 100755 index 0000000..c69590d Binary files /dev/null and b/android/assets/sounds/SFX_open.ogg differ diff --git a/android/assets/sounds/metal_clang.ogg b/android/assets/sounds/metal_clang.ogg deleted file mode 100755 index 5a9fd85..0000000 Binary files a/android/assets/sounds/metal_clang.ogg and /dev/null differ diff --git a/android/assets/uiskin.atlas b/android/assets/uiskin.atlas index 83ea035..4ca130d 100755 --- a/android/assets/uiskin.atlas +++ b/android/assets/uiskin.atlas @@ -222,7 +222,7 @@ pause-down index: -1 bar-empty rotate: false - xy: 133, 21 + xy: 106, 13 size: 26, 7 split: 0, 0, 1, 1 orig: 32, 32 diff --git a/core/src/zero1hd/polyjet/Polyjet.java b/core/src/zero1hd/polyjet/Polyjet.java index cbe0c26..a92fdf7 100755 --- a/core/src/zero1hd/polyjet/Polyjet.java +++ b/core/src/zero1hd/polyjet/Polyjet.java @@ -106,8 +106,6 @@ public class Polyjet extends Game { } public void queueAssets() { - assetManager.load("sounds/metal_clang.ogg", Sound.class); - assetManager.load("sounds/MainMenuLoop1.ogg", Sound.class); assetManager.load("uiskin.atlas", TextureAtlas.class); assetManager.load("Tech-Circle1.png", Texture.class); assetManager.load("polyjet-standard.png", Texture.class); @@ -117,6 +115,9 @@ public class Polyjet extends Game { assetManager.load("PolyjetTitle.png", Texture.class); assetManager.load("cybercircle1.png", Texture.class); assetManager.load("defaultCover.png", Texture.class); + assetManager.load("teleport-cloak.p", ParticleEffect.class); + assetManager.load("sounds/SFX_open.ogg", Sound.class); + assetManager.load("sounds/SFX_close.ogg", Sound.class); } public void generateFonts() { initComplete = true; @@ -126,15 +127,15 @@ public class Polyjet extends Game { skinAtlas = assetManager.get("uiskin.atlas", TextureAtlas.class); defaultSkin.addRegions(skinAtlas); - defaultSkin.add("small-font", default_fontGenerator.generateFont(new FreeTypeFontParameter() { + defaultSkin.add("window-font", default_fontGenerator.generateFont(new FreeTypeFontParameter() { { - size = fontScale(0.04f); + size = 18; } })); defaultSkin.add("sub-font", default_fontGenerator.generateFont(new FreeTypeFontParameter() { { - size = fontScale(0.047f); + size = fontScale(0.04f); } })); @@ -171,10 +172,6 @@ public class Polyjet extends Game { defaultTextButton.disabled = defaultSkin.getDrawable("default-round-disabled"); defaultSkin.add("default", defaultTextButton); -// TextButtonStyle smallTextButton = new TextButtonStyle(defaultTextButton); -// smallTextButton.font = defaultSkin.getFont("small-font"); -// defaultSkin.add("small", smallTextButton); - TextButtonStyle textButtonLeft = new TextButtonStyle(); textButtonLeft.up = defaultSkin.getDrawable("left-button"); textButtonLeft.down = defaultSkin.getDrawable("left-button-down"); @@ -195,13 +192,13 @@ public class Polyjet extends Game { defaultLabel.fontColor = defaultSkin.getColor("default"); defaultSkin.add("default", defaultLabel); - TextFieldStyle defaultTextField = new TextFieldStyle(defaultSkin.getFont("small-font"), defaultSkin.getColor("default"), defaultSkin.getDrawable("cursor"), defaultSkin.getDrawable("selection"), defaultSkin.getDrawable("textfield")); + TextFieldStyle defaultTextField = new TextFieldStyle(defaultSkin.getFont("sub-font"), defaultSkin.getColor("default"), defaultSkin.getDrawable("cursor"), defaultSkin.getDrawable("selection"), defaultSkin.getDrawable("textfield")); defaultSkin.add("default", defaultTextField); - WindowStyle defaultWindow = new WindowStyle(defaultSkin.getFont("small-font"), defaultSkin.getColor("default"), defaultSkin.getDrawable("default-window")); + WindowStyle defaultWindow = new WindowStyle(defaultSkin.getFont("window-font"), defaultSkin.getColor("default"), defaultSkin.getDrawable("default-window")); defaultSkin.add("default", defaultWindow); - ListStyle defaultList = new ListStyle(defaultSkin.getFont("small-font"), defaultSkin.getColor("inverse"), defaultSkin.getColor("default"), defaultSkin.getDrawable("selection")); + ListStyle defaultList = new ListStyle(defaultSkin.getFont("sub-font"), defaultSkin.getColor("inverse"), defaultSkin.getColor("default"), defaultSkin.getDrawable("selection")); defaultSkin.add("default", defaultList); ScrollPaneStyle defaultScrollPane = new ScrollPaneStyle(); @@ -211,7 +208,7 @@ public class Polyjet extends Game { defaultScrollPane.vScrollKnob = defaultSkin.getDrawable("default-round-large"); defaultSkin.add("default", defaultScrollPane); - CheckBoxStyle defaultCheckBox = new CheckBoxStyle(defaultSkin.getDrawable("check-off"), defaultSkin.getDrawable("check-on"), defaultSkin.getFont("small-font"), defaultSkin.getColor("default")); + CheckBoxStyle defaultCheckBox = new CheckBoxStyle(defaultSkin.getDrawable("check-off"), defaultSkin.getDrawable("check-on"), defaultSkin.getFont("window-font"), defaultSkin.getColor("default")); defaultSkin.add("default", defaultCheckBox); SelectBoxStyle defaultSelectBox = new SelectBoxStyle(defaultSkin.getFont("default-font"), defaultSkin.getColor("default"), defaultSkin.getDrawable("default-select"), defaultScrollPane, defaultList); @@ -238,9 +235,4 @@ public class Polyjet extends Game { Gdx.app.debug("Font pixel size", MathUtils.round(Gdx.graphics.getDensity()*(fontSize*Gdx.graphics.getHeight())) + "px"); return MathUtils.round(Gdx.graphics.getDensity()*(fontSize*Gdx.graphics.getHeight())); } - - public int fontSizeWDensity(float fontSize) { - return MathUtils.round(Gdx.graphics.getDensity()*(fontSize)); - - } } diff --git a/core/src/zero1hd/polyjet/entity/PolyJetEntity.java b/core/src/zero1hd/polyjet/entity/PolyJetEntity.java index 1904280..652a364 100755 --- a/core/src/zero1hd/polyjet/entity/PolyJetEntity.java +++ b/core/src/zero1hd/polyjet/entity/PolyJetEntity.java @@ -28,7 +28,7 @@ public class PolyJetEntity extends Actor { thrust = core.assetManager.get("standard_thrust.p", ParticleEffect.class); thrust.start(); - teleportCloak = core.assetManager.get("magicCircle.png", ParticleEffect.class); + teleportCloak = core.assetManager.get("teleport-cloak.p", ParticleEffect.class); addAction(Actions.moveTo(getX(), 4f, 0.5f)); } diff --git a/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java b/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java index e139140..5b15aa4 100755 --- a/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java +++ b/core/src/zero1hd/polyjet/screens/CreativeDebugScreen.java @@ -15,8 +15,8 @@ public class CreativeDebugScreen extends ScreenAdapter { InputMultiplexer inputs; - public CreativeDebugScreen(Polyjet core) { - creative = new CreativeStage(core); + public CreativeDebugScreen(Polyjet core, MainMenu mainMenu) { + creative = new CreativeStage(core, mainMenu); gamePlayArea = new GamePlayArea(core); inputs = new InputMultiplexer(creative, gamePlayArea); } diff --git a/core/src/zero1hd/polyjet/screens/PreGameScreen.java b/core/src/zero1hd/polyjet/screens/PreGameScreen.java index af3f760..32a030e 100755 --- a/core/src/zero1hd/polyjet/screens/PreGameScreen.java +++ b/core/src/zero1hd/polyjet/screens/PreGameScreen.java @@ -49,8 +49,6 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { public void postTransition() { stage.clear(); - statusText = new Label(null, core.defaultSkin); - statusText.setPosition(1.6f*Gdx.graphics.getWidth(), (Gdx.graphics.getHeight()-statusText.getHeight())/2); Image cyberCircle1 = new Image(core.assetManager.get("cybercircle3B.png", Texture.class)); cyberCircle1.setScale(0.7f); cyberCircle1.setOrigin(cyberCircle1.getWidth()/2, cyberCircle1.getHeight()/2); @@ -69,7 +67,6 @@ public class PreGameScreen extends ScreenAdapter implements TransitionAdapter { cyberCircle2.setColor(0.8f,0.8f,0.8f,0.7f); cyberCircle2.addAction(Actions.alpha(0.7f)); stage.addActor(cyberCircle2); - stage.addActor(statusText); } @Override diff --git a/core/src/zero1hd/polyjet/ui/pages/CreditsPage.java b/core/src/zero1hd/polyjet/ui/pages/CreditsPage.java index c5d816a..7b846f3 100755 --- a/core/src/zero1hd/polyjet/ui/pages/CreditsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/CreditsPage.java @@ -10,7 +10,7 @@ public class CreditsPage extends Page { title.setPosition(15, getHeight()-title.getHeight()-15); addActor(title); - Label subtitle = new Label("This game wouldn't be possible without these people.", skin, "small-font", skin.getColor("default")); + Label subtitle = new Label("This game wouldn't be possible without these people.", skin, "sub-font", skin.getColor("default")); subtitle.setPosition(title.getX(), title.getY()-subtitle.getHeight()); addActor(subtitle); @@ -19,7 +19,7 @@ public class CreditsPage extends Page { + "Crepitus (sound effects)\n" + "Neoqueto - Darktech LDR (font)\n" + "Rémi Lagast - Gasalt (font)\n" - + "Timour Jgenti - Iron Maiden (font)", skin, "small-font", skin.getColor("default")); + + "Timour Jgenti - Iron Maiden (font)", skin, "sub-font", skin.getColor("default")); listOfNames.setPosition(subtitle.getX()+16, subtitle.getY()-listOfNames.getHeight()-10); addActor(listOfNames); } diff --git a/core/src/zero1hd/polyjet/ui/pages/MainPage.java b/core/src/zero1hd/polyjet/ui/pages/MainPage.java index d9871dd..2b7b6bd 100755 --- a/core/src/zero1hd/polyjet/ui/pages/MainPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MainPage.java @@ -31,7 +31,7 @@ public class MainPage extends Page { polyjetTitle = new Image(core.assetManager.get("PolyjetTitle.png", Texture.class)); polyjetTitle.setPosition(15, getHeight() - polyjetTitle.getHeight()-15); addActor(polyjetTitle); - polyJetVersion = new Label("Version: " + Polyjet.VERSION, core.defaultSkin, "small-font", + polyJetVersion = new Label("Version: " + Polyjet.VERSION, core.defaultSkin, "sub-font", core.defaultSkin.getColor("default")); polyJetVersion.setPosition(3, 3); addActor(polyJetVersion); diff --git a/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java b/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java index f36f68c..83e4aab 100755 --- a/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/MusicSelectionPage.java @@ -5,12 +5,10 @@ import java.io.FilenameFilter; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; +import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.scenes.scene2d.Actor; -import com.badlogic.gdx.scenes.scene2d.actions.Actions; -import com.badlogic.gdx.scenes.scene2d.ui.Image; -import com.badlogic.gdx.scenes.scene2d.ui.Label; import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane; import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; @@ -19,15 +17,16 @@ import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.screens.MainMenu; import zero1hd.polyjet.ui.builders.MusicSelectable; +import zero1hd.polyjet.ui.windows.LoadingWindow; public class MusicSelectionPage extends Page { - private volatile Image loading; private volatile Table musicChoices; Preferences musicFileAnnotation; private Polyjet core; - private volatile Label status; private volatile ScrollPane musicChoiceScroller; + private volatile LoadingWindow loadingWindow; + public MusicSelectionPage(final Polyjet core, final MainMenu mainMenu) { super("Select music", core.defaultSkin); this.core = core; @@ -45,16 +44,10 @@ public class MusicSelectionPage extends Page { }); addActor(back); - loading = new Image(core.defaultSkin, "loading"); - loading.setPosition((getWidth()-loading.getWidth())/2, getHeight()-loading.getHeight() - 32f); - loading.setOrigin(loading.getWidth()/2, loading.getHeight()/2); - loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f))); - addActor(loading); - - status = new Label("Loading: ", core.defaultSkin, "sub-font", core.defaultSkin.getColor("default")); - status.setPosition(loading.getX()+loading.getWidth()+12f, loading.getY()); - addActor(status); - + loadingWindow = new LoadingWindow(core.defaultSkin, true, core.assetManager.get("sounds/SFX_open.ogg", Sound.class), core.assetManager.get("sounds/SFX_close.ogg", Sound.class), core.prefs.getFloat("fx vol")); + loadingWindow.setPosition((getWidth()-loadingWindow.getWidth())/2f, (getHeight()-loadingWindow.getHeight())/2f); + addActor(loadingWindow); + loadingWindow.playOpenSound(); musicChoices = new Table(); musicChoices.defaults().pad(10f); @@ -100,15 +93,12 @@ public class MusicSelectionPage extends Page { }); System.out.println(music); int prog = (int) (100f*music/(musicFiles.length-1f)); - status.setText("Loading: " + prog + "%"); + loadingWindow.setProgress(prog); } - status.remove(); - loading.remove(); + loadingWindow.remove(); } else { - loading.clearActions(); - status.setText("No music found."); } } }).start(); diff --git a/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java index be26eec..6f9092d 100755 --- a/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java +++ b/core/src/zero1hd/polyjet/ui/pages/OptionsPage.java @@ -18,6 +18,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import zero1hd.polyjet.Polyjet; import zero1hd.polyjet.screens.CreativeDebugScreen; +import zero1hd.polyjet.screens.MainMenu; public class OptionsPage extends Page { Table optionsTable = new Table(); @@ -37,7 +38,7 @@ public class OptionsPage extends Page { optionsTable.row(); Label musicVolSliderLabel = new Label("Music Volume: ", core.defaultSkin); - optionsTable.add(musicVolSliderLabel).left(); + optionsTable.add(musicVolSliderLabel).spaceRight(12f).left(); musicVolSlider = new Slider(0, 100, 0.1f, false, core.defaultSkin); musicVolSlider.setValue(core.prefs.getFloat("music vol", 100f)); optionsTable.add(musicVolSlider).prefWidth(790); @@ -48,12 +49,12 @@ public class OptionsPage extends Page { musicVolPercentage.setText(MathUtils.round(musicVolSlider.getValue()) + "%"); } }); - optionsTable.add(musicVolPercentage).spaceLeft(12f).left(); + optionsTable.add(musicVolPercentage).right(); optionsTable.row(); Label fxVolSliderLabel = new Label("FX Volume: ", core.defaultSkin); - optionsTable.add(fxVolSliderLabel).left(); + optionsTable.add(fxVolSliderLabel).spaceRight(12f).left(); fxVolSlider = new Slider(0, 100, 1, false, core.defaultSkin); fxVolSlider.setValue(core.prefs.getFloat("fx vol", 100f)); optionsTable.add(fxVolSlider).prefWidth(790); @@ -65,7 +66,7 @@ public class OptionsPage extends Page { } }); - optionsTable.add(fxVolPercentage).spaceLeft(12f).left(); + optionsTable.add(fxVolPercentage).right(); optionsTable.row(); @@ -152,7 +153,7 @@ public class OptionsPage extends Page { if (core.assetManager.update() && goToScreen != 0) { switch (goToScreen) { case 1: - core.setScreen(new CreativeDebugScreen(core)); + core.setScreen(new CreativeDebugScreen(core, (MainMenu) core.getScreen())); } goToScreen = 0; } diff --git a/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java b/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java index b1ec2f5..192aed2 100755 --- a/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java +++ b/core/src/zero1hd/polyjet/ui/stages/CreativeStage.java @@ -38,13 +38,12 @@ public class CreativeStage extends Stage { Polyjet core; boolean postAnalysisComplete; - public CreativeStage(final Polyjet core) { + public CreativeStage(final Polyjet core, final MainMenu mainMenu) { this.core = core; analyzer = new AudioAnalyzer(); audioWrapper = new WavAudioData(); musicPlayBackControls = new MusicController(core.defaultSkin, audioWrapper); - musicSelector = new MusicSelector("Select Audio File", core.defaultSkin, core.prefs.getString("music dir"), "default", false); - musicSelector.setSize(400, 200); + musicSelector = new MusicSelector("Select Audio File", core.defaultSkin, core.prefs.getString("music dir"), "default"); musicSelector.postInit(); musicSelector.refresh(); fpsViewer = new FPSWindow("FPS", core.defaultSkin); @@ -59,7 +58,7 @@ public class CreativeStage extends Stage { @Override public void changed(ChangeEvent event, Actor actor) { dispose(); - core.setScreen(new MainMenu(core)); + core.setScreen(mainMenu); } }); backButton.setPosition(10, Gdx.graphics.getHeight()-backButton.getHeight()-10); @@ -159,11 +158,12 @@ public class CreativeStage extends Stage { } } }); + toolboxToolSet.add(volumeMixerCheckbox); ScrollPane scroller = new ScrollPane(toolboxToolSet, core.defaultSkin); - toolbox.add(scroller).prefWidth(205); - toolbox.setSize(210, 140); + toolbox.add(scroller).expand().fill(); + toolbox.setSize(300, 300); addActor(toolbox); addListener(new InputListener() { diff --git a/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java b/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java index 30f834c..9741e99 100755 --- a/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java +++ b/core/src/zero1hd/polyjet/ui/windows/FPSWindow.java @@ -9,7 +9,7 @@ public class FPSWindow extends Window { public FPSWindow(String title, Skin skin) { super(title, skin); - Label FPS = new Label("FPS: ", skin, "small-font", skin.getColor("default")) { + Label FPS = new Label("FPS: ", skin, "window-font", skin.getColor("default")) { @Override public void act(float delta) { setText("FPS: " + Gdx.graphics.getFramesPerSecond()); diff --git a/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java b/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java new file mode 100755 index 0000000..034a897 --- /dev/null +++ b/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java @@ -0,0 +1,54 @@ +package zero1hd.polyjet.ui.windows; + +import com.badlogic.gdx.audio.Sound; +import com.badlogic.gdx.scenes.scene2d.actions.Actions; +import com.badlogic.gdx.scenes.scene2d.ui.Image; +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.badlogic.gdx.scenes.scene2d.ui.Skin; +import com.badlogic.gdx.scenes.scene2d.ui.Window; + +public class LoadingWindow extends Window { + + private Label status; + private Sound closeSound; + private Sound openSound; + private float vol; + public LoadingWindow(Skin skin, boolean progress, Sound openSound, Sound closeSound, float vol) { + super("loading", skin); + this.closeSound = closeSound; + this.openSound = openSound; + this.vol = vol; + Image loading = new Image(skin, "loading"); + loading.setPosition((getWidth()-loading.getWidth())/2, getHeight()-loading.getHeight() - 32f); + loading.setOrigin(loading.getWidth()/2, loading.getHeight()/2); + loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f))); + add(loading).size(loading.getHeight()).spaceRight(15f).left(); + + setSize(loading.getWidth(), loading.getHeight()+25f); + + if (progress) { + status = new Label("[ ]", skin); + setSize(loading.getWidth() + status.getWidth() + 45f, status.getHeight() >= loading.getHeight() ? status.getHeight() : loading.getHeight()); + + + add(status).expandX().right(); + + } + + + } + + public void playOpenSound() { + openSound.play(vol/100f); + System.out.println(vol); + } + + @Override + public boolean remove() { + closeSound.play(vol/100f); + return super.remove(); + } + public void setProgress(float progress) { + status.setText(String.valueOf((int) progress) + '%'); + } +} diff --git a/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java b/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java index f335f77..8fd35ce 100755 --- a/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java +++ b/core/src/zero1hd/polyjet/ui/windows/MusicSelector.java @@ -19,29 +19,18 @@ public class MusicSelector extends Window { private List musicList; private String path; private ScrollPane listScroller; - public MusicSelector(String title, Skin skin, final String path, String listStyle, boolean containsBackButton) { + public MusicSelector(String title, Skin skin, final String path, String listStyle) { super(title, skin); this.path = path; padTop(25f); padLeft(5f); padRight(5f); - setSize(Gdx.graphics.getWidth()*0.8f, Gdx.graphics.getHeight()*0.9f); + setSize(Gdx.graphics.getWidth()*0.5f, Gdx.graphics.getHeight()*0.5f); fileNames = new Array<>(); musicList = new List(skin, listStyle); - if (containsBackButton) { - TextButton backButton = new TextButton("back", skin); - backButton.addListener(new ChangeListener() { - @Override - public void changed(ChangeEvent event, Actor actor) { - back = true; - } - }); - add(backButton).left(); - } - TextButton confirmButton = new TextButton("confirm", skin); confirmButton.addListener(new ChangeListener() { @@ -67,7 +56,7 @@ public class MusicSelector extends Window { fileNames.clear(); FileHandle[] musicListArray = Gdx.files.absolute(path).list(); for (int i = 0; i < musicListArray.length; i++) { - if (musicListArray[i].name().toLowerCase().endsWith(".wav")) { + if (musicListArray[i].name().toLowerCase().endsWith(".wav") || musicListArray[i].name().toLowerCase().endsWith(".mp3")) { fileNames.add(musicListArray[i].name()); } } diff --git a/core/src/zero1hd/polyjet/ui/windows/Spawnables.java b/core/src/zero1hd/polyjet/ui/windows/Spawnables.java index d41f4c4..21d9dbf 100755 --- a/core/src/zero1hd/polyjet/ui/windows/Spawnables.java +++ b/core/src/zero1hd/polyjet/ui/windows/Spawnables.java @@ -17,5 +17,4 @@ public class Spawnables extends Window { add(entityListScroller); setSize(185, 85); } - } diff --git a/core/src/zero1hd/polyjet/ui/windows/VolumeWindow.java b/core/src/zero1hd/polyjet/ui/windows/VolumeWindow.java index 15fc535..37567ec 100755 --- a/core/src/zero1hd/polyjet/ui/windows/VolumeWindow.java +++ b/core/src/zero1hd/polyjet/ui/windows/VolumeWindow.java @@ -21,12 +21,12 @@ public class VolumeWindow extends Window { this.prefs = prefs; setSize(360f, 100f); - Label musicVolSliderLabel = new Label("Music Volume: ", skin, "small-font", skin.getColor("default")); + Label musicVolSliderLabel = new Label("Music Volume: ", skin, "window-font", skin.getColor("default")); add(musicVolSliderLabel).left().padLeft(5f); musicVolSlider = new Slider(0, 100, 0.1f, false, skin); musicVolSlider.setValue(prefs.getFloat("music vol", 100f)); add(musicVolSlider).width(200f); - final Label musicVolPercentage = new Label(MathUtils.round(musicVolSlider.getValue()) + "%", skin, "small-font", skin.getColor("default")); + final Label musicVolPercentage = new Label(MathUtils.round(musicVolSlider.getValue()) + "%", skin, "window-font", skin.getColor("default")); musicVolSlider.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { @@ -39,12 +39,12 @@ public class VolumeWindow extends Window { row(); - Label fxVolSliderLabel = new Label("FX Volume: ", skin, "small-font", skin.getColor("default")); + Label fxVolSliderLabel = new Label("FX Volume: ", skin, "window-font", skin.getColor("default")); add(fxVolSliderLabel).left().padLeft(5f); fxVolSlider = new Slider(0, 100, 1, false, skin); fxVolSlider.setValue(prefs.getFloat("fx vol", 100f)); add(fxVolSlider).width(200f); - final Label fxVolPercentage = new Label(MathUtils.round(fxVolSlider.getValue()) + "%", skin, "small-font", skin.getColor("default")); + final Label fxVolPercentage = new Label(MathUtils.round(fxVolSlider.getValue()) + "%", skin, "window-font", skin.getColor("default")); fxVolSlider.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) {