All upgrades are used in calculations -> bomb still has to be balanced

added firework on goal and different goal screen (with button to toolshop), but not happy with second one
Have to change it in layout file

TopBarData has been removed -> All data (DataStorageHandler, TutorialManager, LevelManager, SoundManager, Typeface, User) is stored in the GameActivity and can be recieved by getters

Toolshop-tutorial can now be reset and works instantaniously
This commit is contained in:
=
2017-07-18 15:57:21 +02:00
parent 4b4d81d8c7
commit b8322c9f05
28 changed files with 7590 additions and 2572 deletions

View File

@ -76,14 +76,19 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>

View File

@ -0,0 +1,199 @@
Untitled
- Delay -
active: true
lowMin: 1600.0
lowMax: 1600.0
- Duration -
lowMin: 500.0
lowMax: 500.0
- Count -
min: 0
max: 500
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 700.0
highMax: 700.0
relative: false
scalingCount: 3
scaling0: 0.47058824
scaling1: 1.0
scaling2: 0.1764706
timelineCount: 3
timeline0: 0.0
timeline1: 0.6917808
timeline2: 1.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 1500.0
highMax: 1500.0
relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.66
timeline2: 1.0
- Life Offset -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 0.0
highMax: 0.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- 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: 35.0
lowMax: 50.0
highMin: 50.0
highMax: 80.0
relative: false
scalingCount: 3
scaling0: 0.0
scaling1: 0.37254903
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.6643836
timeline2: 1.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: 500.0
highMax: 1400.0
relative: false
scalingCount: 4
scaling0: 1.0
scaling1: 1.0
scaling2: 0.29411766
scaling3: 0.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.17123288
timeline2: 0.28767124
timeline3: 1.0
- Angle -
active: true
lowMin: 0.0
lowMax: 360.0
highMin: 0.0
highMax: 360.0
relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.47260273
timeline2: 0.60273975
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: -10.0
highMax: -400.0
relative: false
scalingCount: 3
scaling0: 0.0
scaling1: 0.0
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.6712329
timeline2: 0.8835617
- Tint -
colorsCount: 24
colors0: 1.0
colors1: 0.047058824
colors2: 0.047058824
colors3: 1.0
colors4: 0.047058824
colors5: 0.047058824
colors6: 0.047058824
colors7: 0.6392157
colors8: 1.0
colors9: 1.0
colors10: 0.047058824
colors11: 0.047058824
colors12: 0.7176471
colors13: 1.0
colors14: 0.047058824
colors15: 1.0
colors16: 0.047058824
colors17: 0.047058824
colors18: 1.0
colors19: 0.047058824
colors20: 0.047058824
colors21: 0.9411765
colors22: 1.0
colors23: 0.047058824
timelineCount: 8
timeline0: 0.0
timeline1: 0.13769363
timeline2: 0.20481928
timeline3: 0.4664372
timeline4: 0.5834768
timeline5: 0.70051634
timeline6: 0.80206543
timeline7: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 3
scaling0: 0.877193
scaling1: 0.8245614
scaling2: 0.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.55479455
timeline2: 1.0
- Options -
attached: false
continuous: true
aligned: false
additive: true
behind: false
premultipliedAlpha: false
- Image Path -
particle.png