Commit Graph

500 Commits

Author SHA1 Message Date
d1fab9f9a1 Updated DialogueNPC for Structs and Dialogue Paths 2023-02-09 03:12:27 +00:00
MH261677
a6436c9110 Added BP_AmmoItem
Added Ammo into the game for the player to find
2023-02-07 00:11:19 +00:00
MH261677
324f062cc7 Updated EatableItems for AmmoFunctionality
Added ammo base functionality for using the ammo item in game
2023-02-07 00:11:00 +00:00
MH261677
797c447d47 Added Ammo Icon to Images 2023-02-06 23:51:45 +00:00
Rowland Rowland
30d22975b7 Updated Level
Added textures and began experimenting with curves. Planning to investigate Splines
2023-02-06 17:24:41 +00:00
73262b425e Merge pull request #7 from Games-Academy-Student-Work-22-23/additional-movement
Additional movement
2023-02-06 15:57:36 +00:00
MARCEL HARA
36c18382a2 Updated TempCharacter for sneaking vignette effect
Added a Vignette effect when crouching
2023-02-06 15:55:12 +00:00
MARCEL HARA
5b4da1f02e Updated TempCharacter for Jump and Sneak
Added A sneak function and Jump function for the character
2023-02-06 15:26:22 +00:00
MARCEL HARA
0cf4ace43a Updated TempCharacter
Added Jump function which is using ACharacter and started working on custom Sneak function
2023-02-06 14:30:13 +00:00
MARCEL HARA
19a53529e9 Added Sneak keybind 2023-02-06 14:29:26 +00:00
a16de31aa2 Merge remote-tracking branch 'origin/merchant-system-v4' into dev 2023-02-06 13:53:22 +00:00
d21486797d Merge branch 'Dialogue-System' into dev
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-02-06 13:53:15 +00:00
ce78e1d53b Merge remote-tracking branch 'origin/Turn-Based-Combat' into dev 2023-02-06 13:52:46 +00:00
dc7e9c8c15 Merge branch 'Interactable-Environment' into dev 2023-02-06 13:52:20 +00:00
7f3e3cbb52 Updated DialogueNPC to Add Dialogue via Blueprints 2023-02-06 03:28:53 +00:00
e5b624411d Updated TextPrompt for Choices 2023-02-06 03:27:49 +00:00
6310050647 Updated DialogueNPC for Text Animation Speed Property 2023-02-06 01:13:17 +00:00
MH261677
14c7d6b6d7 Updated TempCharacter.cpp
Cached the camera reference isntead of constantly casting for it
2023-02-04 18:34:53 +00:00
MH261677
81d926ffb3 Updated EatableItems.cpp
Made it so when the players health is above 100 they cant heal anymore. (Removed healing stacking)
2023-02-04 17:56:25 +00:00
MH261677
5364f92edb Updated WBP_ItemDisplay
Item_Stack now changes to however many stacks the player has bought of the item
2023-02-04 17:49:17 +00:00
MH261677
f4e0511f5c Updated TempCharacter blueprint
Added a check to make sure the player is not in the shop when opening inventory
2023-02-04 17:41:09 +00:00
MH261677
182f54a3c8 Updated TempCharacter.cpp
Added boolean to make inventory not open when in shop
2023-02-04 17:39:12 +00:00
acefce8bbc Added InteractNPC to Line Trace for Interact 2023-02-02 03:15:50 +00:00
5c5b915225 Updated DialogueNPC to Disable Character Movement 2023-02-02 02:39:35 +00:00
a12b632caf Merge pull request #6 from Games-Academy-Student-Work-22-23/Bugfix-Player-Movement-Camera-Movement-Lock
Bugfix Set Mouse Input to Only Poll Yaw Movement
2023-02-02 02:22:49 +00:00
9e451d4539 Bugfix Set Mouse Input to Only Poll Yaw Movement 2023-02-02 02:19:59 +00:00
014a670ec5 Bugfix Widget Focus Not Correctly Being Set 2023-02-02 02:06:55 +00:00
3433254463 Added DialogueNPC Actor Component with Text Animation 2023-02-02 01:59:33 +00:00
5988272890 Added Base Text Prompt Widget Blueprint 2023-02-01 23:47:59 +00:00
42ce95b84e Added Dialogue Testing Map with Temp NPC 2023-02-01 23:47:22 +00:00
d36fe6fed0 Added Breakable Walls BP
Using Particles at the moment
2023-02-01 23:37:17 +00:00
Rowland Rowland
0a7025b684 Added new links to Dev
Added Google Slides for art and levels
2023-01-31 12:32:29 +00:00
e2f91a11b5 Bugfix Platform Too High to Get Across 2023-01-31 03:29:35 +00:00
7a715c2e55 Bugfix Hard Reference for GunEffect not Saving 2023-01-31 03:13:17 +00:00
8cf4d1d52e Built Lighting for Build 2023-01-31 02:45:23 +00:00
326e64e7ed Merge remote-tracking branch 'origin/Level-Design' into dev 2023-01-31 02:19:42 +00:00
64f5d652ff Merge remote-tracking branch 'origin/Enviroment-Art' into dev 2023-01-31 02:19:30 +00:00
7c3a9e8725 Updated Combat System to Clear Battle Log on Combat Start 2023-01-31 02:19:11 +00:00
75f373e0c4 Updated Beta Level Map for Temp Jelly Assets 2023-01-31 02:15:07 +00:00
a15054656e Merge branch 'dev' into Shaders
# Conflicts:
#	Content/Levels/Top_layer_level.umap
2023-01-31 02:04:48 +00:00
afb0429003 Merge remote-tracking branch 'origin/Beta-Level' into dev 2023-01-31 01:53:37 +00:00
24aa97ea2e Update readme.md 2023-01-31 01:52:15 +00:00
803ae0d87e Merge branch 'dev' into Turn-Based-Combat 2023-01-31 01:50:04 +00:00
ed0bcc7c76 Updated CombatCharacter to Spawn GunEffect onClick 2023-01-31 01:48:35 +00:00
45374da8bb Updated Combat System to Disengage from Combat 2023-01-31 01:39:42 +00:00
5b60412cf9 Updated TurnBaseCombat to Reset Resource Values
Temp until resource gathering
2023-01-31 01:25:54 +00:00
d9584f3b55 Removed Escape To Main Menu 2023-01-31 01:23:28 +00:00
b84a16e926 Updated TurnBaseCombat to Link Health Values 2023-01-31 01:21:49 +00:00
ad91d6eac7 Updated GunEffect Changed Texture from White 2023-01-31 01:02:36 +00:00
f80f5f21ef Bugfix Action Point Count Down 2023-01-31 01:02:03 +00:00