Compare commits

merge into: janna_a/WizardingHub:feat/cable-system

Branches Tags

janna_a/WizardingHub:main janna_a/WizardingHub:feat/basic-spell-system janna_a/WizardingHub:modelImport janna_a/WizardingHub:test/basic-spell-system janna_a/WizardingHub:feat/spell-system janna_a/WizardingHub:feat/cable-system janna_a/WizardingHub:2024-09-09-backup

..

pull from: janna_a/WizardingHub:modelImport

Branches Tags

janna_a/WizardingHub:main janna_a/WizardingHub:feat/basic-spell-system janna_a/WizardingHub:modelImport janna_a/WizardingHub:test/basic-spell-system janna_a/WizardingHub:feat/spell-system janna_a/WizardingHub:feat/cable-system janna_a/WizardingHub:2024-09-09-backup

6 Commits

feat/cable-system .. modelImport

Author	SHA1	Message	Date
ayresma	e1ceb2f7fc	cube ... cuuuube	2025-05-21 17:41:43 -04:00
janna_a	c040d71325	level edits	2025-05-20 00:55:14 -04:00
janna_a	3b101338af	room 2 level edits ... spaced it out more	2025-05-14 21:39:32 -04:00
janna_a	d21de2a7c5	conveyor belt blueprint ... character now gets moved on conveyor belt. Should the cb also move other actors?	2025-05-12 15:44:47 -04:00
janna_a	2c6a41a183	updated content folder	2025-05-09 20:07:18 -04:00
lance1416	f9748da896	Merge pull request 'Rewrite Cable System' (#8) from feat/cable-system into main ... Reviewed-on: #8	2025-05-07 13:03:16 -04:00

158 changed files with 328 additions and 220 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Expand all files Collapse all files

Content/Audio/Lumi_Title_Screen_Cue.uasset

LFS

BIN

Binary file not shown.

Content/BP_BubbleSwitchtwo.uasset

LFS

BIN

Binary file not shown.

Content/BP_CB.uasset

LFS

BIN

Binary file not shown.

Content/BP_LumiCharacter.uasset

LFS

BIN

Binary file not shown.

Content/BP_Rope.uasset

LFS

BIN

Binary file not shown.

Content/BP_rotatingplatform.uasset

LFS

BIN

Binary file not shown.

Content/BP_tightrope.uasset

LFS

BIN

Binary file not shown.

Content/Bubble/BP_BouncyBubble.uasset

LFS

BIN

Binary file not shown.

Content/Fracture/SM_ChamferCube3_GeometryCollection_Blueprint.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/BP_Rope.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/BP_tightrope.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/Rope_M.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/Rope_SM.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/Rope_SM_PhysicsAsset.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/Rope_SM_Skeleton.uasset

LFS

BIN

Binary file not shown.

Content/LevelPrototyping/SM_ChamferCube3_GeometryCollection.uasset

LFS

BIN

Binary file not shown.

Content/Lumi/LumiMesh/Lumi_mesh7_PhysicsAsset.uasset

LFS

BIN

Binary file not shown.

Content/Lumi/LumiMesh/UpdatedMesh/Lumi_mesh16.uasset

LFS

BIN

Binary file not shown.

Content/Lumi/LumiMesh/UpdatedMesh/Lumi_mesh16_PhysicsAsset.uasset

LFS

BIN

Binary file not shown.

Content/Lumi/LumiProps/Cape/ModularCharacterCapeSetup/capepls2.uasset

LFS

BIN

Binary file not shown.

Content/Lumi/LumiProps/Cape/ModularCharacterCapeSetup/capepls2_PhysicsAsset.uasset

LFS

BIN

Binary file not shown.

Content/M_cb.uasset

LFS

BIN

Binary file not shown.

Content/Projectile/BP_ProjectileBase.uasset

LFS

BIN

Binary file not shown.

Content/Projectile/SM_RoboSpikeBall.uasset

LFS

BIN

Binary file not shown.

Content/Room2/Bubble/BP_BouncyBubble.uasset

LFS

BIN

Binary file not shown.

Content/Rope_M.uasset

LFS

BIN

Binary file not shown.

Content/Rope_SM.uasset

LFS

BIN

Binary file not shown.

Content/Rope_SM_PhysicsAsset.uasset

LFS

BIN

Binary file not shown.

Content/Rope_SM_Skeleton.uasset

LFS

BIN

Binary file not shown.

Content/SM_ChamferCube3_GeometryCollection.uasset

LFS

BIN

Binary file not shown.

Content/SM_RoboSpikeBall.uasset

LFS

BIN

Binary file not shown.

Content/StarterContent/Architecture/Floor_400x400.uasset

LFS

BIN

Binary file not shown.

Content/StarterContent/Blueprints/Blueprint_CeilingLight.uasset

LFS

BIN

Binary file not shown.

Content/StarterContent/Props/Materials/M_Chair.uasset

LFS

BIN

Binary file not shown.

Content/StarterContent/Props/Materials/M_TableRound.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/MainMenuScreen_Map.umap

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_0217B568.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_26E5EFFC.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_272279C9.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_55097A71.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_622E8038.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_762BA88F.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_83A083DC.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_842651FC.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_D308C4AF.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_E6A11B29.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_EA3F371D.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_F0A498EE.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/Box_F148418C.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/CubeGridToolOutput_014DE31B.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/CubeGridToolOutput_387445FA.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/CubeGridToolOutput_8CE3F8F8.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/CubeGridToolOutput_BAD23E3E.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/CubeGridToolOutput_BBFEF31E.uasset

LFS

BIN

Binary file not shown.

Content/ThirdPerson/Maps/_GENERATED/Janna/CubeGridToolOutput_E6AB55B2.uasset

LFS

BIN

Binary file not shown.

Content/VFX/BP_ProjectileBase.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/2V/MSLOAKMIDNBUDONJ0O834G.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/5H/X8VXATYCES2FRJXX9D2TJL.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/96/TXGKO3UGYEX1HCYJ3FUNQE.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/AJ/DNWJZTO3CMKIUL3L7U4JMI.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/JI/0QSZBJLI7T97FTSP4EVKB9.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/K8/DNTQUINKS8OG1A44LD3T40.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/KX/EU6SYI0PWIQXCRMQCPGEQE.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/SQ/6C0YOZ2JBFIXRX1XJ5KUGL.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/YY/U2RZANDO5TFISTJ68K5XVU.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/B5/W31WVMEK0HAIYSS6CCOJOP.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/BQ/QNGT229J5KANUJ9JMCCHBZ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/N4/RYJFZSW5HNFXD535H6324X.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/PF/NPOEONHOVKNFVIWB0XZWW1.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/VY/3AQ4H81YQEM9ZPJVEDPZTI.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/2/AE/PSXIECH9105FTJCDDOEQAU.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/2/SG/OWKJC6NBAA7X0HZSPJG8NX.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/2/TY/TEW5N566FWXSQ0M82WFNCE.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/2/XL/C6YB674BV1VZZSM9BCVRW0.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/2/Y4/U2W1CA1GLTU9MDDVB643NQ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/0Q/OL3C5TUFSY1KFZFT4FVOEI.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/6H/5W7IOP1KOJEOUJG5S19PUQ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/9S/K3ZM0H1I7OO4QNJC8VLSGF.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/B1/9DSWGZRJQ53ZB0SJL6C7KR.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/DW/B3JUZ5MJJKZV3V8BQ6F19I.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/IS/UWWO3DESEMIC50M96177QQ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/KR/WPYEOPM35P8RFC04IMENWS.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/09/D26OSRS317R52DBQC4UI5R.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/50/I3DEDMKBK4MDOZLHZB4O6T.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/88/OYH6GO4UGF84115NIYMMLC.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/H9/BYGM3ZOWNHCJ289E5FWGAN.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/HC/Q23HDIGQA33I6BGDMPXS2Y.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/N1/4M662LYMCH586UP0FQHAVM.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/WI/3GIENGAQXNBN03KTPPTV7Y.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/ZY/KWYNIUWIH8G2NXY1ZY1PH6.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/13/2HHKHWU2AY9IBKQTUTTX25.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/PD/C5PWUB9LHMYNN9UNC8J0RZ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/Q1/WP8HYBY9T4I7SA2XBX84EQ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/V0/VCRPIX1REC0ZNX7CIAIXLJ.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/Y3/QOBK6IO37KGHYBRSV1UA24.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/32/EI0CU8A5G8BF8J2RMP1LX2.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/AE/X4A2I37FX88LRYTHX7HMJK.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/DR/TWCP8QFIMI0T2E40C9UTT8.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/HG/6B4Y8NVM49FX6B43K6NE7N.uasset

LFS

BIN

Binary file not shown.

Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/IZ/PEMSZFLRN8EZ2ADOSC62PX.uasset

LFS

BIN

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More