|
|
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 |
|
|
|
d18c547632
|
Bugfix Cursor Not Hiding After Combat
|
2023-01-31 00:56:53 +00:00 |
|
|
|
7e81387247
|
Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
|
2023-01-31 00:50:59 +00:00 |
|
|
|
3f8a2266c4
|
Updated InitCombat to Decrease Combat Range
|
2023-01-31 00:32:03 +00:00 |
|
|
|
0de2753dff
|
Bugfix Clicking Instantly Activates Combat
|
2023-01-31 00:30:45 +00:00 |
|
|
|
e91d059c56
|
Bugfix Enemy Runs Away when User Init Combat
|
2023-01-31 00:30:14 +00:00 |
|
|
|
6092c22a2b
|
Updated TurnBasedCombat to Link Enemy Health
|
2023-01-31 00:04:24 +00:00 |
|
|
|
8b2b9d56cb
|
Updated HoldToInitCombat for Unreal Naming Conventions
|
2023-01-30 23:03:50 +00:00 |
|
|
|
cd17363421
|
Removed Legacy Source Code to Reduce Compilation
|
2023-01-30 23:03:20 +00:00 |
|
KACPER Szelest
|
beb110a901
|
Added Red Jelly Asset
I added a red Jelly asset to be used in the merchant system as a placeholder asset
|
2023-01-30 22:39:29 +00:00 |
|
KACPER Szelest
|
f4134c478f
|
Added Blue Jelly asset
I added a blue jelly asset to be used in the merchant system
|
2023-01-30 22:37:15 +00:00 |
|
MH261677
|
f33c43689b
|
Updated Interaction,TempCharacter.cpp
Fixed being able to open the text widget while the selector is open so merchant is fully working now.
|
2023-01-30 21:07:36 +00:00 |
|
george taylor
|
7644f56dd2
|
Added modular planks for Rope Bridges into Assets Objects
Created four modular planks for the rope bridges that can be put together too create a longer rope bridge.
|
2023-01-30 18:01:07 +00:00 |
|
