diff --git a/.gitignore b/.gitignore index f4e6957..4f319e1 100755 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,5 @@ Thumbs.db ## Gource gource/ +gource.bat +gource.sh diff --git a/android/assets/1280x720/PolyjetTitle.png b/android/assets/1280x720/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x720/Tech-Circle1.png b/android/assets/1280x720/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x720/cube.png b/android/assets/1280x720/cube.png deleted file mode 100644 index a317fe3..0000000 Binary files a/android/assets/1280x720/cube.png and /dev/null differ diff --git a/android/assets/1280x720/cybercircle1.png b/android/assets/1280x720/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x720/cybercircle3B.png b/android/assets/1280x720/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x720/magic-particle1.png b/android/assets/1280x720/magic-particle1.png deleted file mode 100644 index 72dcb8f..0000000 Binary files a/android/assets/1280x720/magic-particle1.png and /dev/null differ diff --git a/android/assets/1280x720/magic-tech.png b/android/assets/1280x720/magic-tech.png deleted file mode 100644 index 06db0e5..0000000 Binary files a/android/assets/1280x720/magic-tech.png and /dev/null differ diff --git a/android/assets/1280x720/magicCircle.png b/android/assets/1280x720/magicCircle.png deleted file mode 100755 index 70dc26e..0000000 Binary files a/android/assets/1280x720/magicCircle.png and /dev/null differ diff --git a/android/assets/1280x720/polyjet-standard.png b/android/assets/1280x720/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x720/splashlogo.png b/android/assets/1280x720/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x720/square.png b/android/assets/1280x720/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/PolyjetTitle.png b/android/assets/1280x800/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/Tech-Circle1.png b/android/assets/1280x800/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/cube.png b/android/assets/1280x800/cube.png deleted file mode 100644 index bf21c8f..0000000 Binary files a/android/assets/1280x800/cube.png and /dev/null differ diff --git a/android/assets/1280x800/cybercircle1.png b/android/assets/1280x800/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/cybercircle3B.png b/android/assets/1280x800/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/magic-particle1.png b/android/assets/1280x800/magic-particle1.png deleted file mode 100644 index 63fe28c..0000000 Binary files a/android/assets/1280x800/magic-particle1.png and /dev/null differ diff --git a/android/assets/1280x800/magic-tech.png b/android/assets/1280x800/magic-tech.png deleted file mode 100644 index dcfa65e..0000000 Binary files a/android/assets/1280x800/magic-tech.png and /dev/null differ diff --git a/android/assets/1280x800/magicCircle.png b/android/assets/1280x800/magicCircle.png deleted file mode 100755 index 9b60e1a..0000000 Binary files a/android/assets/1280x800/magicCircle.png and /dev/null differ diff --git a/android/assets/1280x800/polyjet-standard.png b/android/assets/1280x800/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/splashlogo.png b/android/assets/1280x800/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/square.png b/android/assets/1280x800/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1280x800/standard_thrust.p b/android/assets/1280x800/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/1280x800/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/1280x800/teleport-cloak.p b/android/assets/1280x800/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/1280x800/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/PolyjetTitle.png b/android/assets/1366x768/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/Tech-Circle1.png b/android/assets/1366x768/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/cube.png b/android/assets/1366x768/cube.png deleted file mode 100644 index abe5b32..0000000 Binary files a/android/assets/1366x768/cube.png and /dev/null differ diff --git a/android/assets/1366x768/cybercircle1.png b/android/assets/1366x768/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/cybercircle3B.png b/android/assets/1366x768/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/magic-particle1.png b/android/assets/1366x768/magic-particle1.png deleted file mode 100644 index fe5119d..0000000 Binary files a/android/assets/1366x768/magic-particle1.png and /dev/null differ diff --git a/android/assets/1366x768/magic-tech.png b/android/assets/1366x768/magic-tech.png deleted file mode 100644 index 39cbb83..0000000 Binary files a/android/assets/1366x768/magic-tech.png and /dev/null differ diff --git a/android/assets/1366x768/magicCircle.png b/android/assets/1366x768/magicCircle.png deleted file mode 100755 index 35ed09b..0000000 Binary files a/android/assets/1366x768/magicCircle.png and /dev/null differ diff --git a/android/assets/1366x768/polyjet-standard.png b/android/assets/1366x768/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/splashlogo.png b/android/assets/1366x768/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/square.png b/android/assets/1366x768/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1366x768/standard_thrust.p b/android/assets/1366x768/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/1366x768/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/1366x768/teleport-cloak.p b/android/assets/1366x768/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/1366x768/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/PolyjetTitle.png b/android/assets/1920x1080/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/Tech-Circle1.png b/android/assets/1920x1080/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/cube.png b/android/assets/1920x1080/cube.png deleted file mode 100644 index 80afc06..0000000 Binary files a/android/assets/1920x1080/cube.png and /dev/null differ diff --git a/android/assets/1920x1080/cybercircle1.png b/android/assets/1920x1080/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/cybercircle3B.png b/android/assets/1920x1080/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/magic-particle1.png b/android/assets/1920x1080/magic-particle1.png deleted file mode 100644 index af3f361..0000000 Binary files a/android/assets/1920x1080/magic-particle1.png and /dev/null differ diff --git a/android/assets/1920x1080/magic-tech.png b/android/assets/1920x1080/magic-tech.png deleted file mode 100644 index f3c49a5..0000000 Binary files a/android/assets/1920x1080/magic-tech.png and /dev/null differ diff --git a/android/assets/1920x1080/magicCircle.png b/android/assets/1920x1080/magicCircle.png deleted file mode 100755 index 80303ae..0000000 Binary files a/android/assets/1920x1080/magicCircle.png and /dev/null differ diff --git a/android/assets/1920x1080/polyjet-standard.png b/android/assets/1920x1080/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/splashlogo.png b/android/assets/1920x1080/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/square.png b/android/assets/1920x1080/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1080/standard_thrust.p b/android/assets/1920x1080/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/1920x1080/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/1920x1080/teleport-cloak.p b/android/assets/1920x1080/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/1920x1080/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/PolyjetTitle.png b/android/assets/1920x1200/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/Tech-Circle1.png b/android/assets/1920x1200/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/cube.png b/android/assets/1920x1200/cube.png deleted file mode 100644 index 2d86918..0000000 Binary files a/android/assets/1920x1200/cube.png and /dev/null differ diff --git a/android/assets/1920x1200/cybercircle1.png b/android/assets/1920x1200/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/cybercircle2.png b/android/assets/1920x1200/cybercircle2.png deleted file mode 100755 index 4b328d1..0000000 Binary files a/android/assets/1920x1200/cybercircle2.png and /dev/null differ diff --git a/android/assets/1920x1200/cybercircle3B.png b/android/assets/1920x1200/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/magic-particle1.png b/android/assets/1920x1200/magic-particle1.png deleted file mode 100644 index 253e8a1..0000000 Binary files a/android/assets/1920x1200/magic-particle1.png and /dev/null differ diff --git a/android/assets/1920x1200/magic-tech.png b/android/assets/1920x1200/magic-tech.png deleted file mode 100644 index 608a49f..0000000 Binary files a/android/assets/1920x1200/magic-tech.png and /dev/null differ diff --git a/android/assets/1920x1200/magicCircle.png b/android/assets/1920x1200/magicCircle.png deleted file mode 100755 index f77b304..0000000 Binary files a/android/assets/1920x1200/magicCircle.png and /dev/null differ diff --git a/android/assets/1920x1200/polyjet-standard.png b/android/assets/1920x1200/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/splashlogo.png b/android/assets/1920x1200/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/square.png b/android/assets/1920x1200/square.png old mode 100644 new mode 100755 diff --git a/android/assets/1920x1200/standard_thrust.p b/android/assets/1920x1200/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/1920x1200/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/1920x1200/teleport-cloak.p b/android/assets/1920x1200/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/1920x1200/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/PolyjetTitle.png b/android/assets/2560x1440/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/Tech-Circle1.png b/android/assets/2560x1440/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/cube.png b/android/assets/2560x1440/cube.png deleted file mode 100644 index ece5173..0000000 Binary files a/android/assets/2560x1440/cube.png and /dev/null differ diff --git a/android/assets/2560x1440/cybercircle1.png b/android/assets/2560x1440/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/cybercircle3B.png b/android/assets/2560x1440/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/magic-particle1.png b/android/assets/2560x1440/magic-particle1.png deleted file mode 100644 index 693d8c6..0000000 Binary files a/android/assets/2560x1440/magic-particle1.png and /dev/null differ diff --git a/android/assets/2560x1440/magic-tech.png b/android/assets/2560x1440/magic-tech.png deleted file mode 100644 index 0b67426..0000000 Binary files a/android/assets/2560x1440/magic-tech.png and /dev/null differ diff --git a/android/assets/2560x1440/polyjet-standard.png b/android/assets/2560x1440/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/splashlogo.png b/android/assets/2560x1440/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/square.png b/android/assets/2560x1440/square.png old mode 100644 new mode 100755 diff --git a/android/assets/2560x1440/standard_thrust.p b/android/assets/2560x1440/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/2560x1440/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/2560x1440/teleport-cloak.p b/android/assets/2560x1440/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/2560x1440/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/3840x2160/magic-particle1.png b/android/assets/3840x2160/magic-particle1.png deleted file mode 100755 index 782c9b7..0000000 Binary files a/android/assets/3840x2160/magic-particle1.png and /dev/null differ diff --git a/android/assets/3840x2160/standard_thrust.p b/android/assets/3840x2160/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/3840x2160/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/3840x2160/teleport-cloak.p b/android/assets/3840x2160/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/3840x2160/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/PolyjetTitle.png b/android/assets/800x480/PolyjetTitle.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/Tech-Circle1.png b/android/assets/800x480/Tech-Circle1.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/cube.png b/android/assets/800x480/cube.png deleted file mode 100644 index 1bef453..0000000 Binary files a/android/assets/800x480/cube.png and /dev/null differ diff --git a/android/assets/800x480/cybercircle1.png b/android/assets/800x480/cybercircle1.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/cybercircle3B.png b/android/assets/800x480/cybercircle3B.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/magic-particle1.png b/android/assets/800x480/magic-particle1.png deleted file mode 100644 index 8463395..0000000 Binary files a/android/assets/800x480/magic-particle1.png and /dev/null differ diff --git a/android/assets/800x480/magic-tech.png b/android/assets/800x480/magic-tech.png deleted file mode 100644 index d621a76..0000000 Binary files a/android/assets/800x480/magic-tech.png and /dev/null differ diff --git a/android/assets/800x480/magicCircle.png b/android/assets/800x480/magicCircle.png deleted file mode 100755 index 7395eb1..0000000 Binary files a/android/assets/800x480/magicCircle.png and /dev/null differ diff --git a/android/assets/800x480/polyjet-standard.png b/android/assets/800x480/polyjet-standard.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/splashlogo.png b/android/assets/800x480/splashlogo.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/square.png b/android/assets/800x480/square.png old mode 100644 new mode 100755 diff --git a/android/assets/800x480/standard_thrust.p b/android/assets/800x480/standard_thrust.p deleted file mode 100755 index 649229a..0000000 --- a/android/assets/800x480/standard_thrust.p +++ /dev/null @@ -1,131 +0,0 @@ -thrust -- Delay - -active: false -- Duration - -lowMin: 0.0 -lowMax: 0.0 -- Count - -min: 0 -max: 15 -- Emission - -lowMin: 0.0 -lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life - -lowMin: 0.0 -lowMax: 0.0 -highMin: 400.0 -highMax: 400.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Life Offset - -active: false -- X Offset - -active: false -- Y Offset - -active: false -- Spawn Shape - -shape: point -- Spawn Width - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Spawn Height - -lowMin: 0.0 -lowMax: 0.0 -highMin: 0.0 -highMax: 0.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Scale - -lowMin: 0.0 -lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 -relative: false -scalingCount: 2 -scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 -timeline0: 0.0 -timeline1: 1.0 -- Velocity - -active: true -lowMin: 0.0 -lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 -relative: false -scalingCount: 1 -scaling0: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Angle - -active: true -lowMin: 110.0 -lowMax: 50.0 -highMin: 90.0 -highMax: 90.0 -relative: false -scalingCount: 2 -scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 -timeline0: 0.0 -timeline1: 0.47260273 -- Rotation - -active: false -- Wind - -active: false -- Gravity - -active: false -- Tint - -colorsCount: 3 -colors0: 0.047058824 -colors1: 0.7647059 -colors2: 1.0 -timelineCount: 1 -timeline0: 0.0 -- Transparency - -lowMin: 0.0 -lowMax: 0.0 -highMin: 1.0 -highMax: 1.0 -relative: false -scalingCount: 4 -scaling0: 0.0 -scaling1: 1.0 -scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 -timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 -- Options - -attached: false -continuous: true -aligned: false -additive: false -behind: false -premultipliedAlpha: false -- Image Path - -cube.png diff --git a/android/assets/800x480/teleport-cloak.p b/android/assets/800x480/teleport-cloak.p deleted file mode 100755 index 4b35fe9..0000000 --- a/android/assets/800x480/teleport-cloak.p +++ /dev/null @@ -1,138 +0,0 @@ -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/3840x2160/cube.png b/android/assets/particles/cube.png similarity index 100% rename from android/assets/3840x2160/cube.png rename to android/assets/particles/cube.png diff --git a/android/assets/3840x2160/magic-tech.png b/android/assets/particles/magic-tech.png similarity index 100% rename from android/assets/3840x2160/magic-tech.png rename to android/assets/particles/magic-tech.png diff --git a/android/assets/1280x720/standard_thrust.p b/android/assets/particles/standard_thrust.p similarity index 72% rename from android/assets/1280x720/standard_thrust.p rename to android/assets/particles/standard_thrust.p index 649229a..ae938c3 100755 --- a/android/assets/1280x720/standard_thrust.p +++ b/android/assets/particles/standard_thrust.p @@ -6,12 +6,12 @@ lowMin: 0.0 lowMax: 0.0 - Count - min: 0 -max: 15 +max: 40 - Emission - lowMin: 0.0 lowMax: 0.0 -highMin: 20.0 -highMax: 20.0 +highMin: 70.0 +highMax: 70.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -58,21 +58,25 @@ timeline0: 0.0 - Scale - lowMin: 0.0 lowMax: 0.0 -highMin: 2.0 -highMax: 2.0 +highMin: 0.5 +highMax: 0.5 relative: false -scalingCount: 2 +scalingCount: 4 scaling0: 1.0 -scaling1: 0.29411766 -timelineCount: 2 +scaling1: 0.92156863 +scaling2: 0.627451 +scaling3: 0.15686275 +timelineCount: 4 timeline0: 0.0 -timeline1: 1.0 +timeline1: 0.5273973 +timeline2: 0.8082192 +timeline3: 1.0 - Velocity - active: true lowMin: 0.0 lowMax: 0.0 -highMin: 30.0 -highMax: 30.0 +highMin: 7.0 +highMax: 7.0 relative: false scalingCount: 1 scaling0: 1.0 @@ -80,17 +84,23 @@ timelineCount: 1 timeline0: 0.0 - Angle - active: true -lowMin: 110.0 -lowMax: 50.0 +lowMin: 60.0 +lowMax: 120.0 highMin: 90.0 highMax: 90.0 relative: false -scalingCount: 2 +scalingCount: 5 scaling0: 0.0 -scaling1: 1.0 -timelineCount: 2 +scaling1: 0.27450982 +scaling2: 0.33333334 +scaling3: 1.0 +scaling4: 1.0 +timelineCount: 5 timeline0: 0.0 -timeline1: 0.47260273 +timeline1: 0.21232876 +timeline2: 0.32876712 +timeline3: 0.74657536 +timeline4: 1.0 - Rotation - active: false - Wind - @@ -110,21 +120,23 @@ lowMax: 0.0 highMin: 1.0 highMax: 1.0 relative: false -scalingCount: 4 +scalingCount: 5 scaling0: 0.0 -scaling1: 1.0 +scaling1: 0.3508772 scaling2: 1.0 -scaling3: 0.0 -timelineCount: 4 +scaling3: 1.0 +scaling4: 0.0 +timelineCount: 5 timeline0: 0.0 -timeline1: 0.25342464 -timeline2: 0.79452056 -timeline3: 1.0 +timeline1: 0.12328767 +timeline2: 0.25342464 +timeline3: 0.89041096 +timeline4: 1.0 - Options - -attached: false +attached: true continuous: true aligned: false -additive: false +additive: true behind: false premultipliedAlpha: false - Image Path - diff --git a/android/assets/1280x720/teleport-cloak.p b/android/assets/particles/teleport-cloak.p similarity index 100% rename from android/assets/1280x720/teleport-cloak.p rename to android/assets/particles/teleport-cloak.p diff --git a/core/src/zero1hd/polyjet/Polyjet.java b/core/src/zero1hd/polyjet/Polyjet.java index 6161248..2955eaf 100755 --- a/core/src/zero1hd/polyjet/Polyjet.java +++ b/core/src/zero1hd/polyjet/Polyjet.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.assets.loaders.ParticleEffectLoader; +import com.badlogic.gdx.assets.loaders.SoundLoader; import com.badlogic.gdx.assets.loaders.TextureAtlasLoader; import com.badlogic.gdx.assets.loaders.TextureLoader; import com.badlogic.gdx.assets.loaders.resolvers.InternalFileHandleResolver; @@ -31,6 +32,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextField.TextFieldStyle; import com.badlogic.gdx.scenes.scene2d.ui.Window.WindowStyle; import zero1hd.polyjet.screens.MainMenu; +import zero1hd.polyjet.util.GenericFileTypeHandler; import zero1hd.polyjet.util.RoundingResolutionHandler; import zero1hd.polyjet.screens.LoadingScreen; @@ -75,13 +77,16 @@ public class Polyjet extends Game { new Resolution(2560, 1440, "2560x1440"), new Resolution(3840, 2160, "3840x2160"), }; + InternalFileHandleResolver internalFileResolver = new InternalFileHandleResolver(); + + RoundingResolutionHandler rRHandler = new RoundingResolutionHandler(internalFileResolver, resolution); + GenericFileTypeHandler genericFileFinder = new GenericFileTypeHandler(internalFileResolver); + assetManager.setLoader(TextureAtlas.class, new TextureAtlasLoader(rRHandler)); + assetManager.setLoader(Texture.class, new TextureLoader(rRHandler)); + assetManager.setLoader(ParticleEffect.class, new ParticleEffectLoader(genericFileFinder)); + assetManager.setLoader(Sound.class, new SoundLoader(genericFileFinder)); - RoundingResolutionHandler resolver = new RoundingResolutionHandler(new InternalFileHandleResolver(), resolution); - assetManager.setLoader(TextureAtlas.class, new TextureAtlasLoader(resolver)); - assetManager.setLoader(Texture.class, new TextureLoader(resolver)); - assetManager.setLoader(ParticleEffect.class, new ParticleEffectLoader(resolver)); - default_fontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/Gasalt-Regular.ttf")); darktech_ldr_fontGenerator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/darktech_ldr.ttf")); @@ -116,8 +121,8 @@ public class Polyjet extends Game { assetManager.load("cybercircle1.png", Texture.class); assetManager.load("defaultCover.png", Texture.class); assetManager.load("teleport-cloak.p", ParticleEffect.class); - assetManager.load("sounds/pop_open.ogg", Sound.class); - assetManager.load("sounds/pop_close.ogg", Sound.class); + assetManager.load("pop_open.ogg", Sound.class); + assetManager.load("pop_close.ogg", Sound.class); } public void generateFonts() { initComplete = true; diff --git a/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java b/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java index 0a64f30..da6d64b 100755 --- a/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java +++ b/core/src/zero1hd/polyjet/ui/windows/LoadingWindow.java @@ -18,8 +18,8 @@ public class LoadingWindow extends Window implements Disposable { public LoadingWindow(Skin skin, boolean progress, AssetManager assets, float vol) { super("loading...", skin); - this.openSound = assets.get("sounds/pop_open.ogg", Sound.class); - this.closeSound = assets.get("sounds/pop_close.ogg", Sound.class); + this.openSound = assets.get("pop_open.ogg", Sound.class); + this.closeSound = assets.get("pop_close.ogg", Sound.class); this.vol = vol; Image loading = new Image(skin, "loading"); loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f))); @@ -43,8 +43,8 @@ public class LoadingWindow extends Window implements Disposable { public LoadingWindow(Skin skin, String styleName, boolean progress, AssetManager assets, float vol) { super("loading...", skin, styleName); - this.openSound = assets.get("sounds/pop_open.ogg", Sound.class); - this.closeSound = assets.get("sounds/pop_close.ogg", Sound.class); + this.openSound = assets.get("pop_open.ogg", Sound.class); + this.closeSound = assets.get("pop_close.ogg", Sound.class); this.vol = vol; Image loading = new Image(skin, "loading"); loading.addAction(Actions.forever(Actions.rotateBy(-360f, 2f))); diff --git a/core/src/zero1hd/polyjet/util/GenericFileTypeHandler.java b/core/src/zero1hd/polyjet/util/GenericFileTypeHandler.java new file mode 100755 index 0000000..645706c --- /dev/null +++ b/core/src/zero1hd/polyjet/util/GenericFileTypeHandler.java @@ -0,0 +1,25 @@ +package zero1hd.polyjet.util; + +import com.badlogic.gdx.assets.loaders.FileHandleResolver; +import com.badlogic.gdx.files.FileHandle; + +public class GenericFileTypeHandler implements FileHandleResolver { + private final FileHandleResolver resolver; + + public GenericFileTypeHandler(FileHandleResolver fileResolver) { + resolver = fileResolver; + } + + @Override + public FileHandle resolve(String fileName) { + + if (fileName.endsWith(".p")) { + return resolver.resolve("particles/" +fileName); + } else if (fileName.endsWith(".ogg")) { + return resolver.resolve("sounds/" + fileName); + } else { + return null; + } + } + +} diff --git a/core/src/zero1hd/polyjet/util/RoundingResolutionHandler.java b/core/src/zero1hd/polyjet/util/RoundingResolutionHandler.java index e98ee84..3466635 100755 --- a/core/src/zero1hd/polyjet/util/RoundingResolutionHandler.java +++ b/core/src/zero1hd/polyjet/util/RoundingResolutionHandler.java @@ -57,9 +57,8 @@ public class RoundingResolutionHandler implements FileHandleResolver { public FileHandle resolve(String fileName) { Gdx.app.debug("RResolution Handler", "Finding best match for resolution: " + Gdx.graphics.getWidth() + "x" + Gdx.graphics.getHeight() + " for file: " + fileName); Resolution bestRes = chooseRounded(descriptors); - FileHandle initialHandle = new FileHandle(fileName); Gdx.app.debug("RResolution Handler", "Selected folder: " + bestRes.folder); - FileHandle resSpecificFile = resolver.resolve(bestRes.folder + "/" + initialHandle.name()); + FileHandle resSpecificFile = resolver.resolve(bestRes.folder + "/" + fileName); if (!resSpecificFile.exists()) resSpecificFile = resolver.resolve(fileName); return resSpecificFile; }