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

@@ -0,0 +1,160 @@
Untitled
- Delay -
active: false
- Duration -
lowMin: 100.0
lowMax: 100.0
- Count -
min: 0
max: 10000
- Emission -
lowMin: 0.0
lowMax: 0.0
highMin: 1000.0
highMax: 1000.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Life -
lowMin: 0.0
lowMax: 0.0
highMin: 2000.0
highMax: 2000.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: 100.0
highMax: 100.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Spawn Height -
lowMin: 0.0
lowMax: 0.0
highMin: 50.0
highMax: 50.0
relative: false
scalingCount: 1
scaling0: 1.0
timelineCount: 1
timeline0: 0.0
- Scale -
lowMin: 10.0
lowMax: 15.0
highMin: 15.0
highMax: 45.0
relative: false
scalingCount: 3
scaling0: 0.0
scaling1: 0.0
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.28767124
timeline2: 1.0
- Velocity -
active: true
lowMin: 0.0
lowMax: 300.0
highMin: 800.0
highMax: 800.0
relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.29791272
timeline2: 0.2989127
- Angle -
active: true
lowMin: 89.0
lowMax: 91.0
highMin: 0.0
highMax: 360.0
relative: false
scalingCount: 3
scaling0: 0.0
scaling1: 0.0
scaling2: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.30260533
timeline2: 0.30360532
- Rotation -
active: false
- Wind -
active: false
- Gravity -
active: true
lowMin: 0.0
lowMax: 0.0
highMin: -50.0
highMax: -100.0
relative: false
scalingCount: 4
scaling0: 0.0
scaling1: 0.0
scaling2: 0.5294118
scaling3: 1.0
timelineCount: 4
timeline0: 0.0
timeline1: 0.29981026
timeline2: 0.65753424
timeline3: 0.75342464
- Tint -
colorsCount: 9
colors0: 0.0
colors1: 0.4
colors2: 1.0
colors3: 1.0
colors4: 0.0
colors5: 0.0
colors6: 1.0
colors7: 1.0
colors8: 1.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.35800344
timeline2: 1.0
- Transparency -
lowMin: 0.0
lowMax: 0.0
highMin: 1.0
highMax: 1.0
relative: false
scalingCount: 3
scaling0: 1.0
scaling1: 1.0
scaling2: 0.0
timelineCount: 3
timeline0: 0.0
timeline1: 0.70547944
timeline2: 1.0
- Options -
attached: false
continuous: false
aligned: false
additive: true
behind: false
premultipliedAlpha: false
- Image Path -
particle.png

View File

@@ -2,12 +2,24 @@ precision mediump float;
uniform sampler2D texture;
uniform vec3 color;
uniform float alpha;
varying vec2 pass_TexCoords;
vec3 saturateColor(in vec3 color, in float a);
void main() {
gl_FragColor.a = texture2D(texture, pass_TexCoords).a;
gl_FragColor.rgb = color;
float a = texture2D(texture, pass_TexCoords).a * alpha;
gl_FragColor = vec4(saturateColor(color, a), a);
}
vec3 saturateColor(in vec3 color, in float a){
float grayscale = (color.r * 0.299 + color.g * 0.587 + color. b * 0.114);
float alpha = ((1.1 - a) * 0.5) * 40.0;
return alpha * color + (1.0 - alpha) * vec3(grayscale, grayscale, grayscale);
}