|
|
a6ef9f76cd
|
Merge branch 'Dialogue-System' into dev
|
2023-02-25 02:27:38 +00:00 |
|
|
|
671ab8e3d7
|
Merge remote-tracking branch 'origin/UI-designs' into dev
|
2023-02-25 02:27:07 +00:00 |
|
Charlie Seymour
|
c7760f042b
|
Added Maya file for Tutorial level
|
2023-02-23 17:55:36 +00:00 |
|
|
|
76043108b1
|
Merge pull request #10 from Games-Academy-Student-Work-22-23/Stealth-Mechanics-v1.0.2
Stealth mechanics v1.0.2
|
2023-02-23 16:04:33 +00:00 |
|
MARCEL HARA
|
ce4f3aff1f
|
Added SneakMechanicTesting level
Added new level for sneak mechanic testing
|
2023-02-23 16:03:10 +00:00 |
|
ROWLAND ROWLAND
|
69f4b8e603
|
Merge branch 'dev' into Level-1-bloackout
|
2023-02-23 15:49:45 +00:00 |
|
MARCEL HARA
|
119b5a141a
|
Updated TempCharacter to remove unused Ulogs
|
2023-02-23 15:19:32 +00:00 |
|
|
|
fb0bd09bb2
|
Merge remote-tracking branch 'origin/dev' into Level-Design
|
2023-02-23 15:06:57 +00:00 |
|
|
|
5dae3b2691
|
Merge pull request #9 from Games-Academy-Student-Work-22-23/Fix-UI-Scaling
Fix UI scaling
|
2023-02-20 16:04:44 +00:00 |
|
MARCEL HARA
|
5e448c897d
|
Updated Widgets to fix scaling issue
Fixed scaling issue on all widgets to fit all monitor types
|
2023-02-20 16:03:25 +00:00 |
|
Phoebe Harris-Wilson
|
0d135251df
|
update book
|
2023-02-20 15:31:49 +00:00 |
|
Phoebe Harris-Wilson
|
06fa5cc09d
|
added ui designs for icons and book
|
2023-02-20 15:24:00 +00:00 |
|
MARCEL HARA
|
cc8eee9727
|
Merge pull request #8 from Games-Academy-Student-Work-22-23/resource-mining
Resource mining
|
2023-02-20 15:11:43 +00:00 |
|
MARCEL HARA
|
e9af8b713f
|
Updated EatableItems to fix Ammo Consuming
Fixed ammo consuming crashing the client
|
2023-02-20 14:49:05 +00:00 |
|
Kacper Szelest
|
177a4f685f
|
Added and made Level 1 Blockout assets
I added and put implamented the level 1 blockout assets and created the blockout level for it.
|
2023-02-20 14:48:45 +00:00 |
|
Kacper Szelest
|
a67d96943c
|
Added file level
I added a new level file named level 1, to house the blockout of level one and the future first level
|
2023-02-20 14:47:52 +00:00 |
|
|
|
26f21a9136
|
Updated DialogueNPC to use Ranged For Loops
|
2023-02-20 09:50:09 +00:00 |
|
MH261677
|
618a9509ca
|
Updated EatableItems to add ammo {UNSTABLE}
Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes.
|
2023-02-19 15:29:16 +00:00 |
|
MH261677
|
3c2d057951
|
Updated TempCharacter to destory ammo ore
destroys ammo ore when the player presses e on it
|
2023-02-19 15:28:34 +00:00 |
|
MH261677
|
43ef8e2110
|
Updated TempCharacter to sneak functionality
Added sneak functionality which makes the sphere radius smaller near enemies.
|
2023-02-17 13:12:28 +00:00 |
|
MARCEL HARA
|
77c43ab3d1
|
Updated TempCharacter to find AI Sphere
|
2023-02-16 15:02:58 +00:00 |
|
Thomas Jacob Rowland
|
e678bcb0bb
|
Fixed Build Issues for personal PC
Couldn't open without building from source. Fixed that hopefully this push means I won't have to do so again
|
2023-02-11 16:19:14 +00:00 |
|
Rowland Rowland
|
f032ac91c9
|
Cleaning Level
Using booleans to remove excess assets
|
2023-02-09 17:02:47 +00:00 |
|
|
|
9bfb07fbba
|
Updated DialogueNPC to Add Ids for Dialogue Paths
|
2023-02-09 17:01:03 +00:00 |
|
|
|
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 |
|
