diff --git a/.gitignore b/.gitignore index 3fa83015..87bdc3c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +Build Binaries DerivedDataCache Intermediate diff --git a/Build/Windows/Application.ico b/Build/Windows/Application.ico deleted file mode 100644 index 5af448db..00000000 Binary files a/Build/Windows/Application.ico and /dev/null differ diff --git a/Content/Blueprints/Player/MyGM.uasset b/Content/Blueprints/Player/MyGM.uasset index 45e567de..ed1b571b 100644 Binary files a/Content/Blueprints/Player/MyGM.uasset and b/Content/Blueprints/Player/MyGM.uasset differ diff --git a/Content/Blueprints/Player/WalkingPawn.uasset b/Content/Blueprints/Player/WalkingPawn.uasset index 91b6e25e..ec106fd3 100644 Binary files a/Content/Blueprints/Player/WalkingPawn.uasset and b/Content/Blueprints/Player/WalkingPawn.uasset differ diff --git a/Content/Blueprints/UI/Materials/FasadHide.uasset b/Content/Blueprints/UI/Materials/FasadHide.uasset index eb2262c2..561cd27d 100644 Binary files a/Content/Blueprints/UI/Materials/FasadHide.uasset and b/Content/Blueprints/UI/Materials/FasadHide.uasset differ diff --git a/Content/Blueprints/UI/WBPS/MainMenu.uasset b/Content/Blueprints/UI/WBPS/MainMenu.uasset index f43b2bf0..7ca29607 100644 Binary files a/Content/Blueprints/UI/WBPS/MainMenu.uasset and b/Content/Blueprints/UI/WBPS/MainMenu.uasset differ diff --git a/Content/Blueprints/UI/WBPS/stick.uasset b/Content/Blueprints/UI/WBPS/stick.uasset index baabe529..f72f48ce 100644 Binary files a/Content/Blueprints/UI/WBPS/stick.uasset and b/Content/Blueprints/UI/WBPS/stick.uasset differ diff --git a/Content/Blueprints/Zone/zone.uasset b/Content/Blueprints/Zone/zone.uasset deleted file mode 100644 index 1c2ae6f2..00000000 Binary files a/Content/Blueprints/Zone/zone.uasset and /dev/null differ diff --git a/Content/Maps/DayLight.umap b/Content/Maps/DayLight.umap index 04d9dcd4..9ce78cea 100644 Binary files a/Content/Maps/DayLight.umap and b/Content/Maps/DayLight.umap differ diff --git a/Content/Maps/Grass.umap b/Content/Maps/Grass.umap index 422eceff..783aa601 100644 Binary files a/Content/Maps/Grass.umap and b/Content/Maps/Grass.umap differ diff --git a/Content/Maps/MainScene.umap b/Content/Maps/MainScene.umap index 6a30b218..c3256a36 100644 Binary files a/Content/Maps/MainScene.umap and b/Content/Maps/MainScene.umap differ diff --git a/Content/Maps/Test_Level.umap b/Content/Maps/Test_Level.umap index f98da2b2..31c607d6 100644 Binary files a/Content/Maps/Test_Level.umap and b/Content/Maps/Test_Level.umap differ diff --git a/Content/Maps/Test_Level_BuiltData.uasset b/Content/Maps/Test_Level_BuiltData.uasset index eecc1b60..f4b3a25f 100644 Binary files a/Content/Maps/Test_Level_BuiltData.uasset and b/Content/Maps/Test_Level_BuiltData.uasset differ diff --git a/Content/Maps/Yard.umap b/Content/Maps/Yard.umap index fab008b7..86d978ff 100644 Binary files a/Content/Maps/Yard.umap and b/Content/Maps/Yard.umap differ diff --git a/Content/Maps/shadowMeshes.umap b/Content/Maps/shadowMeshes.umap index a8e6cc62..5270aad0 100644 Binary files a/Content/Maps/shadowMeshes.umap and b/Content/Maps/shadowMeshes.umap differ diff --git a/Content/Materials/Instances/MI_Brick_01_fantom.uasset b/Content/Materials/Instances/MI_Brick_01_fantom.uasset new file mode 100644 index 00000000..a059baae Binary files /dev/null and b/Content/Materials/Instances/MI_Brick_01_fantom.uasset differ diff --git a/Content/Materials/Instances/MI_Concrete_ghost.uasset b/Content/Materials/Instances/MI_Concrete_ghost.uasset new file mode 100644 index 00000000..2b51cd36 Binary files /dev/null and b/Content/Materials/Instances/MI_Concrete_ghost.uasset differ diff --git a/Content/Materials/Instances/MI_Concrete_tiled.uasset b/Content/Materials/Instances/MI_Concrete_tiled.uasset new file mode 100644 index 00000000..77ed166c Binary files /dev/null and b/Content/Materials/Instances/MI_Concrete_tiled.uasset differ diff --git a/Content/Materials/Instances/M_Squad_Build.uasset b/Content/Materials/Instances/M_Squad_Build.uasset index 72328636..39b48c52 100644 Binary files a/Content/Materials/Instances/M_Squad_Build.uasset and b/Content/Materials/Instances/M_Squad_Build.uasset differ diff --git a/Content/Materials/M_Scan_RA_Master.uasset b/Content/Materials/M_Scan_RA_Master.uasset index 9bab333c..5aa85e24 100644 Binary files a/Content/Materials/M_Scan_RA_Master.uasset and b/Content/Materials/M_Scan_RA_Master.uasset differ diff --git a/Content/Materials/fantom.uasset b/Content/Materials/fantom.uasset index 98e6c364..23fd97d0 100644 Binary files a/Content/Materials/fantom.uasset and b/Content/Materials/fantom.uasset differ diff --git a/Content/Megascans/Surfaces/Lawn_Grass_tkynejer_surface/Grass.uasset b/Content/Megascans/Surfaces/Lawn_Grass_tkynejer_surface/Grass.uasset index 57b57bc2..bba87cc2 100644 Binary files a/Content/Megascans/Surfaces/Lawn_Grass_tkynejer_surface/Grass.uasset and b/Content/Megascans/Surfaces/Lawn_Grass_tkynejer_surface/Grass.uasset differ diff --git a/Content/Meshes/Environment/SM_Squad_05.uasset b/Content/Meshes/Environment/SM_Squad_05.uasset index 8e080b7a..db63a27d 100644 Binary files a/Content/Meshes/Environment/SM_Squad_05.uasset and b/Content/Meshes/Environment/SM_Squad_05.uasset differ diff --git a/Content/Meshes/Environment/SM_Terrain.uasset b/Content/Meshes/Environment/SM_Terrain.uasset index b431f2e3..d04f4e82 100644 Binary files a/Content/Meshes/Environment/SM_Terrain.uasset and b/Content/Meshes/Environment/SM_Terrain.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_02.uasset b/Content/Meshes/Squads/SM_Squad_02.uasset index b8ca2b91..4ae70ba1 100644 Binary files a/Content/Meshes/Squads/SM_Squad_02.uasset and b/Content/Meshes/Squads/SM_Squad_02.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_03.uasset b/Content/Meshes/Squads/SM_Squad_03.uasset index 82bda456..ea38d6bb 100644 Binary files a/Content/Meshes/Squads/SM_Squad_03.uasset and b/Content/Meshes/Squads/SM_Squad_03.uasset differ diff --git a/Content/Meshes/Squads/SM_Squad_Build_01.uasset b/Content/Meshes/Squads/SM_Squad_Build_01.uasset index 45dc7441..4b0a6388 100644 Binary files a/Content/Meshes/Squads/SM_Squad_Build_01.uasset and b/Content/Meshes/Squads/SM_Squad_Build_01.uasset differ diff --git a/Source/Onejsky4U/Onejsky4U.Build.cs b/Source/Onejsky4U/Onejsky4U.Build.cs index acf23245..c44573d0 100644 --- a/Source/Onejsky4U/Onejsky4U.Build.cs +++ b/Source/Onejsky4U/Onejsky4U.Build.cs @@ -8,7 +8,7 @@ public class Onejsky4U : ModuleRules { PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs; - PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" }); + PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore","ApplicationCore" }); PrivateDependencyModuleNames.AddRange(new string[] { }); diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp index 66d643dc..16ccf141 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.cpp +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.cpp @@ -3,3 +3,25 @@ #include "Onejsky4UGameModeBase.h" +#include "GenericPlatform/GenericWindow.h" +#include "Engine/Engine.h" +#define WIN32_LEAN_AND_MEAN +#include +#pragma comment(lib,"User32.lib") +//#include "Winuser.h" + + +void AOnejsky4UGameModeBase::BeginPlay() { + UE_LOG(LogTemp, Warning, TEXT("Hello nigga")); + // set the settings in the gesture configuration + GESTURECONFIG gc[] = { 0,0,GC_ALLGESTURES }; + void* ParentWindowHandle = GEngine->GameViewport->GetWindow()->GetNativeWindow()->GetOSWindowHandle(); + /*HWND mywin; + mywin = reinterpret_cast(ParentWindowHandle); + //HWND mywin1 = *mywin; + UINT uiGcs = 1; + BOOL bResult = SetGestureConfig(mywin, 0, uiGcs, gc, sizeof(GESTURECONFIG));*/ + +} + + diff --git a/Source/Onejsky4U/Onejsky4UGameModeBase.h b/Source/Onejsky4U/Onejsky4UGameModeBase.h index 9f12ca3d..571f42ea 100644 --- a/Source/Onejsky4U/Onejsky4UGameModeBase.h +++ b/Source/Onejsky4U/Onejsky4UGameModeBase.h @@ -2,10 +2,12 @@ #pragma once + #include "CoreMinimal.h" #include "GameFramework/GameModeBase.h" #include "Onejsky4UGameModeBase.generated.h" + /** * */ @@ -14,4 +16,10 @@ class ONEJSKY4U_API AOnejsky4UGameModeBase : public AGameModeBase { GENERATED_BODY() +protected: + virtual void BeginPlay() override; + +/*public: + virtual void* GetOSWindowHandle() const;*/ + //void doit(); };