diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index f7c98dc..3b617ac 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -106,8 +106,10 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="Laser_L",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=OculusTouch_Left_Y_Click) +AxisMappings=(AxisName="TriggerR",Scale=1.000000,Key=OculusTouch_Right_Trigger_Axis) +AxisMappings=(AxisName="TriggerL",Scale=1.000000,Key=OculusTouch_Left_Trigger_Axis) -+AxisMappings=(AxisName="ScrollR",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_Y) -+AxisMappings=(AxisName="ScrollL",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) ++AxisMappings=(AxisName="RThumbY",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_Y) ++AxisMappings=(AxisName="RThumbX",Scale=1.000000,Key=OculusTouch_Right_Thumbstick_X) ++AxisMappings=(AxisName="LThumbY",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_Y) ++AxisMappings=(AxisName="LThumbX",Scale=1.000000,Key=OculusTouch_Left_Thumbstick_X) DefaultPlayerInputClass=/Script/Engine.PlayerInput DefaultInputComponentClass=/Script/Engine.InputComponent DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks diff --git a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon.uasset b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon.uasset index 9b9d34a..52843f8 100644 Binary files a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon.uasset and b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon.uasset differ diff --git a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_BaseColor.uasset b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_BaseColor.uasset index b43a5d2..1d6c3d4 100644 Binary files a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_BaseColor.uasset and b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_BaseColor.uasset differ diff --git a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_Normal.uasset b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_Normal.uasset index 605ffb8..4f00ffa 100644 Binary files a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_Normal.uasset and b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_Normal.uasset differ diff --git a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_OcclusionRoughnessMetallic.uasset b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_OcclusionRoughnessMetallic.uasset index 4b8cb78..ab88725 100644 Binary files a/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_OcclusionRoughnessMetallic.uasset and b/Content/Assets/Firecrackers/RedDragon/SM_RedDragon_M_RedDragon_001_OcclusionRoughnessMetallic.uasset differ diff --git a/Content/Assets/Obstacles/M_FanFX.uasset b/Content/Assets/Obstacles/M_FanFX.uasset new file mode 100644 index 0000000..ec404b7 Binary files /dev/null and b/Content/Assets/Obstacles/M_FanFX.uasset differ diff --git a/Content/Assets/Obstacles/M_Fan_case.uasset b/Content/Assets/Obstacles/M_Fan_case.uasset new file mode 100644 index 0000000..85759d0 Binary files /dev/null and b/Content/Assets/Obstacles/M_Fan_case.uasset differ diff --git a/Content/Assets/Obstacles/M_Fan_fan.uasset b/Content/Assets/Obstacles/M_Fan_fan.uasset new file mode 100644 index 0000000..f21775e Binary files /dev/null and b/Content/Assets/Obstacles/M_Fan_fan.uasset differ diff --git a/Content/Assets/Obstacles/M_LaserEmitter.uasset b/Content/Assets/Obstacles/M_LaserEmitter.uasset new file mode 100644 index 0000000..a490b83 Binary files /dev/null and b/Content/Assets/Obstacles/M_LaserEmitter.uasset differ diff --git a/Content/Assets/Obstacles/M_Target.uasset b/Content/Assets/Obstacles/M_Target.uasset new file mode 100644 index 0000000..5da4db7 Binary files /dev/null and b/Content/Assets/Obstacles/M_Target.uasset differ diff --git a/Content/Assets/Obstacles/M_Wiatraka.uasset b/Content/Assets/Obstacles/M_Wiatraka.uasset new file mode 100644 index 0000000..78f786c Binary files /dev/null and b/Content/Assets/Obstacles/M_Wiatraka.uasset differ diff --git a/Content/Assets/Obstacles/SM_Fan_case.uasset b/Content/Assets/Obstacles/SM_Fan_case.uasset new file mode 100644 index 0000000..6a0d68b Binary files /dev/null and b/Content/Assets/Obstacles/SM_Fan_case.uasset differ diff --git a/Content/Assets/Obstacles/SM_Fan_fan.uasset b/Content/Assets/Obstacles/SM_Fan_fan.uasset new file mode 100644 index 0000000..eca646e Binary files /dev/null and b/Content/Assets/Obstacles/SM_Fan_fan.uasset differ diff --git a/Content/Assets/Obstacles/SM_Fan_vfx.uasset b/Content/Assets/Obstacles/SM_Fan_vfx.uasset new file mode 100644 index 0000000..a44776d Binary files /dev/null and b/Content/Assets/Obstacles/SM_Fan_vfx.uasset differ diff --git a/Content/Assets/Obstacles/SM_LaserEmitter.uasset b/Content/Assets/Obstacles/SM_LaserEmitter.uasset new file mode 100644 index 0000000..3326bd9 Binary files /dev/null and b/Content/Assets/Obstacles/SM_LaserEmitter.uasset differ diff --git a/Content/Assets/Obstacles/SM_LaserEmitter_DefaultMaterial_BaseColor.uasset b/Content/Assets/Obstacles/SM_LaserEmitter_DefaultMaterial_BaseColor.uasset new file mode 100644 index 0000000..0e98a6a Binary files /dev/null and b/Content/Assets/Obstacles/SM_LaserEmitter_DefaultMaterial_BaseColor.uasset differ diff --git a/Content/Assets/Obstacles/SM_LaserEmitter_DefaultMaterial_OcclusionRoughnessMetallic.uasset b/Content/Assets/Obstacles/SM_LaserEmitter_DefaultMaterial_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..17751b2 Binary files /dev/null and b/Content/Assets/Obstacles/SM_LaserEmitter_DefaultMaterial_OcclusionRoughnessMetallic.uasset differ diff --git a/Content/Assets/Obstacles/SM_Target.uasset b/Content/Assets/Obstacles/SM_Target.uasset new file mode 100644 index 0000000..55ac0fe Binary files /dev/null and b/Content/Assets/Obstacles/SM_Target.uasset differ diff --git a/Content/Assets/Obstacles/SM_Target_DefaultMaterial_BaseColor.uasset b/Content/Assets/Obstacles/SM_Target_DefaultMaterial_BaseColor.uasset new file mode 100644 index 0000000..dfd34f6 Binary files /dev/null and b/Content/Assets/Obstacles/SM_Target_DefaultMaterial_BaseColor.uasset differ diff --git a/Content/Assets/Obstacles/SM_Target_Desaturated.uasset b/Content/Assets/Obstacles/SM_Target_Desaturated.uasset new file mode 100644 index 0000000..92c3331 Binary files /dev/null and b/Content/Assets/Obstacles/SM_Target_Desaturated.uasset differ diff --git a/Content/Assets/Obstacles/SM_Wiatrak.uasset b/Content/Assets/Obstacles/SM_Wiatrak.uasset new file mode 100644 index 0000000..42f2695 Binary files /dev/null and b/Content/Assets/Obstacles/SM_Wiatrak.uasset differ diff --git a/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_BaseColor.uasset b/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_BaseColor.uasset new file mode 100644 index 0000000..ae09858 Binary files /dev/null and b/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_BaseColor.uasset differ diff --git a/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_Normal.uasset b/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_Normal.uasset new file mode 100644 index 0000000..26fc741 Binary files /dev/null and b/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_Normal.uasset differ diff --git a/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_OcclusionRoughnessMetallic.uasset b/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..08d23fc Binary files /dev/null and b/Content/Assets/Obstacles/SM_Wiatrak_DefaultMaterial_OcclusionRoughnessMetallic.uasset differ diff --git a/Content/Assets/Obstacles/T_FanGradient.uasset b/Content/Assets/Obstacles/T_FanGradient.uasset new file mode 100644 index 0000000..bee93d3 Binary files /dev/null and b/Content/Assets/Obstacles/T_FanGradient.uasset differ diff --git a/Content/Assets/Obstacles/T_FanSpecs.uasset b/Content/Assets/Obstacles/T_FanSpecs.uasset new file mode 100644 index 0000000..09572f6 Binary files /dev/null and b/Content/Assets/Obstacles/T_FanSpecs.uasset differ diff --git a/Content/Blueprints/BP_FireworkBase.uasset b/Content/Blueprints/BP_FireworkBase.uasset index 9b8292a..1628939 100644 Binary files a/Content/Blueprints/BP_FireworkBase.uasset and b/Content/Blueprints/BP_FireworkBase.uasset differ diff --git a/Content/Blueprints/BP_Lighter.uasset b/Content/Blueprints/BP_Lighter.uasset index d3e7383..896c21c 100644 Binary files a/Content/Blueprints/BP_Lighter.uasset and b/Content/Blueprints/BP_Lighter.uasset differ diff --git a/Content/Blueprints/BP_Projectile.uasset b/Content/Blueprints/BP_Projectile.uasset index 10b0fd4..90f7abe 100644 Binary files a/Content/Blueprints/BP_Projectile.uasset and b/Content/Blueprints/BP_Projectile.uasset differ diff --git a/Content/Blueprints/Blocks/BP_Block_Basic.uasset b/Content/Blueprints/Blocks/BP_Block_Basic.uasset index 23bda64..714d5d6 100644 Binary files a/Content/Blueprints/Blocks/BP_Block_Basic.uasset and b/Content/Blueprints/Blocks/BP_Block_Basic.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Cluster.uasset b/Content/Blueprints/Fireworks/BP_Cluster.uasset index 848434b..3785b69 100644 Binary files a/Content/Blueprints/Fireworks/BP_Cluster.uasset and b/Content/Blueprints/Fireworks/BP_Cluster.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_RocketGuided.uasset b/Content/Blueprints/Fireworks/BP_RocketGuided.uasset index 1bf8445..cdd8f81 100644 Binary files a/Content/Blueprints/Fireworks/BP_RocketGuided.uasset and b/Content/Blueprints/Fireworks/BP_RocketGuided.uasset differ diff --git a/Content/Blueprints/Fireworks/BP_Sticky.uasset b/Content/Blueprints/Fireworks/BP_Sticky.uasset index e1608d4..980373c 100644 Binary files a/Content/Blueprints/Fireworks/BP_Sticky.uasset and b/Content/Blueprints/Fireworks/BP_Sticky.uasset differ diff --git a/Content/Blueprints/Obstacles/BP_ObstacleBase.uasset b/Content/Blueprints/Obstacles/BP_ObstacleBase.uasset new file mode 100644 index 0000000..e59ae4a Binary files /dev/null and b/Content/Blueprints/Obstacles/BP_ObstacleBase.uasset differ diff --git a/Content/Blueprints/Obstacles/BP_ObstacleFansDisable.uasset b/Content/Blueprints/Obstacles/BP_ObstacleFansDisable.uasset new file mode 100644 index 0000000..0c1c90c Binary files /dev/null and b/Content/Blueprints/Obstacles/BP_ObstacleFansDisable.uasset differ diff --git a/Content/Blueprints/Obstacles/BP_ObstacleLaserEmitter.uasset b/Content/Blueprints/Obstacles/BP_ObstacleLaserEmitter.uasset new file mode 100644 index 0000000..afc66a9 Binary files /dev/null and b/Content/Blueprints/Obstacles/BP_ObstacleLaserEmitter.uasset differ diff --git a/Content/Blueprints/Obstacles/BP_Obstacle_Fan.uasset b/Content/Blueprints/Obstacles/BP_Obstacle_Fan.uasset new file mode 100644 index 0000000..c5b03cc Binary files /dev/null and b/Content/Blueprints/Obstacles/BP_Obstacle_Fan.uasset differ diff --git a/Content/Blueprints/Obstacles/BP_Obstacle_Wiatrak.uasset b/Content/Blueprints/Obstacles/BP_Obstacle_Wiatrak.uasset new file mode 100644 index 0000000..2ae7478 Binary files /dev/null and b/Content/Blueprints/Obstacles/BP_Obstacle_Wiatrak.uasset differ diff --git a/Content/Blueprints/UI/BP_Menu.uasset b/Content/Blueprints/UI/BP_Menu.uasset index 45fd54c..51af511 100644 Binary files a/Content/Blueprints/UI/BP_Menu.uasset and b/Content/Blueprints/UI/BP_Menu.uasset differ diff --git a/Content/Levels/L_Level1.uasset b/Content/Levels/L_Level1.uasset index d953ffa..d4653c8 100644 Binary files a/Content/Levels/L_Level1.uasset and b/Content/Levels/L_Level1.uasset differ diff --git a/Content/Levels/L_Level10.uasset b/Content/Levels/L_Level10.uasset index e8a1796..eb69a9d 100644 Binary files a/Content/Levels/L_Level10.uasset and b/Content/Levels/L_Level10.uasset differ diff --git a/Content/Levels/L_Level11.uasset b/Content/Levels/L_Level11.uasset index 91b5753..2b95bcc 100644 Binary files a/Content/Levels/L_Level11.uasset and b/Content/Levels/L_Level11.uasset differ diff --git a/Content/Levels/L_Level12.uasset b/Content/Levels/L_Level12.uasset index 3e6c9d3..8da7b1c 100644 Binary files a/Content/Levels/L_Level12.uasset and b/Content/Levels/L_Level12.uasset differ diff --git a/Content/Levels/L_Level13.uasset b/Content/Levels/L_Level13.uasset index 71e305d..763d54e 100644 Binary files a/Content/Levels/L_Level13.uasset and b/Content/Levels/L_Level13.uasset differ diff --git a/Content/Levels/L_Level14.uasset b/Content/Levels/L_Level14.uasset index afe7f08..fc7e72e 100644 Binary files a/Content/Levels/L_Level14.uasset and b/Content/Levels/L_Level14.uasset differ diff --git a/Content/Levels/L_Level15.uasset b/Content/Levels/L_Level15.uasset index 4300976..25564cf 100644 Binary files a/Content/Levels/L_Level15.uasset and b/Content/Levels/L_Level15.uasset differ diff --git a/Content/Levels/L_Level16.uasset b/Content/Levels/L_Level16.uasset index 9b602b8..9257c42 100644 Binary files a/Content/Levels/L_Level16.uasset and b/Content/Levels/L_Level16.uasset differ diff --git a/Content/Levels/L_Level17.uasset b/Content/Levels/L_Level17.uasset index 031e46d..fecdea8 100644 Binary files a/Content/Levels/L_Level17.uasset and b/Content/Levels/L_Level17.uasset differ diff --git a/Content/Levels/L_Level18.uasset b/Content/Levels/L_Level18.uasset index a2b5f25..968d207 100644 Binary files a/Content/Levels/L_Level18.uasset and b/Content/Levels/L_Level18.uasset differ diff --git a/Content/Levels/L_Level19.uasset b/Content/Levels/L_Level19.uasset index 61106a8..450da09 100644 Binary files a/Content/Levels/L_Level19.uasset and b/Content/Levels/L_Level19.uasset differ diff --git a/Content/Levels/L_Level2.uasset b/Content/Levels/L_Level2.uasset index a3e4fa7..6e41f5e 100644 Binary files a/Content/Levels/L_Level2.uasset and b/Content/Levels/L_Level2.uasset differ diff --git a/Content/Levels/L_Level20.uasset b/Content/Levels/L_Level20.uasset index 1b0b8d5..b9cd8df 100644 Binary files a/Content/Levels/L_Level20.uasset and b/Content/Levels/L_Level20.uasset differ diff --git a/Content/Levels/L_Level21.uasset b/Content/Levels/L_Level21.uasset index e18d9d6..c6ea0b0 100644 Binary files a/Content/Levels/L_Level21.uasset and b/Content/Levels/L_Level21.uasset differ diff --git a/Content/Levels/L_Level22.uasset b/Content/Levels/L_Level22.uasset index 66d9362..edefbcb 100644 Binary files a/Content/Levels/L_Level22.uasset and b/Content/Levels/L_Level22.uasset differ diff --git a/Content/Levels/L_Level23.uasset b/Content/Levels/L_Level23.uasset index 60f627b..ef012da 100644 Binary files a/Content/Levels/L_Level23.uasset and b/Content/Levels/L_Level23.uasset differ diff --git a/Content/Levels/L_Level24.uasset b/Content/Levels/L_Level24.uasset index f4e6a8f..88363c5 100644 Binary files a/Content/Levels/L_Level24.uasset and b/Content/Levels/L_Level24.uasset differ diff --git a/Content/Levels/L_Level25.uasset b/Content/Levels/L_Level25.uasset index db81c91..701b46b 100644 Binary files a/Content/Levels/L_Level25.uasset and b/Content/Levels/L_Level25.uasset differ diff --git a/Content/Levels/L_Level26.uasset b/Content/Levels/L_Level26.uasset index a2681f3..8fd09a9 100644 Binary files a/Content/Levels/L_Level26.uasset and b/Content/Levels/L_Level26.uasset differ diff --git a/Content/Levels/L_Level27.uasset b/Content/Levels/L_Level27.uasset index eade9d2..72e017a 100644 Binary files a/Content/Levels/L_Level27.uasset and b/Content/Levels/L_Level27.uasset differ diff --git a/Content/Levels/L_Level28.uasset b/Content/Levels/L_Level28.uasset index 5d5ed2a..92cc10b 100644 Binary files a/Content/Levels/L_Level28.uasset and b/Content/Levels/L_Level28.uasset differ diff --git a/Content/Levels/L_Level29.uasset b/Content/Levels/L_Level29.uasset index fadd0bd..78f5770 100644 Binary files a/Content/Levels/L_Level29.uasset and b/Content/Levels/L_Level29.uasset differ diff --git a/Content/Levels/L_Level3.uasset b/Content/Levels/L_Level3.uasset index 1ac242b..2a53e09 100644 Binary files a/Content/Levels/L_Level3.uasset and b/Content/Levels/L_Level3.uasset differ diff --git a/Content/Levels/L_Level30.uasset b/Content/Levels/L_Level30.uasset index 904f6cf..bad4465 100644 Binary files a/Content/Levels/L_Level30.uasset and b/Content/Levels/L_Level30.uasset differ diff --git a/Content/Levels/L_Level4.uasset b/Content/Levels/L_Level4.uasset index fa29212..b45b01e 100644 Binary files a/Content/Levels/L_Level4.uasset and b/Content/Levels/L_Level4.uasset differ diff --git a/Content/Levels/L_Level5.uasset b/Content/Levels/L_Level5.uasset index fa1fb0c..51563bc 100644 Binary files a/Content/Levels/L_Level5.uasset and b/Content/Levels/L_Level5.uasset differ diff --git a/Content/Levels/L_Level6.uasset b/Content/Levels/L_Level6.uasset index fd06d9f..c5ba945 100644 Binary files a/Content/Levels/L_Level6.uasset and b/Content/Levels/L_Level6.uasset differ diff --git a/Content/Levels/L_Level7.uasset b/Content/Levels/L_Level7.uasset index 3d3241a..4f1e571 100644 Binary files a/Content/Levels/L_Level7.uasset and b/Content/Levels/L_Level7.uasset differ diff --git a/Content/Levels/L_Level8.uasset b/Content/Levels/L_Level8.uasset index b050f56..ab9f0fe 100644 Binary files a/Content/Levels/L_Level8.uasset and b/Content/Levels/L_Level8.uasset differ diff --git a/Content/Levels/L_Level9.uasset b/Content/Levels/L_Level9.uasset index 85eec57..a4ba4e4 100644 Binary files a/Content/Levels/L_Level9.uasset and b/Content/Levels/L_Level9.uasset differ diff --git a/Content/Levels/L_LevelBase.uasset b/Content/Levels/L_LevelBase.uasset index 4266f7f..fb2099a 100644 Binary files a/Content/Levels/L_LevelBase.uasset and b/Content/Levels/L_LevelBase.uasset differ diff --git a/Content/Levels/L_MainLevel.umap b/Content/Levels/L_MainLevel.umap index 4459774..9043189 100644 Binary files a/Content/Levels/L_MainLevel.umap and b/Content/Levels/L_MainLevel.umap differ diff --git a/Content/Levels/Tilemaps/TM_Level10.uasset b/Content/Levels/Tilemaps/TM_Level10.uasset index 0b30fc3..277bae3 100644 Binary files a/Content/Levels/Tilemaps/TM_Level10.uasset and b/Content/Levels/Tilemaps/TM_Level10.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level11.uasset b/Content/Levels/Tilemaps/TM_Level11.uasset index 39a552d..767c023 100644 Binary files a/Content/Levels/Tilemaps/TM_Level11.uasset and b/Content/Levels/Tilemaps/TM_Level11.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level12.uasset b/Content/Levels/Tilemaps/TM_Level12.uasset index 2fb1d84..dd66413 100644 Binary files a/Content/Levels/Tilemaps/TM_Level12.uasset and b/Content/Levels/Tilemaps/TM_Level12.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level13.uasset b/Content/Levels/Tilemaps/TM_Level13.uasset index 7237929..91d1630 100644 Binary files a/Content/Levels/Tilemaps/TM_Level13.uasset and b/Content/Levels/Tilemaps/TM_Level13.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level14.uasset b/Content/Levels/Tilemaps/TM_Level14.uasset index cbc261c..0c3e14c 100644 Binary files a/Content/Levels/Tilemaps/TM_Level14.uasset and b/Content/Levels/Tilemaps/TM_Level14.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level16.uasset b/Content/Levels/Tilemaps/TM_Level16.uasset index c15b8d9..a3af1b5 100644 Binary files a/Content/Levels/Tilemaps/TM_Level16.uasset and b/Content/Levels/Tilemaps/TM_Level16.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level17.uasset b/Content/Levels/Tilemaps/TM_Level17.uasset index 7fa4d07..eeadd51 100644 Binary files a/Content/Levels/Tilemaps/TM_Level17.uasset and b/Content/Levels/Tilemaps/TM_Level17.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level18.uasset b/Content/Levels/Tilemaps/TM_Level18.uasset index acef4ed..63fa5ed 100644 Binary files a/Content/Levels/Tilemaps/TM_Level18.uasset and b/Content/Levels/Tilemaps/TM_Level18.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level19.uasset b/Content/Levels/Tilemaps/TM_Level19.uasset index 635a18c..09220d5 100644 Binary files a/Content/Levels/Tilemaps/TM_Level19.uasset and b/Content/Levels/Tilemaps/TM_Level19.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level2.uasset b/Content/Levels/Tilemaps/TM_Level2.uasset index 2f9f79d..df74f2a 100644 Binary files a/Content/Levels/Tilemaps/TM_Level2.uasset and b/Content/Levels/Tilemaps/TM_Level2.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level20.uasset b/Content/Levels/Tilemaps/TM_Level20.uasset index 771f388..270eaac 100644 Binary files a/Content/Levels/Tilemaps/TM_Level20.uasset and b/Content/Levels/Tilemaps/TM_Level20.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level21.uasset b/Content/Levels/Tilemaps/TM_Level21.uasset index ffb5404..aca52cb 100644 Binary files a/Content/Levels/Tilemaps/TM_Level21.uasset and b/Content/Levels/Tilemaps/TM_Level21.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level22.uasset b/Content/Levels/Tilemaps/TM_Level22.uasset index 9b25208..5999dc6 100644 Binary files a/Content/Levels/Tilemaps/TM_Level22.uasset and b/Content/Levels/Tilemaps/TM_Level22.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level23.uasset b/Content/Levels/Tilemaps/TM_Level23.uasset index 8a8904c..c2eba05 100644 Binary files a/Content/Levels/Tilemaps/TM_Level23.uasset and b/Content/Levels/Tilemaps/TM_Level23.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level24.uasset b/Content/Levels/Tilemaps/TM_Level24.uasset index 9bc9b9c..77c0c4a 100644 Binary files a/Content/Levels/Tilemaps/TM_Level24.uasset and b/Content/Levels/Tilemaps/TM_Level24.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level25.uasset b/Content/Levels/Tilemaps/TM_Level25.uasset index 410875b..3f286a6 100644 Binary files a/Content/Levels/Tilemaps/TM_Level25.uasset and b/Content/Levels/Tilemaps/TM_Level25.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level26.uasset b/Content/Levels/Tilemaps/TM_Level26.uasset index 477cf5d..2450f52 100644 Binary files a/Content/Levels/Tilemaps/TM_Level26.uasset and b/Content/Levels/Tilemaps/TM_Level26.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level27.uasset b/Content/Levels/Tilemaps/TM_Level27.uasset index 865c0a8..d40ccde 100644 Binary files a/Content/Levels/Tilemaps/TM_Level27.uasset and b/Content/Levels/Tilemaps/TM_Level27.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level28.uasset b/Content/Levels/Tilemaps/TM_Level28.uasset index 744e05b..0884bd4 100644 Binary files a/Content/Levels/Tilemaps/TM_Level28.uasset and b/Content/Levels/Tilemaps/TM_Level28.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level29.uasset b/Content/Levels/Tilemaps/TM_Level29.uasset index c66b0e9..619b9fb 100644 Binary files a/Content/Levels/Tilemaps/TM_Level29.uasset and b/Content/Levels/Tilemaps/TM_Level29.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level3.uasset b/Content/Levels/Tilemaps/TM_Level3.uasset index 4b55f15..cd648bb 100644 Binary files a/Content/Levels/Tilemaps/TM_Level3.uasset and b/Content/Levels/Tilemaps/TM_Level3.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level30.uasset b/Content/Levels/Tilemaps/TM_Level30.uasset index ad2bbd0..2d4e66b 100644 Binary files a/Content/Levels/Tilemaps/TM_Level30.uasset and b/Content/Levels/Tilemaps/TM_Level30.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level5.uasset b/Content/Levels/Tilemaps/TM_Level5.uasset index f874fb7..0929a93 100644 Binary files a/Content/Levels/Tilemaps/TM_Level5.uasset and b/Content/Levels/Tilemaps/TM_Level5.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level6.uasset b/Content/Levels/Tilemaps/TM_Level6.uasset index d7c0fb8..809f9ed 100644 Binary files a/Content/Levels/Tilemaps/TM_Level6.uasset and b/Content/Levels/Tilemaps/TM_Level6.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level7.uasset b/Content/Levels/Tilemaps/TM_Level7.uasset index 46954a4..28b8ec5 100644 Binary files a/Content/Levels/Tilemaps/TM_Level7.uasset and b/Content/Levels/Tilemaps/TM_Level7.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level8.uasset b/Content/Levels/Tilemaps/TM_Level8.uasset index 37cbcc8..af10aaa 100644 Binary files a/Content/Levels/Tilemaps/TM_Level8.uasset and b/Content/Levels/Tilemaps/TM_Level8.uasset differ diff --git a/Content/Levels/Tilemaps/TM_Level9.uasset b/Content/Levels/Tilemaps/TM_Level9.uasset index e41abb1..2871b4b 100644 Binary files a/Content/Levels/Tilemaps/TM_Level9.uasset and b/Content/Levels/Tilemaps/TM_Level9.uasset differ diff --git a/Content/Materials/M_LaserRed.uasset b/Content/Materials/M_LaserRed.uasset new file mode 100644 index 0000000..4eb0135 Binary files /dev/null and b/Content/Materials/M_LaserRed.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb1.uasset b/Content/Textures/LevelThumbnails/LevelThumb1.uasset index dd9a919..6efac8e 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb1.uasset and b/Content/Textures/LevelThumbnails/LevelThumb1.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb10.uasset b/Content/Textures/LevelThumbnails/LevelThumb10.uasset index a1b7637..3f57c59 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb10.uasset and b/Content/Textures/LevelThumbnails/LevelThumb10.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb11.uasset b/Content/Textures/LevelThumbnails/LevelThumb11.uasset index 43431fb..d4fad66 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb11.uasset and b/Content/Textures/LevelThumbnails/LevelThumb11.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb12.uasset b/Content/Textures/LevelThumbnails/LevelThumb12.uasset index 3236198..af2f067 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb12.uasset and b/Content/Textures/LevelThumbnails/LevelThumb12.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb13.uasset b/Content/Textures/LevelThumbnails/LevelThumb13.uasset index 72545a1..f29993a 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb13.uasset and b/Content/Textures/LevelThumbnails/LevelThumb13.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb14.uasset b/Content/Textures/LevelThumbnails/LevelThumb14.uasset index 333b128..278dfc2 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb14.uasset and b/Content/Textures/LevelThumbnails/LevelThumb14.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb15.uasset b/Content/Textures/LevelThumbnails/LevelThumb15.uasset index aadea02..0a8c792 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb15.uasset and b/Content/Textures/LevelThumbnails/LevelThumb15.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb16.uasset b/Content/Textures/LevelThumbnails/LevelThumb16.uasset index 5933d3f..9473460 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb16.uasset and b/Content/Textures/LevelThumbnails/LevelThumb16.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb17.uasset b/Content/Textures/LevelThumbnails/LevelThumb17.uasset index ee78ef3..11419f8 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb17.uasset and b/Content/Textures/LevelThumbnails/LevelThumb17.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb18.uasset b/Content/Textures/LevelThumbnails/LevelThumb18.uasset index bb050f1..7b415c6 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb18.uasset and b/Content/Textures/LevelThumbnails/LevelThumb18.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb19.uasset b/Content/Textures/LevelThumbnails/LevelThumb19.uasset index fcfa21c..cdaf5b1 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb19.uasset and b/Content/Textures/LevelThumbnails/LevelThumb19.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb2.uasset b/Content/Textures/LevelThumbnails/LevelThumb2.uasset index e023913..2c490ed 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb2.uasset and b/Content/Textures/LevelThumbnails/LevelThumb2.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb20.uasset b/Content/Textures/LevelThumbnails/LevelThumb20.uasset index 526fc6b..8f084c5 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb20.uasset and b/Content/Textures/LevelThumbnails/LevelThumb20.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb21.uasset b/Content/Textures/LevelThumbnails/LevelThumb21.uasset index 7e1e4a3..dadf606 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb21.uasset and b/Content/Textures/LevelThumbnails/LevelThumb21.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb22.uasset b/Content/Textures/LevelThumbnails/LevelThumb22.uasset index df54566..f8742f5 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb22.uasset and b/Content/Textures/LevelThumbnails/LevelThumb22.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb23.uasset b/Content/Textures/LevelThumbnails/LevelThumb23.uasset index 290e875..791a23b 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb23.uasset and b/Content/Textures/LevelThumbnails/LevelThumb23.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb24.uasset b/Content/Textures/LevelThumbnails/LevelThumb24.uasset index c36d41c..b6a9c02 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb24.uasset and b/Content/Textures/LevelThumbnails/LevelThumb24.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb25.uasset b/Content/Textures/LevelThumbnails/LevelThumb25.uasset index 720122d..afd0df6 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb25.uasset and b/Content/Textures/LevelThumbnails/LevelThumb25.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb26.uasset b/Content/Textures/LevelThumbnails/LevelThumb26.uasset index fcf3fbe..6f06850 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb26.uasset and b/Content/Textures/LevelThumbnails/LevelThumb26.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb27.uasset b/Content/Textures/LevelThumbnails/LevelThumb27.uasset index 3bef01b..52f3c2c 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb27.uasset and b/Content/Textures/LevelThumbnails/LevelThumb27.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb28.uasset b/Content/Textures/LevelThumbnails/LevelThumb28.uasset index cdeb532..00566fd 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb28.uasset and b/Content/Textures/LevelThumbnails/LevelThumb28.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb29.uasset b/Content/Textures/LevelThumbnails/LevelThumb29.uasset index 4267c4a..566fa61 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb29.uasset and b/Content/Textures/LevelThumbnails/LevelThumb29.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb3.uasset b/Content/Textures/LevelThumbnails/LevelThumb3.uasset index c214178..f87fbb3 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb3.uasset and b/Content/Textures/LevelThumbnails/LevelThumb3.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb30.uasset b/Content/Textures/LevelThumbnails/LevelThumb30.uasset index be3a703..77c3777 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb30.uasset and b/Content/Textures/LevelThumbnails/LevelThumb30.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb4.uasset b/Content/Textures/LevelThumbnails/LevelThumb4.uasset index a7198b4..ad03558 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb4.uasset and b/Content/Textures/LevelThumbnails/LevelThumb4.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb5.uasset b/Content/Textures/LevelThumbnails/LevelThumb5.uasset index b0b45a0..b2270b9 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb5.uasset and b/Content/Textures/LevelThumbnails/LevelThumb5.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb6.uasset b/Content/Textures/LevelThumbnails/LevelThumb6.uasset index ef165e2..c83b4f8 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb6.uasset and b/Content/Textures/LevelThumbnails/LevelThumb6.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb7.uasset b/Content/Textures/LevelThumbnails/LevelThumb7.uasset index 8a6cde7..5d5e0f6 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb7.uasset and b/Content/Textures/LevelThumbnails/LevelThumb7.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb8.uasset b/Content/Textures/LevelThumbnails/LevelThumb8.uasset index a92b930..518e639 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb8.uasset and b/Content/Textures/LevelThumbnails/LevelThumb8.uasset differ diff --git a/Content/Textures/LevelThumbnails/LevelThumb9.uasset b/Content/Textures/LevelThumbnails/LevelThumb9.uasset index 5923325..892ec02 100644 Binary files a/Content/Textures/LevelThumbnails/LevelThumb9.uasset and b/Content/Textures/LevelThumbnails/LevelThumb9.uasset differ diff --git a/Source/FireworkDuels/Private/LevelTemplate.cpp b/Source/FireworkDuels/Private/LevelTemplate.cpp index 03d4f50..91919f5 100644 --- a/Source/FireworkDuels/Private/LevelTemplate.cpp +++ b/Source/FireworkDuels/Private/LevelTemplate.cpp @@ -8,8 +8,9 @@ ALevelTemplate::ALevelTemplate() { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; + RootComponent = CreateDefaultSubobject(TEXT("Root")); Template = CreateDefaultSubobject(TEXT("TemplateTilemap")); - + Template->SetupAttachment(RootComponent); } // Called when the game starts or when spawned diff --git a/Source/FireworkDuels/Public/LevelTemplate.h b/Source/FireworkDuels/Public/LevelTemplate.h index e4852c2..6d72469 100644 --- a/Source/FireworkDuels/Public/LevelTemplate.h +++ b/Source/FireworkDuels/Public/LevelTemplate.h @@ -5,6 +5,7 @@ #include "CoreMinimal.h" #include "GameFramework/Actor.h" #include "PaperTileMapComponent.h" +#include "Components/SceneComponent.h" #include "LevelTemplate.generated.h" UCLASS()