Commit Graph

100 Commits

Author SHA1 Message Date
Chris
49862b5de1 feat: add shuriken weapon
add shuriken weapon model, 3 animations
change move speed triggers animation
2026-01-09 01:14:14 -05:00
Chris
96c43c6369 feat: better state handling for combat
melee weapon now spawns in hand
melee substate cleaned up to work with above
added new playerinventory script on player
added new playeranimation script on player
changed inventory to IInventory
animations tweaked to avoid a lockout
2026-01-08 01:22:45 -05:00
Chris
2e28fe17cd fix: player now properly responds to root motion
also contains changes to the animation controller for all the currently made animations, events for the singular attack animation, corresponding methods, and graph changes to utilize them
2026-01-07 01:10:59 -05:00
Chris
78573d9f5d Merge branch 'dev' into feature/player.basic-combat-pt2 2026-01-06 22:46:44 -05:00
Chris
7942725e09 maint: character model/animations working
slight changes
2026-01-06 17:53:38 -05:00
Chris
026a177015 fix: animation/rotations model work
not yet fully fixed but making progress. new animations added.
2026-01-06 16:30:52 -05:00
Chris
63669fd02a feat: updated model
model now imports into unity correctly, has proper root motion, and correctly generates an avatar
2026-01-05 15:49:25 -05:00
Chris
5a9e2f64f3 feat: started re-animating character (again...) 2025-12-31 17:53:30 -05:00
Chris
338ff3bed4 feat: more attempted fixes for models and animations 2025-12-29 12:54:07 -05:00
Chris
58f1bc66bb maint: moved CharacterModel.fbx to folder 2025-12-19 17:21:27 -05:00
Chris
cb2ab4344a maint: renamed player prefab to PlayerOld.prefab 2025-12-19 17:20:32 -05:00
Chris
9758584f73 feat: new player model updated with 2 combat animations, imported into unity and created animation controller 2025-12-18 18:45:23 -05:00
Chris
da2372d77d feat: minor attack value changes 2025-12-06 18:30:08 -05:00
Chris
557979f470 feat: updated attack graphs to use new attacking tasks, and overall finished a "0.1" version for enemy attacks- they now work. 2025-12-05 20:40:47 -05:00
Chris
f033ab0fe9 maint: prefab script changing resulting from removal of dragged units in editor 2025-12-05 20:39:33 -05:00
Chris
a631eb2105 feat: unity automatically added values for head/neck rotating to the player 2025-12-05 18:26:10 -05:00
Chris
fd49d7e3a3 change: moved player to own player 2025-12-05 18:24:41 -05:00
Chris
de1c2bfb49 changed: turned off gizmo for combat/interaction observers 2025-12-03 01:49:54 -05:00
Chris
ed4298b1da feat: added the early parts of a basic attack system for enemies 2025-11-23 14:10:43 -05:00
Chris
e7b72520c0 fix: readded playerfacingdirection temporarily to UnitFacingDirection.cs to resolve NodeCanvas issue with serialization on PlayerFSMs 2025-11-22 14:15:15 -05:00
Chris
5ce787251d maint: enemy asset folder restructuring, animations added, animators added, created enemy spawners 2025-10-23 20:37:35 -04:00
Chris
a83ab1156a maint: clean-up of some combat related classes and methods for clarity 2025-10-23 13:06:51 -04:00
Chris
bd97b3eeb5 added: player dies if not picked up in time 2025-10-20 21:23:07 -04:00
Chris
0bb10a8f46 added: full logic and ability for downing and picking up allies 2025-10-20 16:36:23 -04:00
Chris
6d57b7bb56 added: new maru model and downed animation 2025-10-20 13:47:16 -04:00
Chris
507a735253 change: scene and prefab changes related to recent changes 2025-10-08 22:57:59 -04:00
Chris
b60f8e8619 improv: working and ready testgohardmelee 2025-10-04 16:58:38 -04:00
Chris
1240afb051 added: go hard state and a melee combo for it 2025-10-04 15:40:13 -04:00
Chris
d033b655cc added: more testing animation work for gohard 2025-10-04 14:11:49 -04:00
Chris
fa48ba1ae0 added: testenemy for combat and enemy ai 2025-10-04 13:48:04 -04:00
Chris
7068d39b5b new: damage can now be dealt to units using DamageSources 2025-10-03 20:44:48 -04:00
Chris
06cfd582c8 improv: more completed melee, including support for dragging enemies along melee (rudimentary) 2025-10-03 19:42:08 -04:00
Chris
d787353706 added: initial combat mechanics 2025-10-03 13:29:46 -04:00
Chris
f0c7b8f863 change: adding stats to combat movement 2025-10-01 14:38:54 -04:00
Chris
c6917f6999 added: maru model, animations, and basic swinging 2025-10-01 14:38:37 -04:00
Chris
8f3ea1a491 maint: various clean up, movement tweaks, and smoothing fixes 2025-09-29 21:10:22 -04:00
Chris
6157d6421f fix: removed all unremoved tasks 2025-09-26 16:03:40 -04:00
Chris
4569cea664 change: finished and cleaned all settings changes, code commented, smoothing and easing are now exponential 2025-09-26 14:09:22 -04:00
Chris
bd2903a0b2 change: fixing of many issues in handler, deprecation/deletion of variables, cleanup of UnitMovementHandler, cleaning up of inspector 2025-09-23 14:14:47 -04:00
Chris
b21adf93e2 change: more alterations to the new movement and settingvalue system 2025-09-22 14:24:50 -04:00
Chris
d4231d4f38 change: gravity settings functions and deprecation of jump/gravity split 2025-09-21 13:53:49 -04:00
Chris
0fbef6aeee change: more alterations to movement, settingvalues, valuegroup, etc. 2025-09-18 19:58:37 -04:00
Chris
aad8b78c22 change: all movement separated into invidividual tasks, a lot of shuffling value groups and related stuff around 2025-09-16 17:07:20 -04:00
Chris
7a0499f36a added: item pickups with online persistency 2025-09-08 16:40:13 -04:00
Chris
a13f10564b feat: basic online working with relay 2025-09-03 19:37:27 -04:00
Chris
18cebf6f9c change: input dialogue on player spawn 2025-09-03 16:59:54 -04:00
Chris
40badd1f95 fix: some neighborhood scene fixes and fsm fixexs 2025-09-03 00:59:39 -04:00
Chris
39376934a5 fix: grapple camera null reference 2025-08-31 17:20:18 -04:00
Chris
5924479307 maint: created new scene for demoing. cleaned up errors. 2025-08-31 15:55:15 -04:00
Chris
170a08355c change: prefabbing some scene items 2025-08-31 13:36:28 -04:00