Merge remote-tracking branch 'refs/remotes/origin/martin/ammobox'

# Conflicts: # game/assets/level/Underwatch.tiled-session
SE-TINF22B6 · Jun 6, 2024 · 13e3503 · 13e3503
2 parents f611367 + c7b4426
commit 13e3503
Show file tree

Hide file tree

Showing 37 changed files with 1,616 additions and 741 deletions.
diff --git a/...mation/fireAnimation3/fireAnimation31.png → ...ation/fireAnimation3/fireAnimation3_1.png b/...mation/fireAnimation3/fireAnimation31.png → ...ation/fireAnimation3/fireAnimation3_1.png
diff --git a/...mation/fireAnimation3/fireAnimation32.png → ...ation/fireAnimation3/fireAnimation3_2.png b/...mation/fireAnimation3/fireAnimation32.png → ...ation/fireAnimation3/fireAnimation3_2.png
diff --git a/...mation/fireAnimation3/fireAnimation33.png → ...ation/fireAnimation3/fireAnimation3_3.png b/...mation/fireAnimation3/fireAnimation33.png → ...ation/fireAnimation3/fireAnimation3_3.png
diff --git a/...mation/fireAnimation3/fireAnimation34.png → ...ation/fireAnimation3/fireAnimation3_4.png b/...mation/fireAnimation3/fireAnimation34.png → ...ation/fireAnimation3/fireAnimation3_4.png
diff --git a/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_1.png b/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_1.png
diff --git a/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_2.png b/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_2.png
diff --git a/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_3.png b/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_3.png
diff --git a/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_4.png b/...vel/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2/box_2_open_4.png
diff --git a/game/assets/particles/infinity.p b/game/assets/particles/infinity.p
diff --git a/game/assets/particles/particle.png b/game/assets/particles/particle.png
diff --git a/game/assets/particles/trail.p b/game/assets/particles/trail.p
@@ -0,0 +1,111 @@
+Trail
+- Delay -
+active: false
+- Duration - 
+lowMin: 200.0
+lowMax: 200.0
+- Count - 
+min: 0
+max: 2000
+- 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: 500.0
+highMax: 500.0
+relative: false
+scalingCount: 1
+scaling0: 1.0
+timelineCount: 1
+timeline0: 0.0
+independent: false
+- Life Offset - 
+active: false
+independent: 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
+- X Scale - 
+lowMin: 0.0
+lowMax: 0.0
+highMin: 5.0
+highMax: 5.0
+relative: false
+scalingCount: 2
+scaling0: 1.0
+scaling1: 0.0
+timelineCount: 2
+timeline0: 0.0
+timeline1: 1.0
+- Y Scale - 
+active: false
+- Velocity - 
+active: false
+- Angle - 
+active: false
+- Rotation - 
+active: false
+- Wind - 
+active: false
+- Gravity - 
+active: false
+- Tint - 
+colorsCount: 3
+colors0: 1.0
+colors1: 1.0
+colors2: 1.0
+timelineCount: 1
+timeline0: 0.0
+- Transparency - 
+lowMin: 0.0
+lowMax: 0.0
+highMin: 1.0
+highMax: 1.0
+relative: false
+scalingCount: 1
+scaling0: 1.0
+timelineCount: 1
+timeline0: 0.0
+- Options - 
+attached: false
+continuous: true
+aligned: false
+additive: false
+behind: false
+premultipliedAlpha: false
+spriteMode: single
+- Image Paths -
+particle.png
+