diff --git a/Celerity.png b/Celerity.png new file mode 100644 index 0000000..4406802 Binary files /dev/null and b/Celerity.png differ diff --git a/Celerity.uproject b/Celerity.uproject index c55129d..c8a5838 100644 --- a/Celerity.uproject +++ b/Celerity.uproject @@ -6,6 +6,7 @@ "TargetPlatforms": [ "PS4", "MacNoEditor", - "LinuxNoEditor" + "LinuxNoEditor", + "WindowsNoEditor" ] } \ No newline at end of file diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 0719970..e4a3fd0 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -42,15 +42,15 @@ DefaultGraphicsPerformance=Maximum AppliedDefaultGraphicsPerformance=Maximum [/Script/EngineSettings.GameMapsSettings] -EditorStartupMap=/Engine/Maps/Templates/Template_Default -EditorStartupMap=/Game/Maps/TestLevel +EditorStartupMap=/Game/Maps/Tutorial +LocalMapOptions= TransitionMap= bUseSplitscreen=False TwoPlayerSplitscreenLayout=Horizontal ThreePlayerSplitscreenLayout=FavorTop -GameDefaultMap=/Engine/Maps/Entry -GameDefaultMap=/Game/Maps/Space -GlobalDefaultGameMode=/Script/Engine.GameMode +GameInstanceClass=/Script/Engine.GameInstance +GameDefaultMap=/Game/Maps/Tutorial +ServerDefaultMap=/Engine/Maps/Entry GlobalDefaultGameMode=/Game/Blueprints/MyGame.MyGame_C GlobalDefaultServerGameMode=None diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini index 8c9b2d6..abc12f9 100644 --- a/Config/DefaultGame.ini +++ b/Config/DefaultGame.ini @@ -1,10 +1,15 @@ [/Script/EngineSettings.GeneralProjectSettings] -CompanyName= CompanyName=Team MadScientist +CopyrightNotice=Fill out your copyright notice in the Description page of Project Settings. +Description=Space runner game +Homepage= +LicensingTerms= +PrivacyPolicy= ProjectID=AFE5B1104B11834051935EB89B4B0AD2 ProjectName=Celerity -ProjectVersion= -ProjectVersion=0.1 +ProjectVersion=0.2 +SupportContact= +ProjectDisplayedTitle=Celerity - development diff --git a/Config/DefaultInput.ini b/Config/DefaultInput.ini index 1c3a1c4..c42a3ae 100644 --- a/Config/DefaultInput.ini +++ b/Config/DefaultInput.ini @@ -21,10 +21,8 @@ DoubleClickTime=0.200000 +ActionMappings=(ActionName="Jump",Key=Gamepad_FaceButton_Bottom,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="Fly",Key=Q,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="DashLeft",Key=E,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="DashLeft",Key=Gamepad_LeftTrigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="DashRight",Key=R,bShift=False,bCtrl=False,bAlt=False,bCmd=False) -+ActionMappings=(ActionName="DashRight",Key=Gamepad_RightTrigger,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="DashLeft",Key=Gamepad_LeftShoulder,bShift=False,bCtrl=False,bAlt=False,bCmd=False) ++ActionMappings=(ActionName="DashRight",Key=R,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="DashRight",Key=Gamepad_RightShoulder,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="Fly",Key=Gamepad_FaceButton_Left,bShift=False,bCtrl=False,bAlt=False,bCmd=False) +ActionMappings=(ActionName="Respawn",Key=Gamepad_Special_Left,bShift=False,bCtrl=False,bAlt=False,bCmd=False) diff --git a/Content/Blueprints/BP_starsSky.uasset b/Content/Blueprints/BP_starsSky.uasset index a0e1b26..5b1b467 100644 Binary files a/Content/Blueprints/BP_starsSky.uasset and b/Content/Blueprints/BP_starsSky.uasset differ diff --git a/Content/Blueprints/Demat.uasset b/Content/Blueprints/Demat.uasset new file mode 100644 index 0000000..8f9db2c Binary files /dev/null and b/Content/Blueprints/Demat.uasset differ diff --git a/Content/Blueprints/Dematerializable.uasset b/Content/Blueprints/Dematerializable.uasset index 9d0755d..c95e8ef 100644 Binary files a/Content/Blueprints/Dematerializable.uasset and b/Content/Blueprints/Dematerializable.uasset differ diff --git a/Content/Blueprints/MainHUD.uasset b/Content/Blueprints/MainHUD.uasset new file mode 100644 index 0000000..2c2108e Binary files /dev/null and b/Content/Blueprints/MainHUD.uasset differ diff --git a/Content/Blueprints/MainHUDv2.uasset b/Content/Blueprints/MainHUDv2.uasset deleted file mode 100644 index 961effd..0000000 Binary files a/Content/Blueprints/MainHUDv2.uasset and /dev/null differ diff --git a/Content/Blueprints/MyCharacter.uasset b/Content/Blueprints/MyCharacter.uasset index 6d5824c..5d3dc87 100644 Binary files a/Content/Blueprints/MyCharacter.uasset and b/Content/Blueprints/MyCharacter.uasset differ diff --git a/Content/Blueprints/MyGame.uasset b/Content/Blueprints/MyGame.uasset index cf38c49..21a6e74 100644 Binary files a/Content/Blueprints/MyGame.uasset and b/Content/Blueprints/MyGame.uasset differ diff --git a/Content/Blueprints/tutorialHud.uasset b/Content/Blueprints/tutorialHud.uasset index 83f127b..4c4537e 100644 Binary files a/Content/Blueprints/tutorialHud.uasset and b/Content/Blueprints/tutorialHud.uasset differ diff --git a/Content/Maps/Test.umap b/Content/Maps/Test.umap new file mode 100644 index 0000000..87b23af Binary files /dev/null and b/Content/Maps/Test.umap differ diff --git a/Content/Maps/TestLevel.umap b/Content/Maps/TestLevel.umap deleted file mode 100644 index 501a467..0000000 Binary files a/Content/Maps/TestLevel.umap and /dev/null differ diff --git a/Content/Maps/tutorialStart.umap b/Content/Maps/Tutorial.umap similarity index 67% rename from Content/Maps/tutorialStart.umap rename to Content/Maps/Tutorial.umap index cab4316..5eb8f0b 100644 Binary files a/Content/Maps/tutorialStart.umap and b/Content/Maps/Tutorial.umap differ diff --git a/Content/Materials/EnergySparcle.uasset b/Content/Materials/EnergySparcle.uasset index 4ed8e56..e53f8a3 100644 Binary files a/Content/Materials/EnergySparcle.uasset and b/Content/Materials/EnergySparcle.uasset differ diff --git a/Content/Materials/Highlight.uasset b/Content/Materials/Highlight.uasset index 54f5031..5590067 100644 Binary files a/Content/Materials/Highlight.uasset and b/Content/Materials/Highlight.uasset differ diff --git a/Content/Materials/skin.uasset b/Content/Materials/skin.uasset index 4d71219..2f4eff3 100644 Binary files a/Content/Materials/skin.uasset and b/Content/Materials/skin.uasset differ diff --git a/Content/Music/rougoku.uasset b/Content/Music/rougoku.uasset deleted file mode 100644 index d098370..0000000 Binary files a/Content/Music/rougoku.uasset and /dev/null differ diff --git a/Sounds Fx/Dematerialization.wav b/Content/SFX/Dematerialization.uasset similarity index 98% rename from Sounds Fx/Dematerialization.wav rename to Content/SFX/Dematerialization.uasset index fb84fcc..7b1a9ae 100644 Binary files a/Sounds Fx/Dematerialization.wav and b/Content/SFX/Dematerialization.uasset differ diff --git a/Sounds Fx/Fly.wav b/Content/SFX/Fly.uasset similarity index 99% rename from Sounds Fx/Fly.wav rename to Content/SFX/Fly.uasset index ebe0f02..7971091 100644 Binary files a/Sounds Fx/Fly.wav and b/Content/SFX/Fly.uasset differ diff --git a/Sounds Fx/Homing.wav b/Content/SFX/Homing.uasset similarity index 89% rename from Sounds Fx/Homing.wav rename to Content/SFX/Homing.uasset index 1d3b9af..a220775 100644 Binary files a/Sounds Fx/Homing.wav and b/Content/SFX/Homing.uasset differ diff --git a/Sounds Fx/Jump.wav b/Content/SFX/Jump.uasset similarity index 93% rename from Sounds Fx/Jump.wav rename to Content/SFX/Jump.uasset index 7071336..3e1d619 100644 Binary files a/Sounds Fx/Jump.wav and b/Content/SFX/Jump.uasset differ diff --git a/Sounds Fx/Menu_Click.wav b/Content/SFX/Menu_Click.uasset similarity index 88% rename from Sounds Fx/Menu_Click.wav rename to Content/SFX/Menu_Click.uasset index cf61d11..7d46269 100644 Binary files a/Sounds Fx/Menu_Click.wav and b/Content/SFX/Menu_Click.uasset differ diff --git a/Sounds Fx/Menu_OK.wav b/Content/SFX/Menu_OK.uasset similarity index 93% rename from Sounds Fx/Menu_OK.wav rename to Content/SFX/Menu_OK.uasset index dccd496..bbee059 100644 Binary files a/Sounds Fx/Menu_OK.wav and b/Content/SFX/Menu_OK.uasset differ diff --git a/Content/font/test.uasset b/Content/font/test.uasset index b7ff394..dac37c7 100644 Binary files a/Content/font/test.uasset and b/Content/font/test.uasset differ diff --git a/Content/four/NewAnimBlueprint.uasset b/Content/four/NewAnimBlueprint.uasset index ac8568e..053580e 100644 Binary files a/Content/four/NewAnimBlueprint.uasset and b/Content/four/NewAnimBlueprint.uasset differ diff --git a/Content/four/NewMaterialParameterCollection.uasset b/Content/four/NewMaterialParameterCollection.uasset index d52ed6c..818498e 100644 Binary files a/Content/four/NewMaterialParameterCollection.uasset and b/Content/four/NewMaterialParameterCollection.uasset differ diff --git a/Content/four/PS_PureEmit.uasset b/Content/four/PS_PureEmit.uasset index d284f5d..0103bd2 100644 Binary files a/Content/four/PS_PureEmit.uasset and b/Content/four/PS_PureEmit.uasset differ diff --git a/Content/four/PS_Reactor.uasset b/Content/four/PS_Reactor.uasset index 92e0639..9952b78 100644 Binary files a/Content/four/PS_Reactor.uasset and b/Content/four/PS_Reactor.uasset differ diff --git a/Content/four/PS_demat.uasset b/Content/four/PS_demat.uasset index a6f49b3..e2e20eb 100644 Binary files a/Content/four/PS_demat.uasset and b/Content/four/PS_demat.uasset differ diff --git a/Content/four/PS_thruster.uasset b/Content/four/PS_thruster.uasset index a0817ff..94d62fd 100644 Binary files a/Content/four/PS_thruster.uasset and b/Content/four/PS_thruster.uasset differ diff --git a/Content/four/four.uasset b/Content/four/four.uasset index 162b4cc..cab830e 100644 Binary files a/Content/four/four.uasset and b/Content/four/four.uasset differ diff --git a/Content/four/four_Anim_Default_Take.uasset b/Content/four/four_Anim_Default_Take.uasset index 9c37443..ae1367a 100644 Binary files a/Content/four/four_Anim_Default_Take.uasset and b/Content/four/four_Anim_Default_Take.uasset differ diff --git a/Content/four/four_Anim_Fly.uasset b/Content/four/four_Anim_Fly.uasset index f895410..5f067ce 100644 Binary files a/Content/four/four_Anim_Fly.uasset and b/Content/four/four_Anim_Fly.uasset differ diff --git a/Content/four/four_Anim_Idle.uasset b/Content/four/four_Anim_Idle.uasset index 58bc3b5..fdd7f42 100644 Binary files a/Content/four/four_Anim_Idle.uasset and b/Content/four/four_Anim_Idle.uasset differ diff --git a/Content/four/four_Anim_run.uasset b/Content/four/four_Anim_run.uasset index fd1132f..6736f07 100644 Binary files a/Content/four/four_Anim_run.uasset and b/Content/four/four_Anim_run.uasset differ diff --git a/Content/four/four_PhysicsAsset.uasset b/Content/four/four_PhysicsAsset.uasset index b698e44..1ec0cb6 100644 Binary files a/Content/four/four_PhysicsAsset.uasset and b/Content/four/four_PhysicsAsset.uasset differ diff --git a/Content/four/four_Skeleton.uasset b/Content/four/four_Skeleton.uasset index b9d9483..ebdad65 100644 Binary files a/Content/four/four_Skeleton.uasset and b/Content/four/four_Skeleton.uasset differ diff --git a/Content/four/thruster.uasset b/Content/four/thruster.uasset deleted file mode 100644 index c79a545..0000000 Binary files a/Content/four/thruster.uasset and /dev/null differ