Commit Graph

129 Commits

Author SHA1 Message Date
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
839e955464 Merge branch 'feature/world.create-demo-scene' into dev
# Conflicts:
#	Assets/Scenes/WorldDemo.unity
2026-01-01 21:05:22 -05:00
Chris
2f5329d1f3 feat: neighborhoodtest overhaul
with new asset and arrangement
2026-01-01 21:01:02 -05:00
Chris
34a571bcf4 feat: changes to 1C 2026-01-01 00:49:04 -05:00
Chris
7bfb2b670c feat: updated platform 1C's layout 2025-12-31 19:01:50 -05:00
Chris
5a9e2f64f3 feat: started re-animating character (again...) 2025-12-31 17:53:30 -05:00
Desmond Cheeseboro
f510699655 feat: added structures to upper platform
This ones for you!! - Seraphine
2025-12-30 00:18:47 -05:00
Chris
338ff3bed4 feat: more attempted fixes for models and animations 2025-12-29 12:54:07 -05:00
Chris
3fb63c4ba1 feat: general updates to worlddemo scene i think 2025-12-17 16:10:18 -05:00
Chris
00992b07c3 feat: various new prefabs for building, changes to offsets for prefabs, and updated buildings 2025-12-17 16:08:30 -05:00
Chris
c3d880fb1d feat: more layout changes, namely behind street 2025-12-13 18:40:56 -05:00
Chris
9e90b11cc6 feat: turned a lot of items into prefabs, tweaked various points of the scene 2025-12-13 16:53:21 -05:00
Chris
08f586c69f feat: more layout changes to demo subscenes 2025-12-13 16:22:04 -05:00
Chris
57975ed854 maint: moved rest of platforms into subscenes 2025-12-13 16:21:26 -05:00
Chris
2820404b9c maint: platforms 1A, 1B, and 1C all turned into subscenes 2025-12-12 14:31:53 -05:00
Chris
026b956642 feat: grouped all world demo levels into platforms and levels 2025-12-12 14:20:58 -05:00
Chris
0899cfa19e maint: cleaned up scene dependencies, mainly making all scenes use prefabs ($15y) 2025-12-09 15:44:11 -05:00
Chris
e3e505cf4a feat: added a small area to topmost platform 2025-12-07 17:15:41 -05:00
Chris
da2372d77d feat: minor attack value changes 2025-12-06 18:30:08 -05:00
Chris
1d3bbd408a change: world layout changes- added tower, some other small changes 2025-12-05 13:27:29 -05:00
Chris
20c8b2b8c3 change: scene cleanup (hid exclamation mark) 2025-12-03 15:39:11 -05:00
Chris
22fec34038 change: applied the neighborhoodtest skybox to the world demo 2025-12-03 14:57:57 -05:00
Chris
76473d2c6a change: updated world demo with new volume profile & a few buildings for testing 2025-12-03 01:53:42 -05:00
Chris
8919a69e50 change: changed how combat state mangement works by adding circling movement, target sight loss, and attach chance to combat subfsm 2025-12-02 17:16:30 -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
8b9d2c21ce change: added more spawn zones 2025-11-22 14:16:11 -05:00
Chris
4cf9054e88 change: more enemy state management changes 2025-11-11 12:34:27 -05:00
Chris
fb515ed1cf feat: enemies spawn in spawn zones and wander on a graph 2025-10-24 13:03:16 -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
a83ab1156a maint: clean-up of some combat related classes and methods for clarity 2025-10-23 13:06:51 -04:00
Chris
0bb10a8f46 added: full logic and ability for downing and picking up allies 2025-10-20 16:36:23 -04:00
Chris
507a735253 change: scene and prefab changes related to recent changes 2025-10-08 22:57:59 -04:00
Chris
878ce97fe7 change: updated scene, some enemy movement value tweaks 2025-10-04 16:59:23 -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
1217ae8788 change: unimportant changes to combat test scene 2025-10-04 01:16:09 -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
c6917f6999 added: maru model, animations, and basic swinging 2025-10-01 14:38:37 -04:00
Chris
d079e78068 Merge branch 'refs/heads/feature/player-inventory' into dev
# Conflicts:
#	Assets/DefaultNetworkPrefabs.asset
2025-10-01 14:34:02 -04:00
Chris
8f3ea1a491 maint: various clean up, movement tweaks, and smoothing fixes 2025-09-29 21:10:22 -04:00
Chris
535aa1797d maint: testing ui is now a prefab 2025-09-26 16:18:18 -04:00
Chris
8fdadf9ddd change: scene template and organization 2025-09-26 16:03:20 -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
a0313798fd added: loot containers 2025-09-09 17:58:52 -04:00
Chris
7a0499f36a added: item pickups with online persistency 2025-09-08 16:40:13 -04:00