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
105da8850a
maint: hotreload updated to 1.13.7
2026-01-06 22:42:15 -05:00
Chris
796dbca5d8
maint: updated odin inspector to 4.0.1.2
2026-01-06 18:14:07 -05:00
Chris
4c34207707
maint: base unity updated 6000.3.2
2026-01-06 18:06:14 -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
a74fe38788
feat: model updates
...
irrelevant changes tbh
2026-01-05 16:23:16 -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
b8fcf63007
feat: model/rig updates
...
rig changes, with IK joints, etc. still needs pole targets for IK
2026-01-04 17:26:01 -05:00
Chris
dfff4e6f1d
maint: settings files cleanup
2026-01-01 21:11:16 -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
fae3e300d8
feat: glass material added
2026-01-01 21:02:28 -05:00
Chris
2f5329d1f3
feat: neighborhoodtest overhaul
...
with new asset and arrangement
2026-01-01 21:01:02 -05:00
Chris
bdc9b4dcd9
feat: updated testing prefabs
...
33 new objects, alongside some changes to lighting sizing and positioning for some existing models
2026-01-01 21:00:24 -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
9cad319f09
maint: changed scale of container
2026-01-01 00:49:39 -05:00
Chris
34a571bcf4
feat: changes to 1C
2026-01-01 00:49:04 -05:00
Chris
464652c3e6
feat: changed scale of all decorative structures/buildings
2026-01-01 00:47:35 -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
Chris
a631d82bb8
feat: more attempted fixes for models and animations
2025-12-31 12:50:35 -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
d5023993d7
maint: added toony colors pro 2 v2.9.20
2025-12-29 13:21:00 -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
6fe90c6f8e
maint: some blender file minor/nothing changes
2025-12-19 14:05:16 -05:00
Chris
96d116176f
feat: cleaned up animation data for new model before importing into unity
2025-12-19 14:00:20 -05:00
Chris
a145af8378
feat: new animations in progress, for 2nd attack and idle/running with weapon
2025-12-19 10:24:57 -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
cdb74e5c99
feat: added test sword model
2025-12-18 18:44:11 -05:00
Chris
9dd1faf9ba
feat: added new character model for player with running and idle animation finished. includes some empty/broken files in this commit from a failed recovery attempt
2025-12-17 16:21:26 -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
32990f04fe
maint: moved children of lbend and adlarge to fix offset
2025-12-13 18:40:27 -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
4e0f4b8897
feat: added new structures; bushes, l-bends caffolding, posterboard, overheadlight, wall ad large, wall ad board
2025-12-13 16:52:49 -05:00
Chris
4dc3251b7d
feat: giant lantern visual change
2025-12-13 16:34:12 -05:00
Chris
d011ea2c0b
maint: default material palette updated (apparently?)
2025-12-13 16:22:59 -05:00
Chris
8e163ec879
feat: more visually updated building prefabs
2025-12-13 16:22:36 -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
f51476f58d
feat: red light placeholder material added
2025-12-13 16:19:50 -05:00
Chris
7b740e0e7b
feat: added two antenna structral pieces
2025-12-13 16:19:18 -05:00
Chris
2820404b9c
maint: platforms 1A, 1B, and 1C all turned into subscenes
2025-12-12 14:31:53 -05:00
