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.

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

[WIP] Atmos is back #1462

Open
wants to merge 509 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
509 commits
Select commit Hold shift + click to select a range
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
075f74b
atmos first commit
stilnat Nov 7, 2024
1e8c8e7
add back atmos ragdoll
stilnat Nov 8, 2024
d2d3f78
clean up
stilnat Nov 8, 2024
51fe932
cleanup and cognitive simplification
stilnat Nov 8, 2024
28a372a
clean up
stilnat Nov 8, 2024
03f9f57
fix memory leak and null ref
stilnat Nov 8, 2024
da76ba9
fix calculator issue and add optional parallel computation
stilnat Nov 8, 2024
9aaf827
fix velocity wind lost
stilnat Nov 8, 2024
3385401
some cleanup
stilnat Nov 8, 2024
05532bf
some cleanup and new map
stilnat Nov 8, 2024
03c844b
parallel computation
stilnat Nov 8, 2024
80099d0
cleanup and fix air spawning
stilnat Nov 9, 2024
53c1935
try to fix sim
stilnat Nov 9, 2024
3d53976
compute neighbours directly
stilnat Nov 10, 2024
5b2d481
clean up and add transfer gas job
stilnat Nov 11, 2024
ad531d2
cleanup
stilnat Nov 11, 2024
709aad7
cleanup
stilnat Nov 11, 2024
35ee0b6
cleanup
stilnat Nov 11, 2024
ba7ed94
refactoring
stilnat Nov 11, 2024
1988189
clean up and optimization of manager update
stilnat Nov 12, 2024
667a2fa
add neighbour and inactive job
stilnat Nov 14, 2024
17ec66e
bigger atmos map
stilnat Nov 14, 2024
325212a
add set active jobs
stilnat Nov 15, 2024
40b7bb9
clean up and compute velocity job
stilnat Nov 15, 2024
60cf176
take velocity in account
stilnat Nov 15, 2024
ffda369
add basic pipe atmos
stilnat Nov 17, 2024
3c0f749
pipes burst compatible
stilnat Nov 17, 2024
26b5ffe
rename and make write only mole transfer
stilnat Nov 18, 2024
fcf3e31
burst compile compute index job
stilnat Nov 18, 2024
c8c9851
uses active indexes to drastically reduce job iterations
stilnat Nov 18, 2024
d1da4f7
compute active state all at the same place
stilnat Nov 19, 2024
734432d
fix pipes
stilnat Nov 19, 2024
18c6cb5
some cleanup
stilnat Nov 19, 2024
cb94848
add some atmos compression stuff
stilnat Nov 21, 2024
089f6ce
delta compression working
stilnat Nov 22, 2024
eb3d174
syncing atmos on client
stilnat Nov 22, 2024
ce6e8e1
some cleanup
stilnat Nov 22, 2024
7d77238
add scrubber atmos
stilnat Nov 23, 2024
f7ada09
smaller volume in pipes
stilnat Nov 23, 2024
6672d42
add unary vents
stilnat Nov 23, 2024
0d9f3a3
some fix
stilnat Nov 24, 2024
78a137d
proper tile changes
stilnat Nov 24, 2024
b502b0e
simplify transfer
stilnat Nov 24, 2024
c409aef
pipes
stilnat Nov 28, 2024
e7d7ef6
scrubber works with pipes
stilnat Nov 29, 2024
d4c8845
cleanup and refactor
stilnat Nov 29, 2024
4c14fc6
filter atmos object + fix some pipes
stilnat Nov 30, 2024
52b7d94
add valve
stilnat Nov 30, 2024
ba67bec
add valve and fix add to pipenet
stilnat Nov 30, 2024
82d62d8
fix removing pipe
stilnat Nov 30, 2024
f7bc723
set active as simple job
stilnat Nov 30, 2024
766256c
clean jobs
stilnat Dec 1, 2024
a46621d
clean up and change atmos state make active
stilnat Dec 1, 2024
0b86b42
better update rate and pressure visualization
stilnat Dec 1, 2024
6bcf8eb
remove layer param
stilnat Dec 1, 2024
f0a849a
rotate fans
stilnat Dec 1, 2024
ca111ce
remove benchmark
stilnat Dec 1, 2024
f02c330
airlock change atmos
stilnat Dec 1, 2024
0e02427
animate from start vents
stilnat Dec 1, 2024
c2d7f63
big move
stilnat Dec 1, 2024
1080016
add valve
stilnat Dec 1, 2024
03fd329
add filter view
stilnat Dec 3, 2024
be04350
adjacency stuff
stilnat Dec 3, 2024
6ebcdd3
fix filtering
stilnat Dec 3, 2024
1856807
small change to stabilize
stilnat Dec 3, 2024
cef1e84
make mixer to work
stilnat Dec 4, 2024
ef355de
fix mixerUI
stilnat Dec 5, 2024
eeb7198
better slider
stilnat Dec 5, 2024
09f0c8c
atmos filtering
stilnat Dec 5, 2024
8cd0084
improve UI filter
stilnat Dec 5, 2024
eead23d
add atmosblocker and some refactoring
stilnat Dec 5, 2024
7fe6025
some doc and one exception fix
stilnat Dec 5, 2024
93544d4
add back heat stuff
stilnat Dec 6, 2024
70734e6
some doc and clean up
stilnat Dec 6, 2024
734c945
some refactoring
stilnat Dec 6, 2024
5cb7cba
simplify again
stilnat Dec 6, 2024
97c29d4
allow non static holds
stilnat Dec 7, 2024
cafb1a6
sanic run
stilnat Dec 7, 2024
a2f0caa
slower interaction + small fix
stilnat Dec 7, 2024
be637c4
fix hold
stilnat Dec 7, 2024
4b2396e
Merge branch 'develop' into Animations
stilnat Dec 7, 2024
8c7be7d
fix broken recipes
stilnat Dec 7, 2024
8969e12
fix hand target parenting
stilnat Dec 7, 2024
1caf9eb
fix small items hold rotation
stilnat Dec 7, 2024
7e989fc
better grab steel girder
stilnat Dec 7, 2024
7d4d9f8
slow down a bit
stilnat Dec 7, 2024
bff6d8f
fix throw events
stilnat Dec 7, 2024
1946466
big cleanup
stilnat Dec 8, 2024
acc7865
slightly further reach and interaction origin for hand updated to sho…
stilnat Dec 8, 2024
a1cb9e5
fix interact with hand
stilnat Dec 8, 2024
6cbf446
improve a bit picking up
stilnat Dec 8, 2024
adc11d1
Merge branch 'RE-SS3D:develop' into master
stilnat Dec 8, 2024
ed9837d
Merge branch 'Animations'
stilnat Dec 8, 2024
d843418
Merge branch 'master' of https://github.com/stilnat/SS3D
stilnat Dec 8, 2024
e826a37
Merge branch 'master' into atmos-is-back-bitches
stilnat Dec 8, 2024
35e7539
fix some merge issues
stilnat Dec 9, 2024
dc1903c
some doc and cleanup
stilnat Dec 9, 2024
d50600a
some doc on jobs
stilnat Dec 9, 2024
01d44eb
move folder and fix namespace
stilnat Dec 9, 2024
483ebb2
move core interfaces
stilnat Dec 9, 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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .editorconfig
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 Expand Up @@ -249,7 +249,7 @@ resharper_unity_inefficient_property_access_highlighting = hint
resharper_unity_load_scene_disabled_scene_name_highlighting = error
resharper_unity_load_scene_unexisting_scene_highlighting = error
resharper_unity_performance_critical_code_camera_main_highlighting = error
resharper_unity_performance_critical_code_invocation_highlighting = warning
resharper_unity_performance_critical_code_invocation_highlighting = hint
resharper_unity_performance_critical_code_null_comparison_highlighting = warning
resharper_unity_prefer_non_alloc_api_highlighting = error
resharper_unity_redundant_attribute_on_target_highlighting = error
Expand Down
2 changes: 2 additions & 0 deletions .github/actions/task-assignment/index.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
const core = require('@actions/core');
const github = require('@actions/github');
const { Octokit } = require('@octokit/core');
import fetch from "node-fetch";

async function addAssignee(octokit, Owner, Repo, IssueNumber, Assignee) {
await octokit.request('POST /repos/{owner}/{repo}/issues/{issue_number}/assignees', {
owner: Owner,
repo: Repo,
issue_number: IssueNumber,
request: fetch
assignees: [
Assignee
],
Expand Down
Binary file added Assets/Art/Animations/GetUpFromBack.fbx
Binary file not shown.
Loading
Loading