Merge remote-tracking branch 'origin/main'

# Conflicts:
#	SMIMS-Game/MyWorld.class
This commit is contained in:
2026-09-16 16:22:34 +02:00
13 changed files with 109 additions and 28 deletions
+25 -17
View File
@@ -3,6 +3,7 @@ class.BreakingPlattform.image=Unbenannt2.png
class.Button.image=button-red.png
class.GameOverWorld.image=GameOverBackground.png
class.Ground.image=weave.jpg
class.HealthItem.image=herz.png
class.JumpBoostItem.image=mushroom.png
class.MovingPlattform.image=Unbenannt.png
class.MyWorld.image=GameBackground.png
@@ -137,7 +138,7 @@ editor.fx.0.x=360
editor.fx.0.y=26
height=830
package.numDependencies=39
package.numTargets=21
package.numTargets=22
project.charset=UTF-8
publish.hasSource=false
publish.locked=true
@@ -160,70 +161,70 @@ target1.width=120
target1.x=0
target1.y=0
target10.height=70
target10.name=StartWorld
target10.name=PlayerTestWorld
target10.showInterface=false
target10.type=ClassTarget
target10.width=120
target10.x=0
target10.y=0
target11.height=70
target11.name=Plattform
target11.name=StartWorld
target11.showInterface=false
target11.type=ClassTarget
target11.width=120
target11.x=0
target11.y=0
target12.height=70
target12.name=TargetingProjectile
target12.name=Plattform
target12.showInterface=false
target12.type=ClassTarget
target12.width=120
target12.x=0
target12.y=0
target13.height=70
target13.name=Projectile
target13.name=TargetingProjectile
target13.showInterface=false
target13.type=ClassTarget
target13.width=120
target13.x=0
target13.y=0
target14.height=70
target14.name=Score
target14.name=Projectile
target14.showInterface=false
target14.type=ClassTarget
target14.width=120
target14.x=0
target14.y=0
target15.height=70
target15.name=Button
target15.name=Score
target15.showInterface=false
target15.type=ClassTarget
target15.width=120
target15.x=0
target15.y=0
target16.height=70
target16.name=EnemyProjectile
target16.name=Button
target16.showInterface=false
target16.type=ClassTarget
target16.width=120
target16.x=0
target16.y=0
target17.height=70
target17.name=PowerUps
target17.name=EnemyProjectile
target17.showInterface=false
target17.type=ClassTarget
target17.width=120
target17.x=0
target17.y=0
target18.height=70
target18.name=Enemy
target18.name=PowerUps
target18.showInterface=false
target18.type=ClassTarget
target18.width=120
target18.x=0
target18.y=0
target19.height=70
target19.name=PlayerProjectile
target19.name=Enemy
target19.showInterface=false
target19.type=ClassTarget
target19.width=120
@@ -237,19 +238,26 @@ target2.width=120
target2.x=0
target2.y=0
target20.height=70
target20.name=SpikedPlattform
target20.name=PlayerProjectile
target20.showInterface=false
target20.type=ClassTarget
target20.width=120
target20.x=0
target20.y=0
target21.height=70
target21.name=MyWorld
target21.name=SpikedPlattform
target21.showInterface=false
target21.type=ClassTarget
target21.width=120
target21.x=0
target21.y=0
target22.height=70
target22.name=MyWorld
target22.showInterface=false
target22.type=ClassTarget
target22.width=120
target22.x=0
target22.y=0
target3.height=70
target3.name=MovingPlattform
target3.showInterface=false
@@ -272,28 +280,28 @@ target5.width=120
target5.x=0
target5.y=0
target6.height=70
target6.name=JumpBoostItem
target6.name=HealthItem
target6.showInterface=false
target6.type=ClassTarget
target6.width=120
target6.x=0
target6.y=0
target7.height=70
target7.name=BreakingPlattform
target7.name=JumpBoostItem
target7.showInterface=false
target7.type=ClassTarget
target7.width=120
target7.x=0
target7.y=0
target8.height=70
target8.name=GameOverWorld
target8.name=BreakingPlattform
target8.showInterface=false
target8.type=ClassTarget
target8.width=120
target8.x=0
target8.y=0
target9.height=70
target9.name=PlayerTestWorld
target9.name=GameOverWorld
target9.showInterface=false
target9.type=ClassTarget
target9.width=120