Merge branch 'master' of https://git.james-things.com/James/Bookworm

Saving Progress
2021-11-11 09:41:22 +01:00 · 2021-11-11 09:40:52 +01:00
20 changed files with 47 additions and 16 deletions
--- a/Config/DefaultEngine.ini
+++ b/Config/DefaultEngine.ini
@ -2,7 +2,7 @@

 [/Script/EngineSettings.GameMapsSettings]
 GameDefaultMap=/Engine/Maps/Templates/Template_Default.Template_Default
-
+EditorStartupMap=/Game/MainLevels/TheLibrary.TheLibrary

 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop
--- a/Config/DefaultInput.ini
+++ b/Config/DefaultInput.ini
@ -81,6 +81,7 @@ DoubleClickTime=0.200000
 +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
 +ActionMappings=(ActionName="LeanRight",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
 +ActionMappings=(ActionName="LeanLeft",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Q)
+ActionMappings=(ActionName="Dash",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftShift)
 +AxisMappings=(AxisName="Forward",Scale=1.000000,Key=W)
 +AxisMappings=(AxisName="Forward",Scale=-1.000000,Key=S)
 +AxisMappings=(AxisName="Right",Scale=1.000000,Key=D)
--- a/Content/FX/P_Fog.uasset
+++ b/Content/FX/P_Fog.uasset
--- a/Content/FX/P_Hiding.uasset
+++ b/Content/FX/P_Hiding.uasset
--- a/Content/FX/localFog.uasset
+++ b/Content/FX/localFog.uasset
--- a/Content/MainLevels/TheLibrary.umap
+++ b/Content/MainLevels/TheLibrary.umap
--- a/Content/MainLevels/TheLibrary_BuiltData.uasset
+++ b/Content/MainLevels/TheLibrary_BuiltData.uasset
--- a/Content/Materials/Textures/lightning.png
+++ b/Content/Materials/Textures/lightning.png
--- a/Content/Materials/Textures/lightning.uasset
+++ b/Content/Materials/Textures/lightning.uasset
--- a/Content/Materials/Volumetrics/VolumetricParticle.uasset
+++ b/Content/Materials/Volumetrics/VolumetricParticle.uasset
--- a/Content/Materials/Volumetrics/VolumetricParticle_Inst.uasset
+++ b/Content/Materials/Volumetrics/VolumetricParticle_Inst.uasset
--- a/Content/UI/Staminabar.uasset
+++ b/Content/UI/Staminabar.uasset
--- a/Content/blueprints/BP_CollectableBook.uasset
+++ b/Content/blueprints/BP_CollectableBook.uasset
--- a/Content/blueprints/BP_Dungeon.uasset
+++ b/Content/blueprints/BP_Dungeon.uasset
--- a/Content/blueprints/BP_Maincharacter.uasset
+++ b/Content/blueprints/BP_Maincharacter.uasset
--- a/Content/blueprints/Hidingplace.uasset
+++ b/Content/blueprints/Hidingplace.uasset
--- a/Content/blueprints/INT_Interact.uasset
+++ b/Content/blueprints/INT_Interact.uasset
--- a/Content/blueprints/RandomBookshelf.uasset
+++ b/Content/blueprints/RandomBookshelf.uasset
--- a/Content/models/Book_V2.uasset
+++ b/Content/models/Book_V2.uasset
--- a/Content/models/book.uasset
+++ b/Content/models/book.uasset
Author	SHA1	Message	Date
Jesse James Isler	0c0316f8a5	Merge branch 'master' of https://git.james-things.com/James/Bookworm	2021-11-11 09:41:22 +01:00
Jesse James Isler	7ff90c3ba6	Saving Progress	2021-11-11 09:40:52 +01:00