Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Animation system #1440

Open
wants to merge 405 commits into
base: develop
Choose a base branch
from
Open

[WIP] Animation system #1440

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
405 commits
Select commit Hold shift + click to select a range
3b32cf6
smooth grab
stilnat Apr 26, 2024
e0fd4ba
more precise grabbing
stilnat Apr 26, 2024
421265a
Adding another pose
Dennis-Nesterenko Apr 28, 2024
d5fb07f
Update HumanStancesDef.fbx
Dennis-Nesterenko Apr 28, 2024
af33bbb
Idk why my changes didnt work until now
Dennis-Nesterenko Apr 28, 2024
3dc2045
Adding 2handed weapon walk locomotion
Dennis-Nesterenko Jun 4, 2024
e002838
Fixing stuff
Dennis-Nesterenko Jun 4, 2024
18d2db2
Adding 2handed weapon walk cycles
Dennis-Nesterenko Jun 4, 2024
95ad12d
Merge branch 'Animations' of https://github.com/Dennis-Nesterenko/SS3…
Dennis-Nesterenko Jun 4, 2024
9755478
Adding animations
Dennis-Nesterenko Jun 4, 2024
28a5696
Merge remote-tracking branch 'upstream/develop' into Animations
Dennis-Nesterenko Jun 4, 2024
6007020
Revert "Merge remote-tracking branch 'upstream/develop' into Animations"
Dennis-Nesterenko Jun 4, 2024
af6ec73
Merge branch 'develop' into Animations
stilnat Aug 30, 2024
f43d9f2
fix errors from merge
stilnat Aug 31, 2024
256f67a
place physic in tick from time manager
stilnat Aug 31, 2024
13cbc4e
camera connect and network human start
stilnat Aug 31, 2024
88e3237
fix both placing and picking up
stilnat Sep 1, 2024
1da273a
network movement
stilnat Sep 1, 2024
f894245
add networkObjects to items with network transform
stilnat Sep 1, 2024
ef0d001
some build settings
stilnat Sep 1, 2024
ff7df40
network pick up and place
stilnat Sep 1, 2024
797a2db
network animation and fix hand reaching at start
stilnat Sep 1, 2024
88cef8e
sync intent
stilnat Sep 1, 2024
c773ec8
sync hand change
stilnat Sep 2, 2024
e343e37
syncing grabbing
stilnat Sep 2, 2024
1c241a9
sync sitting
stilnat Sep 2, 2024
a505dd0
Merge branch 'develop' into Animations
stilnat Sep 9, 2024
3716d72
Merge branch 'develop' into networking-animations
stilnat Sep 12, 2024
a5bfa6c
modify aim to network it
stilnat Sep 12, 2024
4f87ef9
remove auto start
stilnat Sep 12, 2024
ee7a2ed
fix application meta
stilnat Sep 12, 2024
7c50082
add network objects to stuff
stilnat Sep 12, 2024
21f2ee2
simplify animation scene
stilnat Sep 12, 2024
2098d2a
Merge branch 'develop' into networking-animations
stilnat Sep 13, 2024
289e8d2
adding a few objects back
stilnat Sep 13, 2024
1e94d91
networking aim
stilnat Sep 13, 2024
182d20d
add chair
stilnat Sep 13, 2024
4798dc4
sync client change hand
stilnat Sep 13, 2024
2f5f6b5
kinda throw sync
stilnat Sep 16, 2024
214f3af
Merge branch 'networking-animations' into Animations
stilnat Sep 16, 2024
4edee4e
Merge pull request #24 from Dennis-Nesterenko/Animations
stilnat Sep 16, 2024
67940ba
adding kinda working strafing when aiming
stilnat Sep 16, 2024
8b64d68
small fix
stilnat Sep 16, 2024
105b2e9
port pickup scripts
stilnat Sep 16, 2024
302b68e
put dummyhuman in main game
stilnat Sep 21, 2024
a2b23b9
updating movement controllers
stilnat Sep 22, 2024
b2e75bd
make hand use pickup animations
stilnat Sep 22, 2024
04cd91f
set up uberhuman
stilnat Sep 22, 2024
07f7a59
readd avatar
stilnat Sep 22, 2024
b629c39
add holdable on toolbox
stilnat Sep 22, 2024
f13f42b
try setting clothes container back on uberhuman
stilnat Sep 22, 2024
389ef1c
add placing animations
stilnat Sep 23, 2024
22849e8
fix get component holdable in items
stilnat Sep 23, 2024
cb2af12
comment intent button for now
stilnat Sep 23, 2024
d80cf23
add holdable on jumpsuit
stilnat Sep 23, 2024
8570fd1
simplify jumpsuit and clothe displayer
stilnat Sep 23, 2024
601b95a
aim to throw
stilnat Sep 24, 2024
d54f1f5
fix throw
stilnat Sep 24, 2024
b6183dc
allow hold harm to work
stilnat Sep 24, 2024
8af1adc
make chair sittable
stilnat Sep 26, 2024
b47eed5
improve holdable editor and make screwdriver holdable
stilnat Sep 26, 2024
a8fb64d
small comment
stilnat Sep 27, 2024
c49c9be
rudimentary tool interaction
stilnat Sep 27, 2024
9a8b2ce
set aiming weight to zero
stilnat Sep 27, 2024
ad063f1
update to last lts
stilnat Sep 27, 2024
ecdf241
add chair to testStation
stilnat Sep 27, 2024
a45f08c
fix network pickup
stilnat Sep 27, 2024
48fac99
fix place animation
stilnat Sep 27, 2024
144bab7
add time command
stilnat Sep 28, 2024
d388d54
start with help intent
stilnat Sep 28, 2024
87605c1
attempt at throw better network
stilnat Sep 28, 2024
46cc74a
remove false clothes
stilnat Sep 28, 2024
bb000f0
add human fbx with new rig and associated assets
stilnat Sep 28, 2024
7d24b12
make boombox holdable
stilnat Sep 30, 2024
42ab713
add a bunch of containers on human
stilnat Sep 30, 2024
0d90357
remove can pick up
stilnat Sep 30, 2024
1e73686
allow cancel pick up and integrate better with interaction system
stilnat Oct 1, 2024
1ecbf29
uberhuman small update
stilnat Oct 1, 2024
c84d922
build settings changes for including good scenes
stilnat Oct 1, 2024
d737411
remove humanAllAssets
stilnat Oct 1, 2024
7778777
update time to pick up with values from interaction
stilnat Oct 1, 2024
8e9c722
Merge branch 'develop' into transfer-animation-to-real-game
stilnat Oct 1, 2024
75c7202
complete constructor
stilnat Oct 1, 2024
24568b3
faster pickup and place
stilnat Oct 4, 2024
de7d563
place interaction integration
stilnat Oct 4, 2024
17fc7de
stop looking when cancelling place animation
stilnat Oct 4, 2024
bb7a612
improve hold
stilnat Oct 4, 2024
219c7ec
rename drop to place interaction
stilnat Oct 4, 2024
586c017
Add drop interaction
stilnat Oct 4, 2024
f2ff0ed
stop holding
stilnat Oct 6, 2024
8a34f72
add instant pick up
stilnat Oct 6, 2024
55b5447
add m4 to items
stilnat Oct 7, 2024
92807eb
fix two hand pickup
stilnat Oct 7, 2024
9c1770a
fix remove item from double handed hold
stilnat Oct 7, 2024
118f465
remove useless getitem method in hands
stilnat Oct 7, 2024
0490bb7
make shoes holdable
stilnat Oct 7, 2024
cf3bd22
fix mesh jumpsuit
stilnat Oct 7, 2024
ca6e6e3
integrate throw as interaction
stilnat Oct 7, 2024
1a8946e
integrate better interact animations
stilnat Oct 7, 2024
e24c60d
fix collider issue and wrong cancel
stilnat Oct 8, 2024
0edc9e3
make drop work on client
stilnat Oct 8, 2024
87f9837
fix local scale on human of some objects
stilnat Oct 8, 2024
ff6c0c4
fix item not in client hands
stilnat Oct 8, 2024
5125f9c
make throw interaction priority when available
stilnat Oct 8, 2024
0a07b43
make throw interaction priority part 2
stilnat Oct 8, 2024
af66407
fix client throw (but item does not follow hand anymore)
stilnat Oct 8, 2024
eca89b0
import gun aiming with m4 for host
stilnat Oct 8, 2024
2cebb00
add aim gun control
stilnat Oct 9, 2024
f2fbcc0
ragdoll kinda work
stilnat Oct 12, 2024
5655df3
integrate gun aim betetr
stilnat Oct 12, 2024
a618308
basic grabbing ragdoll
stilnat Oct 12, 2024
f4857c2
kinda working grab (releasing not really)
stilnat Oct 12, 2024
bc856b0
bit better dragging ragdoll
stilnat Oct 12, 2024
e96ed1c
simple changes
stilnat Oct 12, 2024
dbaa894
make grabbing an interaction
stilnat Oct 13, 2024
2c87a43
remove unused animations
stilnat Oct 13, 2024
8e92abd
add some doc
stilnat Oct 13, 2024
d8a7067
strongly simplify hand drop and pickup
stilnat Oct 13, 2024
b30a0b6
import strafing animation
stilnat Oct 13, 2024
061a8b8
add hand gizmo for holds
stilnat Oct 15, 2024
be250ab
remove useless anims
stilnat Oct 15, 2024
80715cb
add strafing when aiming with gun
stilnat Oct 15, 2024
faee569
adjust gun holds
stilnat Oct 15, 2024
084b493
add finger pose types
stilnat Oct 15, 2024
70b45ce
make defining holdable more efficient
stilnat Oct 15, 2024
5ca0d3d
fix boombox hold
stilnat Oct 16, 2024
dcb98ac
add forgot iholdprovider changes
stilnat Oct 16, 2024
d0645bc
make crafting use interaction point instead of transform center
stilnat Oct 16, 2024
f9ab810
simplify interactions and add support for custom target points
stilnat Oct 17, 2024
93737b3
fix null exception
stilnat Oct 17, 2024
f87a477
add tool procedural animations
stilnat Oct 17, 2024
c3458ed
simplify items and container display
stilnat Oct 17, 2024
eb9f9fa
fix crouch when not moving
stilnat Oct 17, 2024
cf265f8
speed up a bit screwdriver animation
stilnat Oct 17, 2024
96ca6c5
update hold rotation toolbox
stilnat Oct 17, 2024
7b31dcb
fix toolbox pivot
stilnat Oct 17, 2024
673869d
fix toolbox position in hold
stilnat Oct 17, 2024
3784fe0
fix m4 world asset
stilnat Oct 17, 2024
1d85783
fix not implented exception
stilnat Oct 17, 2024
a614100
put responsability of checking custom points in interactions
stilnat Oct 17, 2024
2d97def
fix throwing def trajectory
stilnat Oct 17, 2024
93f010d
make all gradual interactions delayed ones
stilnat Oct 17, 2024
e2f354b
add interact with hand procedural animation
stilnat Oct 18, 2024
c8d0061
fix not implemented exception
stilnat Oct 18, 2024
00cfae0
make toggle interactive
stilnat Oct 18, 2024
099d1aa
add interaction points provider
stilnat Oct 18, 2024
b89ff02
cancel properly interact with tool animation
stilnat Oct 18, 2024
5219d16
fix toolbox scale issue
stilnat Oct 18, 2024
6e4697f
fix place interaction
stilnat Oct 18, 2024
17bc0eb
fix toolbox open animation
stilnat Oct 19, 2024
5ab2290
add general interaction type
stilnat Oct 19, 2024
8e49040
remove target meshes on uberhuman
stilnat Oct 19, 2024
9c7ef89
type changes on a bunch of prefab
stilnat Oct 19, 2024
e8733ea
change how interaction target point are retrieved
stilnat Oct 20, 2024
a20ea97
add debug drawing extension
stilnat Oct 20, 2024
f6a052e
move debug extension
stilnat Oct 20, 2024
1fb145e
better hit animation
stilnat Oct 20, 2024
d731a79
add fist making and look at while hitting with fist
stilnat Oct 20, 2024
19efd74
fix stupid hand rotation on hit
stilnat Oct 21, 2024
872ef74
add dotween extension
stilnat Oct 21, 2024
9bdc444
remove useless interactions
stilnat Oct 21, 2024
98e167a
proper left and right punch
stilnat Oct 21, 2024
103f850
translate pickup animation into dotween
stilnat Oct 22, 2024
cb8b23e
add the procedural animation controller and integrate pickup
stilnat Oct 22, 2024
d3840ca
integrate place animation to procedural stuff
stilnat Oct 22, 2024
7f5d480
integrate interact with tools animations to procedural stuff
stilnat Oct 22, 2024
fdde6c0
integrate intertwithhand in procedural
stilnat Oct 23, 2024
aedd9b9
remove the trigger collider ignore in interaction controller
stilnat Oct 23, 2024
6072abc
integrate grab interaction to procedural animations
stilnat Oct 23, 2024
5a994cc
add sit as interaction procedural
stilnat Oct 24, 2024
deb1cd3
add working animations for dragging and strafing
stilnat Oct 24, 2024
5413377
fix left holds
stilnat Oct 25, 2024
b90ab45
integrate throw in procedural animations
stilnat Oct 25, 2024
fb10bdc
better hold controller
stilnat Oct 26, 2024
ef9caf4
when removing item if two hand holdable, put the hand in right position
stilnat Oct 26, 2024
242b310
better aim controlling
stilnat Oct 27, 2024
82e0820
cleanup comments
stilnat Oct 27, 2024
8881e86
hit with item animation
stilnat Oct 28, 2024
1c3ec07
improve item hit point
stilnat Oct 28, 2024
a7c31d5
clean hit and hit item animations
stilnat Oct 28, 2024
36d0a45
integrate hit to interactions
stilnat Oct 28, 2024
74f10b1
integrate on uberhuman health system
stilnat Oct 29, 2024
afb4e3d
make ok hand a separate component
stilnat Oct 29, 2024
3095f28
kinda fix bugs on death
stilnat Oct 29, 2024
212ede8
some clean up + strafe to throw
stilnat Oct 29, 2024
4fc8757
fixing interact with tools animation
stilnat Oct 29, 2024
8316c96
animation interact with hand fixed
stilnat Oct 29, 2024
ade5e3a
proper interact cancel with tool
stilnat Oct 29, 2024
e68b77e
correct cancel interact with hand
stilnat Oct 29, 2024
eba358d
some clean up and abstract procedural animation
stilnat Oct 29, 2024
5ca5a49
more cleanup
stilnat Oct 29, 2024
c4b32da
add underarm hold and apply it to sheets
stilnat Oct 30, 2024
b3dd552
fix throw on client
stilnat Oct 30, 2024
67be497
add constructor fix some null ref
stilnat Oct 30, 2024
52614fc
fix the right holds on player
stilnat Oct 30, 2024
98b703a
simply set ref instead of getcopmponent
stilnat Oct 30, 2024
f5735ad
move animator controller
stilnat Oct 30, 2024
9106021
remove dummy stuff
stilnat Oct 30, 2024
6ed1ce4
some clean up and doc
stilnat Oct 30, 2024
eee269a
clean up, doc, fix rigbuild
stilnat Oct 30, 2024
8d5b010
allow stop sitting
stilnat Oct 30, 2024
4ec12ef
knockdown on hit
stilnat Oct 30, 2024
2ef8672
dragging with continuous interaction
stilnat Oct 30, 2024
4e95f8e
better dragging
stilnat Oct 31, 2024
58d1443
quicker drag anim
stilnat Oct 31, 2024
8875517
slightly imporve ragdoll dragging
stilnat Oct 31, 2024
b9386d3
add some drag to ragdoll
stilnat Oct 31, 2024
179f70d
improve grabbing and ragdoll
stilnat Oct 31, 2024
8b4c6fe
add default hold script and throwing small item holds
stilnat Oct 31, 2024
ae80032
improve a bit throw animation
stilnat Oct 31, 2024
6f70343
improve a bit throwing
stilnat Oct 31, 2024
dcc46cc
improve a bit dragging furniture
stilnat Nov 1, 2024
5ad85b1
put back intent UI
stilnat Nov 1, 2024
89711fe
cleanup and comments
stilnat Nov 1, 2024
b860305
better movement controller
stilnat Nov 1, 2024
8e93541
ragdoll client when feet are in bad shape
stilnat Nov 1, 2024
010cd29
refactor animator code
stilnat Nov 2, 2024
e7db457
fix change position when no position changed when interacting
stilnat Nov 2, 2024
a422b77
fix strafing
stilnat Nov 2, 2024
8ee0913
better dragging
stilnat Nov 2, 2024
7a23aac
add back running
stilnat Nov 2, 2024
e005af0
improve position logic
stilnat Nov 2, 2024
03fa62b
quicker rotation
stilnat Nov 2, 2024
4c3df39
fix foot elongating on grab
stilnat Nov 2, 2024
94f1ef0
clean up and integrate sit to position controller
stilnat Nov 2, 2024
b172f50
fix tool interacting after
stilnat Nov 2, 2024
ceddf49
remove ragdoll interpolation
stilnat Nov 2, 2024
1919a6f
fix low punches
stilnat Nov 2, 2024
4bbbfff
sync animations
stilnat Nov 2, 2024
2e4a14c
sync part two
stilnat Nov 2, 2024
6582461
remove useless place targets
stilnat Nov 3, 2024
b82e1ea
refactor procedural animations
stilnat Nov 3, 2024
f1508bd
single IK target for hand
stilnat Nov 3, 2024
0b155f3
bunch of renaming and cleanup uberHuman
stilnat Nov 3, 2024
5e0bd54
reorder stuff on uberHuman
stilnat Nov 3, 2024
7245e1f
fix m4 prefab
stilnat Nov 3, 2024
5869a4f
refactor animations
stilnat Nov 3, 2024
ce01097
solve shitty hand rotation bug
stilnat Nov 3, 2024
65b452c
Merge branch 'develop' into Animations
stilnat Nov 3, 2024
aebdc7b
fix merge
stilnat Nov 3, 2024
b9edee6
fix grab and release position bug
stilnat Nov 4, 2024
7c4e977
fix ragdoll bun unsync it
stilnat Nov 4, 2024
c71ff17
integrate ragdolling into position control
stilnat Nov 4, 2024
df27dde
fully server auth ragdoll
stilnat Nov 5, 2024
e9521f7
ragdoll event
stilnat Nov 6, 2024
cb0c3f5
small comments
stilnat Nov 6, 2024
80a2d32
drop held item when ragdolled
stilnat Nov 6, 2024
b6fd648
better hand punch
stilnat Nov 6, 2024
2f42467
punch with some force
stilnat Nov 6, 2024
b5bb173
fix ragdoll position
stilnat Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
charset = utf-8-bom
end_of_line = crlf
trim_trailing_whitespace = false
insert_final_newline = false
insert_final_newline = true
indent_style = space
indent_size = 4

Expand Down
Binary file added Assets/Art/Animations/GetUpFromBack.fbx
View file
Open in desktop
Binary file not shown.
Loading
Loading