Commit Graph

216 Commits

Author SHA1 Message Date
Chris
cfc0096902 feat: add test shurken 2026-01-10 21:03:49 -05:00
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
839e955464 Merge branch 'feature/world.create-demo-scene' into dev
# Conflicts:
#	Assets/Scenes/WorldDemo.unity
2026-01-01 21:05:22 -05:00
Chris
0a1a6a6c65 feat: new rotatemovement script 2026-01-01 20:59:32 -05:00
Chris
5e770613bc feat: updated sway
now contains sway children that swing alongside the root object
2026-01-01 20:59:04 -05:00
Chris
338ff3bed4 feat: more attempted fixes for models and animations 2025-12-29 12:54:07 -05:00
Chris
a971f6f536 maint: moved environmentobserver to its own file 2025-12-09 15:19:26 -05:00
Chris
312d4da6b6 maint: ILockOnTarget moved to own file 2025-12-09 15:18:42 -05:00
Chris
26ceba2812 fix: non player units no longer rotate with camera 2025-12-06 18:29:42 -05:00
Chris
5f7179c861 fix: dragging units can no longer go haywire and yeet units off the map 2025-12-06 18:29:20 -05:00
Chris
7f3bfcffe7 fix: players now take damage offline 2025-12-05 20:37:46 -05:00
Chris
a0ed17666d feat: rebuilt dragging mechanic slightly, and it's now more agnostic to collider type 2025-12-05 20:37:06 -05:00
Chris
005d348a5c maint: renamed "ignore layers" to "layer mask" to imply additive layer masking 2025-12-05 18:38:38 -05:00
Chris
3525f5fc47 fixed: non-smoothed values now have their values applied properly (instantly, when set) 2025-12-03 17:54:45 -05:00
Chris
14ea2c64dc change: added repath timer to "new path" task 2025-12-03 17:29:45 -05:00
Chris
b19421adfc fix: target property is now used for setting a new pathfinding path. enemies do not stand still in combat. 2025-12-03 15:52:23 -05:00
Chris
4943c02125 fix: enemies now do not instantly enter combat after entering spawner ranger 2025-12-03 15:38:29 -05:00
Chris
cf70287797 maint: turned off the head moving for now 2025-12-02 17:57:18 -05:00
Chris
4bd307fba8 maint: renamed isPaused to fix overlap with nodecanvas variable 2025-12-02 17:57:00 -05:00
Chris
e49909580c changed: more tasks and states for changing pathfinding 2025-12-02 17:56:38 -05:00
Chris
30509b3714 added: new task script for allowing units to circle a target. Added to agent. 2025-12-02 17:36:55 -05:00
Chris
ea048be111 change: enemy combat/detection state now handled by the spawner 2025-11-22 14:15:58 -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
d75946de65 fix: changes to FSM state string to better account for local players 2025-11-10 16:32:23 -05:00
Chris
88803c9b86 added: enemy target acquisition, better pathfinding, moved combat reference to unit 2025-11-10 16:07:51 -05:00
Chris
68fe0e3413 maint: moved movement reference to unit 2025-11-10 16:07:12 -05:00
Chris
fa810bf970 added: enemy target acquisition, better pathfinding, moved combat reference to unit 2025-11-10 16:06:21 -05:00
Chris
a6182cd066 added: some headtracking 2025-11-10 15:18:48 -05:00
Chris
fb515ed1cf feat: enemies spawn in spawn zones and wander on a graph 2025-10-24 13:03:16 -04:00
Chris
f0a99253e5 maint: reimport of astar and aline, removal of asmdef temporarily 2025-10-24 10:56:28 -04:00
Chris
2203b0323b refactor: PlayerFacingDirection.cs renamed to UnitFacingDirection.cs 2025-10-23 21:56:58 -04:00
Chris
fd06b6c45b added: EnemyCombat.cs with reference to IUnitTargetProvider.UnitTarget 2025-10-23 21:55:44 -04:00
Chris
f1dee5c0e4 improv: UnitMovementHandler.cs uses IUnitDirectionProvider.cs for direction instead of input direction directly 2025-10-23 21:55:14 -04:00
Chris
958c57bdc0 improv: added IUnitDirectionProvider.cs for providing direction to UnitMovementHandler instead of PlayerControls 2025-10-23 21:49:14 -04:00
Chris
f4714db41b improv: UnitMovementHandler.cs now uses IUnitTargetProvider 2025-10-23 21:48:36 -04:00
Chris
129a5226c5 improv: added reference to movement for UnitComponent.cs 2025-10-23 21:48:05 -04:00
Chris
392f24a916 improv: added IUnitDirectionProvider.cs interface to replace directly accessing LockOnManager as part of generification of UnitMovementHandler.cs 2025-10-23 21:44:31 -04:00
Chris
0cb88b8fc6 fix: singleton operation for LockOnManager 2025-10-23 21:33:28 -04:00
Chris
2c88685990 maint: added astar to core asmdef 2025-10-23 20:52:56 -04:00
Chris
5ce787251d maint: enemy asset folder restructuring, animations added, animators added, created enemy spawners 2025-10-23 20:37:35 -04:00
Chris
fee7b3701e added: World, Zone and ZoneEvent classes for world systems 2025-10-23 18:09:46 -04:00
Chris
47b4530dd0 maint: cleaned up some debug.log lines to fight log clutter 2025-10-23 18:08:06 -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
eb1622d4ed added: revive ui bar 2025-10-22 11:24:58 -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
7628541758 added: get direction in local space from units 2025-10-20 13:47:49 -04:00