Skip to content

Commit c1abd53

Browse files
JPMMaiaJPMMaia
authored
Merge pull request #26 from JPMMaia/development
Development
2 parents 571a9f7 + 0261794 commit c1abd53

File tree

184 files changed

+28277
-424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+28277
-424
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ Binaries/*
4949
# Builds
5050
Build/*
5151

52+
# Deployment Files
53+
Deployment/*
54+
5255
# Don't ignore icon files in Build
5356
!Build/**/*.ico
5457

@@ -62,3 +65,6 @@ Intermediate/*
6265
DerivedDataCache/*
6366
Debug
6467
x64
68+
*.db
69+
packages
70+
Binaries

‎Config/DefaultEngine.ini

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,56 @@
11
[URL]
2+
23
[/Script/HardwareTargeting.HardwareTargetingSettings]
34
TargetedHardwareClass=Desktop
5+
AppliedTargetedHardwareClass=Desktop
46
DefaultGraphicsPerformance=Maximum
7+
AppliedDefaultGraphicsPerformance=Maximum
8+
9+
[/Script/EngineSettings.GameMapsSettings]
10+
GameInstanceClass=/Game/Controller/BP_ApplicationInstance.BP_ApplicationInstance_C
11+
EditorStartupMap=/Game/DefaultLevel.DefaultLevel
12+
GameDefaultMap=/Game/DefaultLevel.DefaultLevel
13+
GlobalDefaultGameMode=/Script/Michelangelo.MichelangeloGameMode
14+
15+
[/Script/Engine.Engine]
16+
GameSingletonClassName=/Game/Controller/BP_GameDataSingleton.BP_GameDataSingleton_C
17+
18+
[/Script/Engine.PhysicsSettings]
19+
DefaultGravityZ=-980.000000
20+
DefaultTerminalVelocity=4000.000000
21+
DefaultFluidFriction=0.300000
22+
SimulateScratchMemorySize=262144
23+
RagdollAggregateThreshold=4
24+
TriangleMeshTriangleMinAreaThreshold=5.000000
25+
bEnableAsyncScene=False
26+
bEnableShapeSharing=False
27+
bEnablePCM=False
28+
bWarnMissingLocks=True
29+
bEnable2DPhysics=False
30+
LockedAxis=Invalid
31+
DefaultDegreesOfFreedom=Full3D
32+
BounceThresholdVelocity=200.000000
33+
FrictionCombineMode=Average
34+
RestitutionCombineMode=Average
35+
MaxAngularVelocity=3600.000000
36+
MaxDepenetrationVelocity=0.000000
37+
ContactOffsetMultiplier=0.010000
38+
MinContactOffset=0.000100
39+
MaxContactOffset=1.000000
40+
bSimulateSkeletalMeshOnDedicatedServer=True
41+
DefaultShapeComplexity=CTF_UseSimpleAndComplex
42+
bDefaultHasComplexCollision=True
43+
bSuppressFaceRemapTable=False
44+
bSupportUVFromHitResults=False
45+
bDisableActiveActors=False
46+
bDisableCCD=False
47+
MaxPhysicsDeltaTime=0.033333
48+
bSubstepping=False
49+
bSubsteppingAsync=False
50+
MaxSubstepDeltaTime=0.016667
51+
MaxSubsteps=6
52+
SyncSceneSmoothingFactor=0.000000
53+
AsyncSceneSmoothingFactor=0.990000
54+
InitialAverageFrameRate=0.016667
555

656

‎Config/DefaultGame.ini

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
[/Script/EngineSettings.GeneralProjectSettings]
22
ProjectID=B86385354E88FB9AD22A5990274C800D
3+
4+
[/Script/UnrealEd.ProjectPackagingSettings]
5+
StagingDirectory=(Path="Deployment")
6+

‎Config/DefaultInput.ini

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
2+
[/Script/Engine.InputSettings]
3+
-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
4+
-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
5+
-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
6+
-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.25,Exponent=1.f,Sensitivity=1.f))
7+
-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
8+
-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.f,Exponent=1.f,Sensitivity=0.07f))
9+
-AxisConfig=(AxisKeyName="MotionController_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
10+
-AxisConfig=(AxisKeyName="MotionController_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
11+
-AxisConfig=(AxisKeyName="MotionController_Left_TriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
12+
-AxisConfig=(AxisKeyName="MotionController_Left_Grip1Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
13+
-AxisConfig=(AxisKeyName="MotionController_Left_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
14+
-AxisConfig=(AxisKeyName="MotionController_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
15+
-AxisConfig=(AxisKeyName="MotionController_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
16+
-AxisConfig=(AxisKeyName="MotionController_Right_TriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
17+
-AxisConfig=(AxisKeyName="MotionController_Right_Grip1Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
18+
-AxisConfig=(AxisKeyName="MotionController_Right_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
19+
-AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
20+
-AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
21+
-AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
22+
-AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
23+
-AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
24+
-AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
25+
-AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
26+
-AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
27+
-AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
28+
-AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
29+
-AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
30+
+AxisConfig=(AxisKeyName="MotionController_Left_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
31+
+AxisConfig=(AxisKeyName="MotionController_Left_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
32+
+AxisConfig=(AxisKeyName="MotionController_Left_TriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
33+
+AxisConfig=(AxisKeyName="MotionController_Left_Grip1Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
34+
+AxisConfig=(AxisKeyName="MotionController_Left_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
35+
+AxisConfig=(AxisKeyName="MotionController_Right_Thumbstick_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
36+
+AxisConfig=(AxisKeyName="MotionController_Right_Thumbstick_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
37+
+AxisConfig=(AxisKeyName="MotionController_Right_TriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
38+
+AxisConfig=(AxisKeyName="MotionController_Right_Grip1Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
39+
+AxisConfig=(AxisKeyName="MotionController_Right_Grip2Axis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
40+
+AxisConfig=(AxisKeyName="Gamepad_Special_Left_X",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
41+
+AxisConfig=(AxisKeyName="Gamepad_Special_Left_Y",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
42+
+AxisConfig=(AxisKeyName="Gamepad_LeftX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
43+
+AxisConfig=(AxisKeyName="Gamepad_LeftY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
44+
+AxisConfig=(AxisKeyName="Gamepad_RightX",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
45+
+AxisConfig=(AxisKeyName="Gamepad_RightY",AxisProperties=(DeadZone=0.250000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
46+
+AxisConfig=(AxisKeyName="MouseX",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
47+
+AxisConfig=(AxisKeyName="MouseY",AxisProperties=(DeadZone=0.000000,Sensitivity=0.070000,Exponent=1.000000,bInvert=False))
48+
+AxisConfig=(AxisKeyName="MouseWheelAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
49+
+AxisConfig=(AxisKeyName="Gamepad_LeftTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
50+
+AxisConfig=(AxisKeyName="Gamepad_RightTriggerAxis",AxisProperties=(DeadZone=0.000000,Sensitivity=1.000000,Exponent=1.000000,bInvert=False))
51+
bAltEnterTogglesFullscreen=True
52+
bF11TogglesFullscreen=True
53+
bUseMouseForTouch=False
54+
bEnableMouseSmoothing=True
55+
bEnableFOVScaling=True
56+
FOVScale=0.011110
57+
DoubleClickTime=0.200000
58+
bCaptureMouseOnLaunch=True
59+
DefaultViewportMouseCaptureMode=CapturePermanently_IncludingInitialMouseDown
60+
bDefaultViewportMouseLock=False
61+
DefaultViewportMouseLockMode=LockOnCapture
62+
-ActionMappings=(ActionName="Drag",Key=None,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
63+
+ActionMappings=(ActionName="Drag",Key=LeftMouseButton,bShift=False,bCtrl=False,bAlt=False,bCmd=False)
64+
bAlwaysShowTouchInterface=False
65+
bShowConsoleOnFourFingerTap=True
66+
DefaultTouchInterface=/Engine/MobileResources/HUD/DefaultVirtualJoysticks.DefaultVirtualJoysticks
67+
ConsoleKey=None
68+
-ConsoleKeys=Tilde
69+
+ConsoleKeys=Tilde
70+
71+

‎Content/Controller/BP_ApplicationInstance.uasset

134 KB
Binary file not shown.

‎Content/Controller/BP_GameDataSingleton.uasset

4.69 KB
Binary file not shown.

‎Content/Controller/E_View.uasset

2.54 KB
Binary file not shown.

‎Content/Data/S_ListItemData.uasset

2.61 KB
Binary file not shown.

‎Content/DefaultLevel.umap

57 KB
Binary file not shown.

‎Content/Fonts/Border.uasset

660 Bytes
Binary file not shown.

‎Content/Fonts/Lato-Black.uasset

601 KB
Binary file not shown.

‎Content/Fonts/Lato-BlackItalic.uasset

658 KB
Binary file not shown.

‎Content/Fonts/Lato-Bold.uasset

643 KB
Binary file not shown.

‎Content/Fonts/Lato-BoldItalic.uasset

684 KB
Binary file not shown.

‎Content/Fonts/Lato-Hairline.uasset

572 KB
Binary file not shown.

‎Content/Fonts/Lato-HairlineItalic.uasset

596 KB
Binary file not shown.

‎Content/Fonts/Lato-Heavy.uasset

651 KB
Binary file not shown.

‎Content/Fonts/Lato-HeavyItalic.uasset

684 KB
Binary file not shown.

‎Content/Fonts/Lato-Italic.uasset

708 KB
Binary file not shown.

‎Content/Fonts/Lato-Light.uasset

631 KB
Binary file not shown.

‎Content/Fonts/Lato-LightItalic.uasset

644 KB
Binary file not shown.

‎Content/Fonts/Lato-Medium.uasset

623 KB
Binary file not shown.

‎Content/Fonts/Lato-MediumItalic.uasset

681 KB
Binary file not shown.

‎Content/Fonts/Lato-Regular.uasset

643 KB
Binary file not shown.

‎Content/Fonts/Lato-Semibold.uasset

655 KB
Binary file not shown.

‎Content/Fonts/Lato-SemiboldItalic.uasset

683 KB
Binary file not shown.

‎Content/Fonts/Lato-Thin.uasset

614 KB
Binary file not shown.

‎Content/Fonts/Lato-ThinItalic.uasset

640 KB
Binary file not shown.

‎Content/Fonts/Lato.uasset

18.3 KB
Binary file not shown.

‎Content/Materials/BaseMaterial.uasset

87.4 KB
Binary file not shown.

‎Content/Resources/CheckBoxChecked.uasset

673 Bytes
Binary file not shown.

‎Content/Resources/CheckBoxUnchecked.uasset

675 Bytes
Binary file not shown.

‎Content/Resources/UI/Border.png

34.3 KB

‎Content/Resources/UI/Border.uasset

34 KB
Binary file not shown.

‎Content/Resources/UI/Border2.png

192 Bytes

‎Content/Resources/UI/Border2.uasset

2.89 KB
Binary file not shown.

‎Content/Resources/UI/BorderLink.png

253 Bytes

‎Content/Resources/UI/BorderLink.uasset

2.8 KB
Binary file not shown.

‎Content/Resources/UI/ButtonBorder.uasset

892 Bytes
Binary file not shown.

‎Content/Resources/UI/ButtonHovered.uasset

908 Bytes
Binary file not shown.

‎Content/Resources/UI/Button_01.png

28.2 KB

‎Content/Resources/UI/Button_01.uasset

69.8 KB
Binary file not shown.

‎Content/Resources/UI/CheckBoxChecked.png

57.5 KB

‎Content/Resources/UI/CheckBoxChecked.uasset

102 KB
Binary file not shown.

‎Content/Resources/UI/CheckBoxUnchecked.png

46.9 KB

‎Content/Resources/UI/CheckBoxUnchecked.uasset

83.3 KB
Binary file not shown.

‎Content/Resources/UI/Maximize.png

3 KB

‎Content/Resources/UI/Maximize.uasset

11.7 KB
Binary file not shown.

‎Content/Resources/UI/Minimize.png

3.89 KB

‎Content/Resources/UI/Minimize.uasset

17.1 KB
Binary file not shown.

‎Content/Resources/UI/White.png

188 Bytes

‎Content/Resources/UI/White.uasset

2.72 KB
Binary file not shown.

‎Content/UI/W_EdgeSlider.uasset

15.1 KB
Binary file not shown.

‎Content/UI/W_Editor.uasset

314 KB
Binary file not shown.

‎Content/UI/W_GrammarListItem.uasset

238 KB
Binary file not shown.

‎Content/UI/W_LoginMenu.uasset

198 KB
Binary file not shown.

‎Content/UI/W_MainMenu.uasset

278 KB
Binary file not shown.

‎Content/UI/W_RegisterMenu.uasset

12.2 KB
Binary file not shown.

‎Content/UI/W_ResizableBorder.uasset

82.4 KB
Binary file not shown.

‎Content/UI/W_StartMenu.uasset

66.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)