Merge branch 'sfx' into 'main'

Added SFX See merge request aelys2/cs415-final-project!3

Merge branch 'sfx' into 'main'
c2807d6d · janeliu2 · 04de8d21 · 3bd0bdbf · c2807d6d · c2807d6d
Commit c2807d6d authored 1 year ago by janeliu2
--- a/Content/Audio/677832_Look-What-You-Made-Me-Do.uasset
+++ b/Content/Audio/677832_Look-What-You-Made-Me-Do.uasset
--- a/Content/Audio/677832_Look-What-You-Made-Me-Do.wav
+++ b/Content/Audio/677832_Look-What-You-Made-Me-Do.wav
--- a/Content/Audio/BkgMusic_WIP.uasset
+++ b/Content/Audio/BkgMusic_WIP.uasset
--- a/Content/Audio/EnemyCue.uasset
+++ b/Content/Audio/EnemyCue.uasset
--- a/Content/Audio/Static- Scary Sound Effects (1).wav
+++ b/Content/Audio/Static- Scary Sound Effects (1).wav
--- a/Content/Audio/Static-_Scary_Sound_Effects__1_.uasset
+++ b/Content/Audio/Static-_Scary_Sound_Effects__1_.uasset
--- a/Content/Blueprints/WinnieThePooh/POOH.uasset
+++ b/Content/Blueprints/WinnieThePooh/POOH.uasset
--- a/Content/Levels/MainMap.umap
+++ b/Content/Levels/MainMap.umap
--- a/h
+++ b/h
+[33mcommit f36c281be82e769050f44c050f466f73e34c1ec2[m[33m ([m[1;36mHEAD -> [m[1;32mplayer-character[m[33m)[m
+Author: TurkeyBlaster <ananthmadan03@gmail.com>
+Date:   Sun Apr 7 22:43:33 2024 -0500
+
+    Finished Player Movement
+
+[33mcommit 44983a588554953e931b8615d5597c103abc8604[m
+Author: TurkeyBlaster <ananthmadan03@gmail.com>
+Date:   Sun Apr 7 21:47:12 2024 -0500
+
+    Project Setup
+
+[33mcommit 1f10a56ab26398fd275279fe6f9ac1030b876881[m
+Merge: cc6a39d 1a33cf2
+Author: TurkeyBlaster <ananthmadan03@gmail.com>
+Date:   Sun Apr 7 20:35:22 2024 -0500
+
+    Merge branch '1-TestPush' of https://gitlab.engr.illinois.edu/aelys2/cs415-final-project into player-character
+
+[33mcommit cc6a39ded6fe05e1bad3e14025b75ac1e60c843f[m[33m ([m[1;31morigin/player-character[m[33m, [m[1;31morigin/main[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mmain[m[33m)[m
+Author: aelys2 <aelys2@illinois.edu>
+Date:   Mon Apr 1 20:32:26 2024 -0500
+
+    Initial commit
+
+[33mcommit 1a33cf2490f0ae1b05d7efaba05f4bb97d62c46b[m[33m ([m[1;31morigin/1-TestPush[m[33m)[m
+Author: jl9306 <92283945+jl9306@users.noreply.github.com>
+Date:   Sun Mar 31 23:30:24 2024 -0500
+
+    fixing lfs
+    
+    send help
+
+[33mcommit 044cbeca485b01f8d43d31c0c4a624dac40fbc7e[m
+Author: jl9306 <92283945+jl9306@users.noreply.github.com>
+Date:   Sun Mar 31 22:57:19 2024 -0500
+
+    configuring lfs settings
+    
+    setting up the github
+
+[33mcommit 0b67dd98a3cc396cc9e5f7b63512a0c40331582f[m
+Author: jl9306 <92283945+jl9306@users.noreply.github.com>
+Date:   Sun Mar 31 22:49:34 2024 -0500
+
+    Initial commit