Commit Graph

464 Commits

Author SHA1 Message Date
3de71a018d VFX for attack impact and insurrectionist steps 2024-02-15 20:53:48 -05:00
f97d0cf0f7 LODS 2024-02-15 19:16:09 -05:00
e7b47aab84 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-15 17:44:10 -05:00
09b0680b8e Ascent Platform Blockout
First blockout for the three types of platforms on The Ascent level.
2024-02-15 17:43:22 -05:00
6e22872d8f Attack blending tweak 2024-02-14 23:35:01 -05:00
21856c8f48 Import shipping crates 2024-02-14 22:58:50 -05:00
d2f3581cd2 Update enemy damage system 2024-02-14 16:59:35 -05:00
4e51dbeae9 Change movement to strafing 2024-02-14 13:14:39 -05:00
978a11cf2a Fix issue with skill tree not upgrading melee damage 2024-02-14 12:38:41 -05:00
5f0d4968bf Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-13 13:36:19 -05:00
dc3f293dd8 Optimize turret textures, iterate on shenanigans map 2024-02-13 13:36:14 -05:00
2aaaea110e Fix Axe Spin Not Working 2024-02-13 13:09:27 -05:00
d0c1c6d0af Add more SFX implementation 2024-02-13 01:01:13 -05:00
eb23b18eeb Fix bug with grappling 2024-02-13 00:13:55 -05:00
bd50b1853f Buggy wuggy was a bug, buggy wuggy was so snug, buggy wuggy then met connor, buggy wuggy was a goner 2024-02-12 23:04:19 -05:00
c42ef3819f Change melee attack to multi object trace 2024-02-12 22:03:46 -05:00
ef73178c86 Replace melee speed with melee stun, add knockback upgrade 2024-02-12 21:39:01 -05:00
7660c41a42 Drones avoid walls 2024-02-12 20:52:05 -05:00
ddbe6d5e03 unreal didnt save so once again fixing the ax throw 2024-02-12 16:06:53 -05:00
e008cd8c80 Ax throw returns to player after 7 bounces 2024-02-12 16:01:15 -05:00
45b7a542e5 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-12 13:18:03 -05:00
a490a0acd4 buggy wuggy 2024-02-12 13:17:48 -05:00
1c39109b4b Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-12 12:49:38 -05:00
414e83f553 Footstep events, foot sockets 2024-02-12 12:47:44 -05:00
fd4459af4e Update BP_ThrownProjectile.uasset 2024-02-12 12:47:17 -05:00
b23a58abe8 Tweak Damage Values 2024-02-12 12:09:52 -05:00
4203e8d98a Improve animation blending on fall, land, reel faces movement direction 2024-02-12 00:54:32 -05:00
842b20eebc Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-11 16:01:47 -05:00
f25ec10c06 Reimport grapple, import Tommy's animations 2024-02-11 16:01:09 -05:00
fc18d3f2ea New Axe Swing SFX 2024-02-11 15:49:31 -05:00
9dbb1e8bf3 Drone Turret Functionality 2024-02-10 19:47:15 -05:00
4729752e4c Balance Axe Throw and Shooting Enemies 2024-02-10 18:16:52 -05:00
e534dd114c Lots of VFX and SFX improvements for projectiles 2024-02-10 06:19:16 -05:00
c0e2e4a4b9 Turret Implementation 2024-02-10 02:14:14 -05:00
c38ff7fa39 Advanced Enemy Waves and Ascent Experimental Area
Incredibly important version!
2024-02-09 15:13:40 -05:00
779c6c38db Definitely Not a Secret 2024-02-09 02:54:15 -05:00
e17df5cae2 Enemy Blood Implementation 2024-02-09 00:13:21 -05:00
b068e50f54 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-08 23:46:02 -05:00
007a1c3e5e Implement Axe Trail 2024-02-08 23:45:12 -05:00
d3844dc8ef Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-08 23:34:37 -05:00
e033bf6ce4 Enemy Waves and More Blockout Items
This update is BIG but not finalized!
2024-02-08 23:33:52 -05:00
0a029a0caa Reimport Shelby's animations, tweak attack blending to be more lenient on direction 2024-02-08 19:55:05 -05:00
e3cd048301 Don't Worry About It 2024-02-08 18:59:37 -05:00
e9f690f2b7 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-08 18:59:07 -05:00
6ae9bd280e Update M_AxeTrail.uasset 2024-02-08 18:35:42 -05:00
f6ef97a2dc Axe trail
added more blur to texture
2024-02-08 18:33:53 -05:00
0768aa819e Fix Impact Frames 2024-02-08 17:55:52 -05:00
0bf8cb9063 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-08 17:44:07 -05:00
aa3595ea7f Ascent Map Test and Basic Enemy Wave
I now fully understand the wave system for enemies and so far this is just the bare bones.
2024-02-08 17:43:13 -05:00
4d0dfd6d04 Add XP 2024-02-08 17:27:48 -05:00
360208b933 Can only use abilities after collecting them 2024-02-08 17:12:27 -05:00
59145b22b9 Fix bug with axe where it doesnt actually do anything i just changed 2024-02-08 16:31:46 -05:00
449b75bf23 Improve Axe Throw Return To Player 2024-02-08 16:20:11 -05:00
07e110b3cf Player Hit Wall Effect 2024-02-08 15:50:40 -05:00
af2f906946 New Attack System 2024-02-08 14:42:32 -05:00
449c73c9b3 Show / Hide Axe when thrown 2024-02-08 12:38:51 -05:00
1ca285d823 Add Spark Effect 2024-02-08 12:24:09 -05:00
93d60f39cb Fix various things with the axe throw 2024-02-08 12:05:16 -05:00
58363e1f13 Update skeleton animation notifiers 2024-02-07 17:41:22 -05:00
cc01c36b89 Reduce attack time on axe spin 2024-02-07 17:41:08 -05:00
173a1672c9 Animation improvements 2024-02-07 17:38:42 -05:00
b4d833c955 Reimport shelby anims, prep ThirdPersonCharacter BP for aerial movement/attacks 2024-02-07 17:00:11 -05:00
fc4d26454b Implement most animations 2024-02-07 12:41:15 -05:00
8a2b215edf Import updated animations, fix reverted files, prep abilities 2024-02-07 11:23:12 -05:00
38e158aecc Make can grapple default 2024-02-06 19:25:45 -05:00
e609e4e448 Add Critical Hit When Grapple Attacking 2024-02-06 19:01:16 -05:00
35425c4fd5 Make it so you have to pick up grapple 2024-02-06 18:38:00 -05:00
1cf98a1503 Move Camera over Right Shoulder 2024-02-06 18:16:13 -05:00
97882d2640 Add Exploding Barrels 2024-02-06 18:10:07 -05:00
39d24ffb84 Add Airship and Skill Tree to Save 2024-02-06 17:18:48 -05:00
f2c8e251c4 Revert "Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe"
This reverts commit 1cf0fd484e, reversing
changes made to 8fc34c137d.
2024-02-06 04:13:06 -05:00
1cf0fd484e Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-06 04:11:41 -05:00
8fc34c137d Skill Tree Functionality 2024-02-06 04:10:53 -05:00
d26bd65930 Grapple reel animation, axe spin animation 2024-02-06 02:09:45 -05:00
2f3d3d3fec Add ScreenShake 2024-02-05 18:59:10 -05:00
66ca29bbc9 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-05 18:58:38 -05:00
0e8210eb19 Add Airship Controls 2024-02-05 18:40:29 -05:00
ac5fca6b6d import animations 2024-02-05 18:29:09 -05:00
b64f1afc09 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-02-02 14:44:05 -05:00
1fb446990f bug fixes 2024-02-02 14:43:39 -05:00
f93e4acffc Axe trail done
hopefully it works. not to sure yet
2024-02-02 14:28:52 -05:00
40118c2a89 Improve grapple feel and functionality 2024-02-01 17:22:46 -05:00
d82a2867f1 Make advanced enemy fly to ledges 2024-02-01 16:20:08 -05:00
e0805447f2 Tutorial Level Change
Pipe Parkour Area is far more spacious and offers a reasonable challenge for the player. Items in the boss room are more spaced out.
2024-02-01 00:28:01 -05:00
d3b4cbbbf1 Start work on advanced enemy 2024-01-31 21:25:44 -05:00
b1384a2c7e Improve Wave Spawner Functionality 2024-01-31 19:46:37 -05:00
947c38b123 Add support for spawning agrod enemies 2024-01-31 16:34:19 -05:00
56754230b7 Blood VFX
finished blood effect
2024-01-31 16:03:29 -05:00
5574a39b3b Merge branch 'fix-uproject' 2024-01-30 00:00:47 -05:00
2fbc5b83f8 Tutorial Scaled Up
The tutorial level blockout is not fully polished but everything has been scaled to better accommodate for the assets we have.
2024-01-29 23:47:13 -05:00
73ac95e97c Basic animation implementation 2024-01-29 22:00:50 -05:00
420d527090 Start implementing some animations into character blueprint 2024-01-29 20:44:13 -05:00
fa5101c5e7 Work on animation blueprint 2024-01-29 17:56:51 -05:00
63baf613b8 Import animations, start work on animation blueprint 2024-01-29 15:14:04 -05:00
45227168d8 Tutorial Level Update
Prior to Level Scaling and has some enemies
2024-01-26 16:27:48 -05:00
2a1c30a76e Fix UI Scaling 2024-01-26 01:47:12 -05:00
7531881130 Make Dash Cancel Grapple 2024-01-26 01:32:41 -05:00
0ea575f0f4 Fix Stun State 2024-01-26 01:29:59 -05:00
804743748f Add Turret Sounds 2024-01-26 01:24:33 -05:00
fe78cf1206 Fix more bugs 2024-01-25 19:08:51 -05:00
7780986568 Fix camera bug 2024-01-25 17:19:27 -05:00
37e9b062b6 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-25 17:05:47 -05:00
2a35e0772c Fix Grapple Zoom Bug 2024-01-25 17:05:07 -05:00
e602aa14f1 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-25 16:36:17 -05:00
c9e7acbd85 Added Nav Mesh and Enemies
I experimented a lot but this is currently in a very buggy state.
2024-01-25 16:35:28 -05:00
3b39f1fc58 Add Collectables and remove player noise 2024-01-25 16:16:24 -05:00
69be483d17 Add Sound Effects 2024-01-25 01:12:30 -05:00
07121a1b73 Enemy Improvements 2024-01-25 00:35:00 -05:00
f04990d431 Various Fixed and Changes 2024-01-25 00:20:30 -05:00
6aee6192b9 Update insurrectionist model + textures 2024-01-24 21:25:05 -05:00
5b3ce06ba5 Implement new posters 2024-01-24 20:20:12 -05:00
846bdd6972 Finalize test warehouse combat encounter 2024-01-24 15:03:49 -05:00
b79bff7ada Test level 2024-01-24 13:18:10 -05:00
ddb4a8df1a Bugfixes and test map 2024-01-24 12:45:19 -05:00
d0c33b590d Fix Jump 2024-01-23 19:11:39 -05:00
99bb38118c Improve Intermediate AI 2024-01-23 18:54:31 -05:00
5ec6b58c3b Add Laser 2024-01-23 18:44:04 -05:00
7616afc98f Update Health Overlay 2024-01-23 18:43:51 -05:00
af829564a1 Zoom in camera when grappled on wall 2024-01-23 00:48:54 -05:00
10cc08e321 Bug Fixes 2024-01-22 20:27:02 -05:00
c28bd04919 Add Stun to Enemies 2024-01-22 18:41:58 -05:00
d44ef7e770 Add helmet and axe to player BP 2024-01-22 17:21:30 -05:00
d30ed66d19 Update Cable Material 2024-01-21 18:14:50 -05:00
31bc55502d Reorganize Player BP 2024-01-21 17:24:36 -05:00
b712a9159a Animation for grapple target out of range 2024-01-20 20:12:51 -05:00
d4af461f5a Actions and abilities can't occur at the same time 2024-01-20 16:47:32 -05:00
652308bc7b Fix AI Null access bug 2024-01-20 16:43:48 -05:00
3c6b276684 Collision Tweaks 2024-01-20 16:43:28 -05:00
6df2437816 Add normal map to posters 2024-01-20 14:27:31 -05:00
d857929666 Import base Insurrectionist character rig, character R&D 2024-01-17 22:03:47 -05:00
6281220fbd Medium enemy can now aim up and down 2024-01-16 18:59:55 -05:00
7105c1b411 Medium enemy improvements 2024-01-16 18:14:20 -05:00
810e24a5f8 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-16 16:56:36 -05:00
744f56b877 Add Axe 2024-01-16 16:55:07 -05:00
e57662398f Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-16 16:26:43 -05:00
c23b90b2a5 Add breakable glass 2024-01-16 16:21:47 -05:00
dd2fb99659 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-16 16:18:34 -05:00
3283e46061 Dash Effect
changed name of the Niagara asset for the Dash Effect to Dash_Effect
2024-01-16 16:17:34 -05:00
5fbcd57830 Update Title Screen 2024-01-16 14:49:43 -05:00
2565ceefc7 Fix player hopping along ground when grappling 2024-01-16 14:01:25 -05:00
fdedfd1fb1 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-15 16:37:42 -05:00
077e7e9ecc Pulled from Origin 2024-01-15 16:37:15 -05:00
8971ed85d5 Tutorial Final Whitebox
All interior assets have been added to the level besides anything purely cosmetic.
2024-01-15 16:26:22 -05:00
7ea9f85147 Test Tunnel Creator 2024-01-15 15:34:55 -05:00
1d817342e8 Update Doors to Bunker Assets 2024-01-15 15:21:52 -05:00
d19f7a7458 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-15 14:06:44 -05:00
19f32b073e Add bunker asset pack 2024-01-15 13:51:41 -05:00
34bad54e6a Create NS_SkeletalMesh.uasset
Added dash effect
2024-01-13 17:28:37 -05:00
efa0942bd0 Add Skill Tree 2024-01-11 19:28:54 -05:00
5297b63e8a Fix Enemies attacking only once 2024-01-10 18:58:56 -05:00
909067b791 Fix Event BP 2024-01-10 18:53:40 -05:00
a22969796f Add Electric Grapple and update icons 2024-01-09 18:30:26 -05:00
cbf9957e18 Update Camera Collision 2024-01-09 14:11:41 -05:00
0f24f69b26 Change Default Maps 2024-01-09 13:10:24 -05:00
007da6b316 Update Level Select To Data Table 2024-01-08 18:30:58 -05:00
1b27c9ae00 Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/hook-line-axe 2024-01-08 17:26:32 -05:00
0c4771f39b Organizational Changes 2024-01-08 17:25:54 -05:00
443d17d2d4 Add birds poster 2024-01-06 13:15:41 -05:00
f8bbaf8d90 Import Patrick's level 2024-01-06 13:15:15 -05:00
9956ac032e Add Story Terminals 2023-12-11 04:27:11 -05:00
0612311302 Grapple Onto Moving Surfaces 2023-12-10 07:31:27 -05:00
cfddcb4d8a Reorganize Assets 2023-12-07 15:40:11 -05:00
bf8a9b7a88 Remove Debug Items 2023-12-03 17:47:29 -05:00
e9639dea86 Added poster blueprint and some poster textures 2023-11-29 16:09:23 -05:00
d6fdb9e7ef Add Title Menu 2023-11-28 21:24:36 -05:00
0c1c100536 clean up material graphs 2023-11-28 12:50:53 -05:00
55b3b1645d Fix folding platform bug 2023-11-27 17:54:57 -05:00
36a5169b7d Reorganize Files 2023-11-26 22:20:19 -05:00
139324438e Add Laser Walls and Electric Fences to Save 2023-11-26 22:00:04 -05:00
e752dd294f Fix Health Overlay 2023-11-26 21:28:11 -05:00
e5017fb46f Add Support for chained events 2023-11-26 21:23:17 -05:00
3f0b1f54af Expand on event system 2023-11-26 19:32:41 -05:00
6f9d9e92a2 Add Event System 2023-11-26 17:09:50 -05:00
bf1afbde02 Add Enemy Spawning Functionality 2023-11-25 01:21:59 -05:00
acec57ed3b Update Laser Wall 2023-11-24 22:51:48 -05:00
6dc2a95aa2 Disable Input While Attacking 2023-11-24 20:46:04 -05:00
7de9fd140f Make melee more responsive 2023-11-24 20:34:40 -05:00
224f1a9b0f Fix Stairs Collision 2023-11-24 20:02:50 -05:00
d1d8e84404 Fix Options Menu Save 2023-11-24 19:26:07 -05:00
7615885dfd Update save conventions to be per level 2023-11-24 16:55:13 -05:00
99364163e9 Add Dash Icon to UI 2023-11-24 16:31:20 -05:00
b276d3219d Update Laser Damage System 2023-11-24 15:36:23 -05:00
037f7553f6 Add Electric Field 2023-11-24 15:14:39 -05:00
829d5496c2 Make Dash Add to Velocity rather than replace 2023-11-24 13:29:32 -05:00
f95b861337 Add Save Icon 2023-11-24 13:16:16 -05:00
e1295c3243 Add Elevator and MultiUse Interacables 2023-11-24 13:05:33 -05:00
4cdcaa6dce Update Level 2023-11-24 01:25:30 -05:00
5a518bb867 Add Level Design Mechanics 2023-11-24 01:25:20 -05:00
c04048d843 Update Pickup Mechanics 2023-11-24 01:24:59 -05:00
5a3d3ab3b4 Add Laser Wall 2023-11-24 01:24:48 -05:00
0642441835 Update Enemy Behvior 2023-11-24 01:24:22 -05:00
b093b3b70c Black Fadeout for levels 2023-11-24 01:24:04 -05:00
82703e6aea Update Interaction UI 2023-11-24 01:23:43 -05:00
d5b02049b6 Add Save Game 2023-11-24 01:23:27 -05:00
8a051e7b22 Test Map 2023-11-23 00:40:13 -05:00
f31a544b2e Add Interactables and Pickups 2023-11-23 00:40:00 -05:00
029a90fba3 Update Dithering 2023-11-23 00:39:28 -05:00
1c58f8203e Add In Range Icon 2023-11-23 00:38:47 -05:00
f4fcc99fa8 Clean Up Code 2023-11-23 00:38:18 -05:00
f47fc3c7ae Add Pixel Screen Shader 2023-11-22 11:43:40 -05:00
da16544751 Remove Unused Materials 2023-11-22 11:43:30 -05:00
94242cb77b Add Pause Menu 2023-11-22 00:31:01 -05:00
de2f9789de Add Level Design Tools 2023-11-20 15:14:42 -05:00
7f7e1f5e15 Add health regen 2023-11-20 12:38:57 -05:00
7cc2eee03d Add health overlay 2023-11-20 12:17:19 -05:00
691b303ed4 Add Skybox 2023-11-20 12:17:03 -05:00
414b32c05c Basic Enemy Tweaks 2023-11-20 11:38:51 -05:00
5130b13b6b Add target lock to melee combat 2023-11-19 23:24:18 -05:00
b9d0e380a5 Fix various bugs 2023-11-18 18:29:56 -05:00
4b6fc7479d Enemy Tweaks 2023-11-12 13:33:17 -05:00
edfa2fec27 Various Bug Fixes and Organization Tweaks 2023-11-06 23:32:59 -05:00
11e3491ef2 Convert uasset files to LFS (oops) 2023-11-06 18:53:00 -05:00
3f374715e3 Update Enemies To Behvior Tree 2023-11-05 17:32:05 -05:00
809a66d305 Attempt to clean up extraneous data 2023-10-30 12:00:07 -04:00