Merge branch 'master' into patch-1

tomlooman · Jan 21, 2021 · 20fe933 · 20fe933
2 parents 979f50f + b5b5432
commit 20fe933
Show file tree

Hide file tree

Showing 186 changed files with 169 additions and 119 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ Intermediate
 Saved
 DerivedDataCache
 .vs
+.idea
 *.sdf
 *.opensdf
 *.sln

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 Tom Looman
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -1,65 +1,56 @@
 Epic Survival Game Series
 -------------------------
 
-**Last updated for 4.24!**
+**Last updated for 4.26!**
 
 Third-person survival game for Unreal Engine 4 made entirely in C++. Originally built as a 6 section tutorial series, now available as open-source C++ sample project.
 
-See [the main documentation page on the unreal engine Wiki](https://www.ue4community.wiki/Legacy/Survival_sample_game).
+See [the main documentation page](https://www.tomlooman.com/survival-sample-game-for-ue4/) for walkthrough of many of the features.
+
+![alt text](https://www.tomlooman.com/wp-content/uploads/2015/04/section6_equipment03.jpg)
+
+![alt text](https://www.tomlooman.com/wp-content/uploads/2015/04/section6_advancedanimbp031.jpg)
 
 For questions & feedback visit [the official thread on the unreal engine forums](https://forums.unrealengine.com/showthread.php?63678-Upcoming-C-Gameplay-Example-Series-Making-a-Survival-Game)
 
 **Looking for a step by step guide?** I released my **[Unreal Engine 4 Mastery: Create Multiplayer Games with C++](https://www.udemy.com/unrealengine-cpp/?couponCode=TLGH14)!** Which includes two games teaching you C++, Networking for multiplayer and multiple AI including advanced behavior trees for ranged shooter AI.
 
 Get the Udemy Course now and learn C++ for Unreal Engine 4: [DISCOUNT LINK](https://www.udemy.com/unrealengine-cpp/?couponCode=TLGH14)
 
-### NEW: Mod Support
-Includes two small mod examples including a Pink Rifle extension and Flashlight replacement mod. [Check out the Modding Sample Project for guidelines & cooker profile setup](https://www.ue4community.wiki/Legacy/Modding:_Adding_mod-support_to_your_Unreal_Engine_4_project)
-
-Example commandline arg to load the Mod gamemode with the built-in level "CoopLandscape" in a cooked game build:
-SurvivalGame.exe /Game/Maps/CoopLandscape_Map?game=/ExtendedRifleMod/SurvivalGameMode_PinkRifle.SurvivalGameMode_PinkRifle_C
-
-There is currently no supporting UI to load up specific mod content, please note that the modding pipeline is a experimental and intended for early adopters only!
-
 ### Section 1
 This section sets up the third person character movement with animation, object interaction, simple hunger system, all with networking support.
 
-- [Documentation page](https://www.ue4community.wiki/Legacy/Survival_Sample_Game:_Section_1)
-- [Forum Thread](https://forums.unrealengine.com/showthread.php?64833-Announcing-Section-1-for-Survival-Game)
-- [Branch on Github](https://github.com/tomlooman/EpicSurvivalGameSeries/tree/Section-1)
+- [Documentation page](https://www.tomlooman.com/survival-sample-game-for-ue4/section-one/)
 
 ### Section 2
 Adds weapon support for the character, a flashlight, UT-style inventory with on-character visual representation of the carried items and deals with damage, death and respawns for players.
 
-- [Documentation page](https://www.ue4community.wiki/Legacy/Survival_Sample_Game:_Section_2)
-- [Forum Thread](https://forums.unrealengine.com/showthread.php?66263-Announcing-Section-2-for-Survival-Game)
-- [Branch on Github](https://github.com/tomlooman/EpicSurvivalGameSeries/tree/Section-2)
+- [Documentation page](https://www.tomlooman.com/survival-sample-game-for-ue4/section-two/)
 
 ### Section 3
 Introduces AI "Zombie" enemy to our game using PawnSensing and Behavior Tree.
 
-- [Documentation page](https://www.ue4community.wiki/Legacy/Survival_Sample_Game:_Section_3)
-- [Forum Thread](https://forums.unrealengine.com/showthread.php?67859-Announcing-Section-3-for-Survival-Game)
-- [Branch on Github](https://github.com/tomlooman/EpicSurvivalGameSeries/tree/Section-3)
+- [Documentation page](https://www.tomlooman.com/survival-sample-game-for-ue4/section-three/)
 
 ### Section 4
 Introduces a gameloop with enemies, items, scoring and a time of day.
 
 - [Documentation page](https://www.ue4community.wiki/Legacy/Survival_Sample_Game:_Section_4)
-- [Forum Thread](https://forums.unrealengine.com/showthread.php?69308-Announcing-Section-4-for-Survival-Game-Setting-up-the-survival-game-loop)
-- [Branch on Github](https://github.com/tomlooman/EpicSurvivalGameSeries/tree/Section-4)
 
 ### Section 5
 Introduces the ability to carry around objects like barriers and discusses game networking.
 
 - [Documentation page](https://www.ue4community.wiki/Legacy/Survival_Sample_Game:_Section_5)
-- [Forum Thread](https://forums.unrealengine.com/showthread.php?71057-Announcing-Section-5-of-Survival-Game-Networking-your-game)
-- [Branch on Github](https://github.com/tomlooman/EpicSurvivalGameSeries/tree/Section-5)
 
 ### Section 6
 The final section in the series focuses on bug fixing and a bit of polish to the existing features. This section is compatible with the 4.8 release.
 
 - [Documentation page](https://www.ue4community.wiki/Legacy/Survival_Sample_Game:_Section_6)
-- [Forum Thread](https://forums.unrealengine.com/showthread.php?72313-Announcing-Section-6-of-Survival-Game-Adding-some-polish)
-- [Branch on Github](https://github.com/tomlooman/EpicSurvivalGameSeries/tree/Section-6)
 
+### NEW: Mod Support
+Includes two small mod examples including a Pink Rifle extension and Flashlight replacement mod. [Check out the Modding Sample Project for guidelines & cooker profile setup](https://www.tomlooman.com/add-mod-support-to-your-unreal-engine-4-game/)
+
+Example commandline arg to load the Mod gamemode with the built-in level "CoopLandscape" in a cooked game build:
+SurvivalGame.exe /Game/Maps/CoopLandscape_Map?game=/ExtendedRifleMod/SurvivalGameMode_PinkRifle.SurvivalGameMode_PinkRifle_C
+
+There is currently no supporting UI to load up specific mod content, please note that the modding pipeline is a experimental and intended for early adopters only!
diff --git a/SurvivalGame/Binaries/Win64/UE4Editor-SurvivalGame.dll b/SurvivalGame/Binaries/Win64/UE4Editor-SurvivalGame.dll
diff --git a/SurvivalGame/Config/DefaultEditor.ini b/SurvivalGame/Config/DefaultEditor.ini
@@ -4,4 +4,3 @@ bReplaceBlueprintWithClass=true
 bDontLoadBlueprintOutsideEditor=true
 bBlueprintIsNotBlueprintType=true
 
-
diff --git a/SurvivalGame/Config/DefaultEngine.ini b/SurvivalGame/Config/DefaultEngine.ini
@@ -9,6 +9,20 @@ AppliedDefaultGraphicsPerformance=Maximum
 ; Our custom LocalPlayer class
 LocalPlayerClassName=/Script/SurvivalGame.SLocalPlayer
 
+; STEAM CONFIG START
+[/Script/Engine.GameEngine]
++NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="/Script/OnlineSubsystemSteam.SteamNetDriver",DriverClassNameFallback="/Script/OnlineSubsystemUtils.IpNetDriver")
+
+[OnlineSubsystem]
+DefaultPlatformService=Steam
+
+[OnlineSubsystemSteam]
+bEnabled=true
+SteamDevAppId=480 ; default app id for testing apps (can change to your own AppID if you have one)
+;SteamAppId=480 ; this must be changed to your own ID for shipping builds eventually
+
+; STEAM CONFIG END
+
 [/Script/Engine.UserInterfaceSettings]
 RenderFocusRule=NavigationOnly
 DefaultCursor=None
@@ -44,7 +58,7 @@ r.DefaultFeature.AmbientOcclusionStaticFraction=True
 r.DefaultFeature.AutoExposure=True
 r.DefaultFeature.MotionBlur=False
 r.DefaultFeature.LensFlare=False
-r.DefaultFeature.AntiAliasing=1
+r.DefaultFeature.AntiAliasing=2
 r.EarlyZPass=3
 r.EarlyZPassMovable=False
 r.DBuffer=False
@@ -167,4 +181,3 @@ PhysXTreeRebuildRate=10
 DefaultBroadphaseSettings=(bUseMBPOnClient=False,bUseMBPOnServer=False,bUseMBPOuterBounds=False,MBPBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPOuterBounds=(Min=(X=0.000000,Y=0.000000,Z=0.000000),Max=(X=0.000000,Y=0.000000,Z=0.000000),IsValid=0),MBPNumSubdivs=2)
 ChaosSettings=(DefaultThreadingModel=DedicatedThread,DedicatedThreadTickMode=VariableCappedWithTarget,DedicatedThreadBufferMode=Double)
 
-
diff --git a/SurvivalGame/Content/AI/Zombie/Materials/M_Zombie_Body.uasset b/SurvivalGame/Content/AI/Zombie/Materials/M_Zombie_Body.uasset
diff --git a/SurvivalGame/Content/AI/ZombieCharacter.uasset b/SurvivalGame/Content/AI/ZombieCharacter.uasset
diff --git a/SurvivalGame/Content/Base/DebugGameMode.uasset b/SurvivalGame/Content/Base/DebugGameMode.uasset
diff --git a/SurvivalGame/Content/Base/MI_Dev_Mockup_01.uasset b/SurvivalGame/Content/Base/MI_Dev_Mockup_01.uasset
diff --git a/SurvivalGame/Content/Base/MI_Dev_Mockup_02.uasset b/SurvivalGame/Content/Base/MI_Dev_Mockup_02.uasset
diff --git a/SurvivalGame/Content/Base/MI_TranslucentFloor_01.uasset b/SurvivalGame/Content/Base/MI_TranslucentFloor_01.uasset
diff --git a/SurvivalGame/Content/Base/M_Dev_Mockup_Master.uasset b/SurvivalGame/Content/Base/M_Dev_Mockup_Master.uasset
diff --git a/SurvivalGame/Content/Base/M_TranslucentFloor_01.uasset b/SurvivalGame/Content/Base/M_TranslucentFloor_01.uasset
diff --git a/SurvivalGame/Content/Base/SurvivalCoopGameModeSetup.uasset b/SurvivalGame/Content/Base/SurvivalCoopGameModeSetup.uasset
diff --git a/SurvivalGame/Content/Base/SurvivalCoopGameModeSetup_Debug.uasset b/SurvivalGame/Content/Base/SurvivalCoopGameModeSetup_Debug.uasset
diff --git a/SurvivalGame/Content/Effects/P_AssaultRifle_MF.uasset b/SurvivalGame/Content/Effects/P_AssaultRifle_MF.uasset
diff --git a/SurvivalGame/Content/Environment/Landscape/MI_LandscapeExt_Inst.uasset b/SurvivalGame/Content/Environment/Landscape/MI_LandscapeExt_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Landscape/MI_Landscape_Inst.uasset b/SurvivalGame/Content/Environment/Landscape/MI_Landscape_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Landscape/M_LandscapeDemo_Master.uasset b/SurvivalGame/Content/Environment/Landscape/M_LandscapeDemo_Master.uasset
diff --git a/SurvivalGame/Content/Environment/Landscape/M_LandscapeExt_Master.uasset b/SurvivalGame/Content/Environment/Landscape/M_LandscapeExt_Master.uasset
diff --git a/SurvivalGame/Content/Environment/LightPole.uasset b/SurvivalGame/Content/Environment/LightPole.uasset
diff --git a/SurvivalGame/Content/Environment/MI_BlockoutSimple_Inst.uasset b/SurvivalGame/Content/Environment/MI_BlockoutSimple_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/M_BlockoutSimple.uasset b/SurvivalGame/Content/Environment/M_BlockoutSimple.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/MF_BlendAlpha_Vertex.uasset b/SurvivalGame/Content/Environment/Material_Layers/MF_BlendAlpha_Vertex.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/MF_BumpMapping.uasset b/SurvivalGame/Content/Environment/Material_Layers/MF_BumpMapping.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/MF_GroundWetness.uasset b/SurvivalGame/Content/Environment/Material_Layers/MF_GroundWetness.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Floor_Tile.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Floor_Tile.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Grass.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Grass.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Grime01.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Grime01.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Metal_Base_01.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Metal_Base_01.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Metal_Painted_01_Dull.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Metal_Painted_01_Dull.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Rust.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Rust.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Tiles_Broken.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Tiles_Broken.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/ML_Tiles_Whole.uasset b/SurvivalGame/Content/Environment/Material_Layers/ML_Tiles_Whole.uasset
diff --git a/SurvivalGame/Content/Environment/Material_Layers/MatLayer_FeatureLevelSwitch.uasset b/SurvivalGame/Content/Environment/Material_Layers/MatLayer_FeatureLevelSwitch.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/MF_RB_Land_TwoLayerBlend_03Snow.uasset b/SurvivalGame/Content/Environment/Materials/MF_RB_Land_TwoLayerBlend_03Snow.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/MI_Floor_Water_Mesh_Paint.uasset b/SurvivalGame/Content/Environment/Materials/MI_Floor_Water_Mesh_Paint.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/MI_PineTree_Billboard_Inst.uasset b/SurvivalGame/Content/Environment/Materials/MI_PineTree_Billboard_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/MI_PineTree_Branch_Inst.uasset b/SurvivalGame/Content/Environment/Materials/MI_PineTree_Branch_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/MI_Rock_Grassy_Inst.uasset b/SurvivalGame/Content/Environment/Materials/MI_Rock_Grassy_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_AncientTowerSimple.uasset b/SurvivalGame/Content/Environment/Materials/M_AncientTowerSimple.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_AncientTowerWoodSimple.uasset b/SurvivalGame/Content/Environment/Materials/M_AncientTowerWoodSimple.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Concrete_Panels.uasset b/SurvivalGame/Content/Environment/Materials/M_Concrete_Panels.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Concrete_Tiles.uasset b/SurvivalGame/Content/Environment/Materials/M_Concrete_Tiles.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Floor_Water_Mesh_Paint.uasset b/SurvivalGame/Content/Environment/Materials/M_Floor_Water_Mesh_Paint.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Frame.uasset b/SurvivalGame/Content/Environment/Materials/M_Frame.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Gate.uasset b/SurvivalGame/Content/Environment/Materials/M_Gate.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_PineTree_Bark.uasset b/SurvivalGame/Content/Environment/Materials/M_PineTree_Bark.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_PineTree_Billboard.uasset b/SurvivalGame/Content/Environment/Materials/M_PineTree_Billboard.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Rock_Foliage.uasset b/SurvivalGame/Content/Environment/Materials/M_Rock_Foliage.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Rock_Snowy.uasset b/SurvivalGame/Content/Environment/Materials/M_Rock_Snowy.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Ruins_Ledge_Inst.uasset b/SurvivalGame/Content/Environment/Materials/M_Ruins_Ledge_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Ruins_Master.uasset b/SurvivalGame/Content/Environment/Materials/M_Ruins_Master.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Ruins_Wall_Inst.uasset b/SurvivalGame/Content/Environment/Materials/M_Ruins_Wall_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Signs.uasset b/SurvivalGame/Content/Environment/Materials/M_Signs.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Signs_Inst.uasset b/SurvivalGame/Content/Environment/Materials/M_Signs_Inst.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_SimpleFloor_01.uasset b/SurvivalGame/Content/Environment/Materials/M_SimpleFloor_01.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Tiles_Wall_Mesh_Paint.uasset b/SurvivalGame/Content/Environment/Materials/M_Tiles_Wall_Mesh_Paint.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Wood_Floor_Walnut_Polished.uasset b/SurvivalGame/Content/Environment/Materials/M_Wood_Floor_Walnut_Polished.uasset
diff --git a/SurvivalGame/Content/Environment/Materials/M_Wood_Walnut.uasset b/SurvivalGame/Content/Environment/Materials/M_Wood_Walnut.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_DoorFrame.uasset b/SurvivalGame/Content/Environment/Meshes/SM_DoorFrame.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Gate01.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Gate01.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Gate02.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Gate02.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Tiles_Broken01.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Tiles_Broken01.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Tiles_Broken02.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Tiles_Broken02.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Tiles_Broken03.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Hallway_Tiles_Broken03.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_PineTree.uasset b/SurvivalGame/Content/Environment/Meshes/SM_PineTree.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_RockGravel_Foliage.uasset b/SurvivalGame/Content/Environment/Meshes/SM_RockGravel_Foliage.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Throne_Exterior_CoverB_2.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Throne_Exterior_CoverB_2.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Throne_Exterior_CoverB_3.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Throne_Exterior_CoverB_3.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_Throne_Exterior_CoverBlo.uasset b/SurvivalGame/Content/Environment/Meshes/SM_Throne_Exterior_CoverBlo.uasset
diff --git a/SurvivalGame/Content/Environment/Meshes/SM_WindowFrame.uasset b/SurvivalGame/Content/Environment/Meshes/SM_WindowFrame.uasset
diff --git a/SurvivalGame/Content/Environment/Skylight_TimeOfDayColor.uasset b/SurvivalGame/Content/Environment/Skylight_TimeOfDayColor.uasset
diff --git a/SurvivalGame/Content/Environment/Skylight_TimeOfDayIntensity.uasset b/SurvivalGame/Content/Environment/Skylight_TimeOfDayIntensity.uasset
diff --git a/SurvivalGame/Content/Environment/Temp/RuralStallBaseExc_Diffuce.uasset b/SurvivalGame/Content/Environment/Temp/RuralStallBaseExc_Diffuce.uasset
diff --git a/SurvivalGame/Content/Environment/Temp/RuralStallRoof_Diffuce.uasset b/SurvivalGame/Content/Environment/Temp/RuralStallRoof_Diffuce.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_GDC_Grass01_D_NoisyAlpha.uasset b/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_GDC_Grass01_D_NoisyAlpha.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_Ground_Grass_N.uasset b/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_Ground_Grass_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_Tile_PebblyRiverbank_D.uasset b/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_Tile_PebblyRiverbank_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_Tile_PebblyRiverbank_N.uasset b/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_Tile_PebblyRiverbank_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_ground_Moss_D.uasset b/SurvivalGame/Content/Environment/Textures/KiteDownsampled/T_ground_Moss_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/SnowMound_01_N.uasset b/SurvivalGame/Content/Environment/Textures/SnowMound_01_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Base_Metal_Light_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Base_Metal_Light_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Base_Metal_Light_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Base_Metal_Light_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_COG_Base_Dirt.uasset b/SurvivalGame/Content/Environment/Textures/T_COG_Base_Dirt.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Concrete_Panels_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Concrete_Panels_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Concrete_Panels_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Concrete_Panels_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_Variation_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Concrete_Tiles_Variation_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_CraggyWall_Broken_D.uasset b/SurvivalGame/Content/Environment/Textures/T_CraggyWall_Broken_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_CraggyWall_Broken_N.uasset b/SurvivalGame/Content/Environment/Textures/T_CraggyWall_Broken_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_CraggyWall_D.uasset b/SurvivalGame/Content/Environment/Textures/T_CraggyWall_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_CraggyWall_N.uasset b/SurvivalGame/Content/Environment/Textures/T_CraggyWall_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_CraggyWall_S.uasset b/SurvivalGame/Content/Environment/Textures/T_CraggyWall_S.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_CraggyWall_Stucco_N.uasset b/SurvivalGame/Content/Environment/Textures/T_CraggyWall_Stucco_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Environment_Materials_Wet_TilingFlow02_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Environment_Materials_Wet_TilingFlow02_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Floor_Tiles_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Floor_Tiles_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Floor_Tiles_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Floor_Tiles_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Frame_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Frame_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Frame_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Frame_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_FullGrass_D.uasset b/SurvivalGame/Content/Environment/Textures/T_FullGrass_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_FullGrass_N.uasset b/SurvivalGame/Content/Environment/Textures/T_FullGrass_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_GDC_Rocktest_01_N.uasset b/SurvivalGame/Content/Environment/Textures/T_GDC_Rocktest_01_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_GR_CliffWall_TanJaggy_02_D.uasset b/SurvivalGame/Content/Environment/Textures/T_GR_CliffWall_TanJaggy_02_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Grime_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Grime_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Grime_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Grime_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Ground_Grass_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Ground_Grass_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Ground_Gravel_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Ground_Gravel_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Hallway_Gate_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Hallway_Gate_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Hallway_Gate_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Hallway_Gate_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Hallway_Signs_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Hallway_Signs_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_House1_Walls_M.uasset b/SurvivalGame/Content/Environment/Textures/T_House1_Walls_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_LS_Grass_01_D.uasset b/SurvivalGame/Content/Environment/Textures/T_LS_Grass_01_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_LS_Snow_01_D_Disp.uasset b/SurvivalGame/Content/Environment/Textures/T_LS_Snow_01_D_Disp.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_MacroVariation.uasset b/SurvivalGame/Content/Environment/Textures/T_MacroVariation.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Metal_Painted01_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Metal_Painted01_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Metal_Painted01_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Metal_Painted01_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Metal_Rust_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Metal_Rust_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Metal_Rust_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Metal_Rust_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Noise_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Noise_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Perlin_Noise_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Perlin_Noise_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_PineTree_BillBoard_D.uasset b/SurvivalGame/Content/Environment/Textures/T_PineTree_BillBoard_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_PineTree_BillBoard_M.uasset b/SurvivalGame/Content/Environment/Textures/T_PineTree_BillBoard_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_PineTree_BillBoard_N.uasset b/SurvivalGame/Content/Environment/Textures/T_PineTree_BillBoard_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_RB_LS_Dirt_01_DispAlpha02.uasset b/SurvivalGame/Content/Environment/Textures/T_RB_LS_Dirt_01_DispAlpha02.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_RB_LS_Dirt_01_DispAlpha03.uasset b/SurvivalGame/Content/Environment/Textures/T_RB_LS_Dirt_01_DispAlpha03.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_Broken_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_Broken_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_Broken_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_Broken_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Reflection_Tiles_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Rust_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Rust_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Rust_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Rust_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Sand_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Sand_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Throne_Exterior_Ledg_2.uasset b/SurvivalGame/Content/Environment/Textures/T_Throne_Exterior_Ledg_2.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Throne_Exterior_Ledg_4.uasset b/SurvivalGame/Content/Environment/Textures/T_Throne_Exterior_Ledg_4.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_WaterTextures_M.uasset b/SurvivalGame/Content/Environment/Textures/T_WaterTextures_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Wood_Floor_Walnut_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Wood_Floor_Walnut_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Wood_Floor_Walnut_M.uasset b/SurvivalGame/Content/Environment/Textures/T_Wood_Floor_Walnut_M.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Wood_Floor_Walnut_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Wood_Floor_Walnut_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Wood_Pine_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Wood_Pine_N.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Wood_Walnut_D.uasset b/SurvivalGame/Content/Environment/Textures/T_Wood_Walnut_D.uasset
diff --git a/SurvivalGame/Content/Environment/Textures/T_Wood_Walnut_N.uasset b/SurvivalGame/Content/Environment/Textures/T_Wood_Walnut_N.uasset
diff --git a/SurvivalGame/Content/Items/ClassicBomb.uasset b/SurvivalGame/Content/Items/ClassicBomb.uasset
diff --git a/SurvivalGame/Content/Items/Materials/M_Black_Metal.uasset b/SurvivalGame/Content/Items/Materials/M_Black_Metal.uasset
diff --git a/SurvivalGame/Content/Maps/ContainerCity.umap b/SurvivalGame/Content/Maps/ContainerCity.umap
diff --git a/SurvivalGame/Content/Maps/ContainerCity_Art.umap b/SurvivalGame/Content/Maps/ContainerCity_Art.umap
diff --git a/SurvivalGame/Content/Maps/CoopLandscape_Map.umap b/SurvivalGame/Content/Maps/CoopLandscape_Map.umap
diff --git a/SurvivalGame/Content/Maps/CoopLandscape_Map_BuiltData.uasset b/SurvivalGame/Content/Maps/CoopLandscape_Map_BuiltData.uasset
diff --git a/SurvivalGame/Content/UI/HUD/PlayerList/WBP_PlayerList_Item.uasset b/SurvivalGame/Content/UI/HUD/PlayerList/WBP_PlayerList_Item.uasset
diff --git a/SurvivalGame/Content/UI/SurvivalHUD.uasset b/SurvivalGame/Content/UI/SurvivalHUD.uasset
diff --git a/SurvivalGame/Plugins/ExtendedRifleMod/ExtendedRifleMod.uplugin b/SurvivalGame/Plugins/ExtendedRifleMod/ExtendedRifleMod.uplugin
@@ -7,7 +7,7 @@
 	"CreatedBy" : "Tom Looman",
 	"CreatedByURL" : "http://www.tomlooman.com",
 	"Description" : "My Extend Rifle Mod",
-	"EngineVersion" : "4.24.0",
+	"EngineVersion" : "4.26.0",
 	"Category" : "User Mod",
 	"EnabledByDefault" : true,
 

diff --git a/SurvivalGame/Plugins/MyFlashlightMod/MyFlashlightMod.uplugin b/SurvivalGame/Plugins/MyFlashlightMod/MyFlashlightMod.uplugin
@@ -7,7 +7,7 @@
 	"CreatedBy" : "Tom Looman",
 	"CreatedByURL" : "http://www.tomlooman.com",
 	"Description" : "My Flashlight Mod",
-	"EngineVersion" : "4.24.0",
+	"EngineVersion" : "4.26.0",
 	"Category" : "User Mod",
 	"EnabledByDefault" : true,
 

diff --git a/SurvivalGame/Source/SurvivalGame/Private/AI/BTTask_FindBotWaypoint.cpp b/SurvivalGame/Source/SurvivalGame/Private/AI/BTTask_FindBotWaypoint.cpp
@@ -19,9 +19,6 @@ EBTNodeResult::Type UBTTask_FindBotWaypoint::ExecuteTask(UBehaviorTreeComponent&
 		return EBTNodeResult::Failed;
 	}
 
-	ASBotWaypoint* CurrentWaypoint = MyController->GetWaypoint();
-	AActor* NewWaypoint = nullptr;
-
 	/* Iterate all the bot waypoints in the current level and find a new random waypoint to set as destination */
 	TArray<AActor*> AllWaypoints;
 	UGameplayStatics::GetAllActorsOfClass(MyController, ASBotWaypoint::StaticClass(), AllWaypoints);
@@ -31,7 +28,7 @@ EBTNodeResult::Type UBTTask_FindBotWaypoint::ExecuteTask(UBehaviorTreeComponent&
 
 	/* Find a new waypoint randomly by index (this can include the current waypoint) */
 	/* For more complex or human AI you could add some weights based on distance and other environmental conditions here */
-	NewWaypoint = AllWaypoints[FMath::RandRange(0, AllWaypoints.Num() - 1)];
+	AActor* NewWaypoint = AllWaypoints[FMath::RandRange(0, AllWaypoints.Num() - 1)];
 
 	/* Assign the new waypoint to the Blackboard */
 	if (NewWaypoint)

diff --git a/SurvivalGame/Source/SurvivalGame/Private/AI/BTTask_FindPatrolLocation.cpp b/SurvivalGame/Source/SurvivalGame/Private/AI/BTTask_FindPatrolLocation.cpp
@@ -22,7 +22,7 @@ EBTNodeResult::Type UBTTask_FindPatrolLocation::ExecuteTask(UBehaviorTreeCompone
 		return EBTNodeResult::Failed;
 	}
 
-	ASBotWaypoint* MyWaypoint = MyController->GetWaypoint();
+	AActor* MyWaypoint = MyController->GetWaypoint();
 	if (MyWaypoint)
 	{
 		/* Find a position that is close to the waypoint. We add a small random to this position to give build predictable patrol patterns  */

diff --git a/SurvivalGame/Source/SurvivalGame/Private/AI/SZombieAIController.cpp b/SurvivalGame/Source/SurvivalGame/Private/AI/SZombieAIController.cpp
@@ -55,7 +55,7 @@ void ASZombieAIController::OnUnPossess()
 }
 
 
-void ASZombieAIController::SetWaypoint(ASBotWaypoint* NewWaypoint)
+void ASZombieAIController::SetWaypoint(AActor* NewWaypoint)
 {
 	if (BlackboardComp)
 	{
@@ -73,18 +73,18 @@ void ASZombieAIController::SetTargetEnemy(APawn* NewTarget)
 }
 
 
-ASBotWaypoint* ASZombieAIController::GetWaypoint()
+AActor* ASZombieAIController::GetWaypoint() const
 {
 	if (BlackboardComp)
 	{
-		return Cast<ASBotWaypoint>(BlackboardComp->GetValueAsObject(CurrentWaypointKeyName));
+		return Cast<AActor>(BlackboardComp->GetValueAsObject(CurrentWaypointKeyName));
 	}
 
 	return nullptr;
 }
 
 
-ASBaseCharacter* ASZombieAIController::GetTargetEnemy()
+ASBaseCharacter* ASZombieAIController::GetTargetEnemy() const
 {
 	if (BlackboardComp)
 	{

diff --git a/SurvivalGame/Source/SurvivalGame/Private/AI/SZombieCharacter.cpp b/SurvivalGame/Source/SurvivalGame/Private/AI/SZombieCharacter.cpp
@@ -14,6 +14,10 @@
 #include "GameFramework/NavMovementComponent.h"
 #include "Components/AudioComponent.h"
 #include "SurvivalGame/SurvivalGame.h"
+#include "GameFramework/PawnMovementComponent.h"
+#include "Components/AudioComponent.h"
+#include "Kismet/GameplayStatics.h"
+#include "Sound/SoundCue.h"
 
 
 // Sets default values
@@ -75,7 +79,7 @@ void ASZombieCharacter::BeginPlay()
 	if (PS)
 	{
 		PS->SetPlayerName("Bot");
-		PS->bIsABot = true;
+		PS->SetIsABot(true);
 	}
 }
 

diff --git a/SurvivalGame/Source/SurvivalGame/Private/Items/SBombActor.cpp b/SurvivalGame/Source/SurvivalGame/Private/Items/SBombActor.cpp
@@ -2,9 +2,12 @@
 
 
 #include "Items/SBombActor.h"
+#include "TimerManager.h"
 #include "Particles/ParticleSystemComponent.h"
 #include "Components/AudioComponent.h"
 #include "GameFramework/Actor.h"
+#include "Kismet/GameplayStatics.h"
+#include "Sound/SoundCue.h"
 
 
 ASBombActor::ASBombActor()
@@ -123,6 +126,9 @@ void ASBombActor::SimulateExplosion_Implementation()
 		ExplosionPCS->SetTemplate(ExplosionFX);
 		ExplosionPCS->ActivateSystem();
 	}
+
+	// For Blueprint
+	K2_SimulateExplosion();
 }
 
 float ASBombActor::TakeDamage(float Damage, struct FDamageEvent const& DamageEvent, class AController* EventInstigator, class AActor* DamageCauser)

diff --git a/SurvivalGame/Source/SurvivalGame/Private/Items/SDamageType.cpp b/SurvivalGame/Source/SurvivalGame/Private/Items/SDamageType.cpp
@@ -15,18 +15,18 @@ USDamageType::USDamageType()
 }
 
 
-bool USDamageType::GetCanDieFrom()
+bool USDamageType::GetCanDieFrom() const
 {
 	return bCanDieFrom;
 }
 
 
-float USDamageType::GetHeadDamageModifier()
+float USDamageType::GetHeadDamageModifier() const
 {
 	return HeadDmgModifier;
 }
 
-float USDamageType::GetLimbDamageModifier()
+float USDamageType::GetLimbDamageModifier() const
 {
 	return LimbDmgModifier;
 }
diff --git a/SurvivalGame/Source/SurvivalGame/Private/Items/SImpactEffect.cpp b/SurvivalGame/Source/SurvivalGame/Private/Items/SImpactEffect.cpp
@@ -12,7 +12,7 @@
 
 ASImpactEffect::ASImpactEffect()
 {
-	bAutoDestroyWhenFinished = true;
+	SetAutoDestroyWhenFinished(true);
 	/* Can ever tick is required to trigger bAutoDestroyWhenFinished, which is checked in AActor::Tick */
 	PrimaryActorTick.bCanEverTick = true;
 

diff --git a/SurvivalGame/Source/SurvivalGame/Private/Items/SWeaponInstant.cpp b/SurvivalGame/Source/SurvivalGame/Private/Items/SWeaponInstant.cpp
@@ -8,6 +8,8 @@
 #include "SurvivalGame/SurvivalGame.h"
 #include "PhysicalMaterials/PhysicalMaterial.h"
 #include "Net/UnrealNetwork.h"
+#include "Particles/ParticleSystemComponent.h"
+#include "Kismet/GameplayStatics.h"
 
 
 

diff --git a/SurvivalGame/Source/SurvivalGame/Private/Player/SBaseCharacter.cpp b/SurvivalGame/Source/SurvivalGame/Private/Player/SBaseCharacter.cpp
@@ -9,6 +9,9 @@
 #include "Components/SkeletalMeshComponent.h"
 #include "Components/CapsuleComponent.h"
 #include "Net/UnrealNetwork.h"
+#include "Components/PawnNoiseEmitterComponent.h"
+#include "Kismet/GameplayStatics.h"
+#include "Sound/SoundCue.h"
 
 
 ASBaseCharacter::ASBaseCharacter(const class FObjectInitializer& ObjectInitializer)

diff --git a/SurvivalGame/Source/SurvivalGame/Private/Player/SCharacter.cpp b/SurvivalGame/Source/SurvivalGame/Private/Player/SCharacter.cpp
@@ -2,6 +2,8 @@
 
 
 #include "Player/SCharacter.h"
+
+#include "TimerManager.h"
 #include "Items/SUsableActor.h"
 #include "Items/SWeapon.h"
 #include "Items/SWeaponPickup.h"
@@ -13,6 +15,7 @@
 #include "Components/CapsuleComponent.h"
 #include "SurvivalGame/SurvivalGame.h"
 #include "GameFramework/DamageType.h"
+#include "Camera/CameraComponent.h"
 
 
 // Sets default values
@@ -198,7 +201,7 @@ void ASCharacter::MoveRight(float Val)
 /*
 Performs ray-trace to find closest looked-at UsableActor.
 */
-ASUsableActor* ASCharacter::GetUsableInView()
+ASUsableActor* ASCharacter::GetUsableInView() const
 {
 	FVector CamLoc;
 	FRotator CamRot;
@@ -220,8 +223,6 @@ ASUsableActor* ASCharacter::GetUsableInView()
 	FHitResult Hit(ForceInit);
 	GetWorld()->LineTraceSingleByChannel(Hit, TraceStart, TraceEnd, ECC_Visibility, TraceParams);
 
-	//DrawDebugLine(GetWorld(), TraceStart, TraceEnd, FColor::Red, false, 1.0f);
-
 	return Cast<ASUsableActor>(Hit.GetActor());
 }
 

diff --git a/SurvivalGame/Source/SurvivalGame/Private/Player/SPlayerCameraManager.cpp b/SurvivalGame/Source/SurvivalGame/Private/Player/SPlayerCameraManager.cpp
@@ -28,19 +28,6 @@ ASPlayerCameraManager::ASPlayerCameraManager()
 }
 
 
-void ASPlayerCameraManager::BeginPlay()
-{
-	Super::BeginPlay();
-
-// 	ASCharacter* MyPawn = PCOwner ? Cast<ASCharacter>(PCOwner->GetPawn()) : nullptr;
-// 	if (MyPawn)
-// 	{
-// 		/* Cache the offset Z value of the camera to maintain a correct offset while transition during crouches */
-// 		DefaultCameraOffsetZ = MyPawn->GetCameraComponent()->GetRelativeTransform().GetLocation().Z;
-// 	}
-}
-
-
 void ASPlayerCameraManager::UpdateCamera(float DeltaTime)
 {
 	ASCharacter* MyPawn = PCOwner ? Cast<ASCharacter>(PCOwner->GetPawn()) : nullptr;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ Intermediate @@
     Saved
     DerivedDataCache
     .vs
+    .idea
     *.sdf
     *.opensdf
     *.sln
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,3 @@ bReplaceBlueprintWithClass=true
		bDontLoadBlueprintOutsideEditor=true
		bBlueprintIsNotBlueprintType=true