71 Commits

Author SHA1 Message Date
lance1416 b6519d91c3 Merge remote-tracking branch 'origin/main' into feat/basic-spell-system
# Conflicts:
#	Content/StarterContent/Architecture/Floor_400x400.uasset
#	Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset
2025-05-22 01:42:13 -04:00
janna_a c040d71325 level edits 2025-05-20 00:55:14 -04:00
janna_a a38344d84e adjusted timeline 2025-05-17 15:11:22 -04:00
janna_a 00ddb8a85b created new spell door bp with animation 2025-05-17 14:57:52 -04:00
janna_a c4c51ce48e spell keybinds 2025-05-15 17:11:56 -04:00
lance1416 7c798a292f Fix map 2025-05-15 02:15:48 -04:00
lance1416 3ec793c6a1 Remove logger 2025-05-15 01:34:38 -04:00
lance1416 b072b71a9e Add spell interactable door 2025-05-15 00:28:56 -04:00
janna_a 3b101338af room 2 level edits
spaced it out more
2025-05-14 21:39:32 -04:00
lance1416 bcca018acd Add 3 sample shapes 2025-05-14 03:25:11 -04:00
lance1416 5f34e78844 Fix spell casting contents 2025-05-14 03:24:30 -04:00
lance1416 ce2dfbcb54 Fix one dollar recognizer implementation 2025-05-14 03:14:20 -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
lance1416 10dbf33a52 Rewrite switch cable matching system 2025-05-07 01:43:36 -04:00
lance1416 651741e3b8 Fix some spell system 2025-05-05 22:06:18 -04:00
lance1416 61bbb894e7 Clean-up contents directory 2025-05-05 21:58:54 -04:00
lance1416 735f295603 Fix build settings 2025-05-05 15:59:13 -04:00
lance1416 e620e88316 Bump to UE 5.5 2025-05-02 13:20:15 -04:00
alhashij 89dd092825 updated switchID and TargetSwitchID 2025-03-14 16:28:42 -04:00
alhashij cc470469c6 updated pause menu 2025-03-12 22:25:09 -04:00
alhashij 0b07ee5519 Level Layout + Switch matches for room 1
Greyboxed main areas(still need to do third and fourth room
Switch puzzle functionality(still in progress)
Slime Material
Organized Files
Created a Title screen Map
2025-03-12 22:09:57 -04:00
lance1416 03ae94b586 Add collision cooldown 2025-02-27 22:30:43 -05:00
lance1416 dab26def17 Add up speed 2025-02-27 22:15:07 -05:00
lance1416 5026ee5da2 Add bouncy bubble 2025-02-27 21:53:18 -05:00
lance1416 268723e17c Add hammer actor 2025-02-25 23:11:33 -05:00
lance1416 8c68d2efc2 Add README.md 2025-02-23 22:00:08 +00:00
lance1416 d3f9f594af Add basic code 2025-02-22 01:06:04 -05:00
alhashij 9ffe9abddb Fly fixed
cpp code
2025-02-16 23:32:57 -05:00
alhashij faeb20cec1 lvldesign 2025-02-16 23:20:16 -05:00
alhashij f75549d073 test 2025-02-11 21:56:56 -05:00
alhashij cd8fb9fb23 deleted ludusai 2025-02-05 21:33:56 -05:00
alhashij 556df64ffc Testing out mechanics, pushing to see if it overwrites the fly bug 2025-01-15 22:33:24 -05:00
lance1416 a7a2e522fa Add spell training widget and logic 2025-01-06 03:42:06 -05:00
lance1416 32f7d37242 Move input action binding to LumiController 2025-01-06 01:23:15 -05:00
lance1416 f0efc9639c Integrate $1 into LumiCharacter 2025-01-04 04:02:26 -05:00
lance1416 1f0533daf1 Fix spell drawing 2025-01-04 03:14:05 -05:00
lance1416 fbffa6ae71 Add $1 uni-stroke recognizer system 2025-01-03 01:50:25 -05:00
lance1416 3abf8d34f0 Fix teleportation pivot 2024-12-27 01:32:29 -05:00
lance1416 8366c7a571 Fix BP_LumiCharacter.uasset 2024-12-26 23:39:28 -05:00
alhashij 69f540862f Merge branch 'main' of https://git.lance1416.com/janna_a/WizardingHub 2024-12-26 16:47:01 -05:00
alhashij 09fae3f442 Cape changes
works with the character rig, the collision is still not working,
changed the event tick in the levitation code
2024-12-26 16:46:35 -05:00
lance1416 f9f2d5a7ed Re-link lumi related components 2024-12-26 02:02:32 -05:00
alhashij 01678214b8 Attempts to make a tightrope to walk on
detects player foot collision where player can hop on and hop off. Currently not working
2024-12-24 18:48:23 -05:00
alhashij a756fe7e91 Spell changed made on my file 2024-12-23 17:13:44 -05:00
lance1416 3753909adc Assign SpellOverlay to LumiCharacter 2024-12-19 21:50:03 -05:00
lance1416 75fbfb97ba Add SpellOverlay class 2024-12-19 21:44:09 -05:00
alhashij 686c7d6c6c Hang on object, slopes slide
Press "H" to hang, is on a 20< slope character will slide down.
2024-12-19 15:58:48 -05:00
alhashij 40e0dc5da1 Merge branch 'main' of https://git.lance1416.com/janna_a/WizardingHub 2024-12-19 15:51:44 -05:00
lance1416 cf7930ac94 Convert PlayerController to cpp 2024-12-18 19:27:57 -05:00
alhashij bdc102bc9a wall jump and slide
still need animations
2024-12-17 18:22:21 -05:00
alhashij 235d44bb0c Lumi Cape
uhh still not working but progress was made, physics asset edited
2024-10-30 22:44:53 -04:00
alhashij c7dc6ec1dd Prototype assets for level designing 2024-10-15 21:32:47 -04:00
alhashij 166e11d0ef More duplicate removals 2024-10-04 15:03:51 -04:00
alhashij 1f37d7533b Removed PlaceHolderFiles
Got rid of Previous Scripts Folder
2024-10-04 14:53:04 -04:00
lance1416 9b6ccf7f1c Update game map 2024-10-03 14:23:23 -04:00
lance1416 0e4a0ab2d3 Hot fix 2024-10-03 14:20:30 -04:00
lance1416 78047c248a Add swap teleportation 2024-10-03 05:56:37 -04:00
alhashij 2fc648a663 Lumi Mesh Fixed
deleted some files that arent being used
BG and Title screen music implemented
Idle 2 and run 7 are in
2024-09-28 17:03:48 -04:00
lance1416 e5649b711b Remove problematic files 2024-09-23 22:47:49 -04:00
lance1416 1b30934497 Hot Fix 2024-09-23 22:45:52 -04:00
lance1416 da842d3194 Add interactable logic 2024-09-23 06:00:02 -04:00
lance1416 73353dabde Clean up 2024-09-10 08:20:07 -04:00
lance1416 cbe5680a18 Patch tho no idea why 2024-09-10 06:11:06 -04:00
lance1416 e066130d8c Update stamina bar 2024-09-10 06:00:48 -04:00
lance1416 09a4118e37 Update animation 2024-09-10 04:37:31 -04:00
lance1416 39827cae9f Update git configurations 2024-09-10 01:55:53 -04:00
lance1416 abd32f3002 Add BP_LumiCharacter 2024-09-10 01:53:50 -04:00
lance1416 dfcd659876 Update uproject for code 2024-09-10 01:50:25 -04:00
lance1416 bc45674165 Add code base 2024-09-09 21:00:18 -04:00
5274 changed files with 4379 additions and 13820 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# From: https://github.com/MOZGIII/ue5-gitignoregitattributes/ # https://github.com/MOZGIII/ue5-gitignore
# Unreal Engine file types. # Unreal Engine file types.
*.uasset filter=lfs diff=lfs merge=lfs -text *.uasset filter=lfs diff=lfs merge=lfs -text
+1 -67
View File
@@ -1,71 +1,5 @@
## Visual Studio 2015 user specific files # https://github.com/MOZGIII/ue5-gitignore
#.vs/
#
## Compiled Object files
#*.slo
#*.lo
#*.o
#*.obj
#
## Precompiled Headers
#*.gch
#*.pch
#
## Compiled Dynamic libraries
#*.so
#*.dylib
#*.dll
#
## Fortran module files
#*.mod
#
## Compiled Static libraries
#*.lai
#*.la
#*.a
#*.lib
#
## Executables
#*.exe
#*.out
#*.app
#*.ipa
#
## These project files can be generated by the engine
#*.xcodeproj
#*.xcworkspace
#*.sln
#*.suo
#*.opensdf
#*.sdf
#*.VC.db
#*.VC.opendb
#
## Precompiled Assets
#**/SourceArt/**/*.png
#**/SourceArt/**/*.tga
#
## Builds
#**/Build/*
#
## Whitelist PakBlacklist-<BuildConfiguration>.txt files
#!**/Build/*/
#**/Build/*/**
#!**/Build/*/PakBlacklist*.txt
#
## Don't ignore icon files in Build
#!**/Build/**/*.ico
#
## Configuration files generated by the Editor
#**/Saved/*
#
## Compiled source files for the engine to use
#**/Intermediate/*
#
## Cache files for the editor to use
#**/DerivedDataCache/*
# From: https://github.com/MOZGIII/ue5-gitignoregitattributes/
# Ignore all files by default, but scan all directories. # Ignore all files by default, but scan all directories.
* *
!*/ !*/
-9
View File
@@ -1,11 +1,2 @@
[UnrealEd.SimpleMap]
SimpleMapName=/Game/TP_ThirdPerson/Maps/ThirdPersonExampleMap
[EditoronlyBP]
bAllowClassAndBlueprintPinMatching=true
bReplaceBlueprintWithClass= true
bDontLoadBlueprintOutsideEditor= true
bBlueprintIsNotBlueprintType= true
[/Script/AdvancedPreviewScene.SharedProfiles] [/Script/AdvancedPreviewScene.SharedProfiles]
+8
View File
@@ -0,0 +1,8 @@
[/Script/LudusCore.LudusSettings]
AuthToken=eyJhbGciOiJIUzI1NiJ9.eyJuYW1lIjoiYWxoYXNoaWoiLCJlbWFpbCI6ImFsaGFzaGlqQHNoZXJpZGFuY29sbGVnZS5jYSIsInBpY3R1cmUiOiJodHRwczovL2F2YXRhcnMuZ2l0aHVidXNlcmNvbnRlbnQuY29tL3UvMTI3MjMwNzQ0P3Y9NCIsInN1YiI6IjEyNzIzMDc0NCIsInByb3ZpZGVySWQiOiIxMjcyMzA3NDQiLCJ1c2VySWQiOiI2MzJmZjBhMC05ZTZlLTQyMzctOWVmOS02M2I0NzUyZjI3YjEiLCJsYXN0U3RhdHVzQ2hlY2siOjE3MzY0NjA5NjgzMjF9.QEvTkkQf0GF3WrPBLEpyrzoEeTV8SZCCv3VwnSjowQw
Username=alhashij
UserCredits=291
Email=alhashij@sheridancollege.ca
ApiBaseUrl="https://api.ludusengine.com"
AppBaseUrl="https://app.ludusengine.com"
+1
View File
@@ -119,6 +119,7 @@ ManualIPAddress=
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="ProjectileCollision") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel1,DefaultResponse=ECR_Block,bTraceType=False,bStaticObject=False,Name="ProjectileCollision")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="FS_Sleep") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel2,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="FS_Sleep")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Grapple") +DefaultChannelResponses=(Channel=ECC_GameTraceChannel3,DefaultResponse=ECR_Ignore,bTraceType=False,bStaticObject=False,Name="Grapple")
+DefaultChannelResponses=(Channel=ECC_GameTraceChannel4,DefaultResponse=ECR_Ignore,bTraceType=True,bStaticObject=False,Name="WallJump")
-ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall") -ProfileRedirects=(OldName="BlockingVolume",NewName="InvisibleWall")
-ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn") -ProfileRedirects=(OldName="InterpActor",NewName="IgnoreOnlyPawn")
-ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic") -ProfileRedirects=(OldName="StaticMeshComponent",NewName="BlockAllDynamic")
-2
View File
@@ -1,9 +1,7 @@
[/Script/EngineSettings.GeneralProjectSettings] [/Script/EngineSettings.GeneralProjectSettings]
ProjectID=5A7DE2DB4BD886FBB746E7954405EBE0 ProjectID=5A7DE2DB4BD886FBB746E7954405EBE0
ProjectName=Third Person BP Game Template ProjectName=Third Person BP Game Template
CopyrightNotice=Copyright Team Lumi. All Rights Reserved.
[StartupActions] [StartupActions]
bAddPacks=True bAddPacks=True
InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent") InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent")
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
View File
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

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