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

Basic health, first iteration #1239

Merged
merged 89 commits into from
Sep 2, 2023
Merged

Basic health, first iteration #1239

Show file tree
Hide file tree
Changes from 81 commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
ec00925
add basic health files
stilnat Aug 15, 2023
9e98cd9
fix kill interaction
stilnat Aug 15, 2023
b0d7232
add blood particles
stilnat Aug 15, 2023
c48fe45
add hand body part
stilnat Aug 15, 2023
fbe1adb
fix back human prefab
stilnat Aug 15, 2023
4bc3d5a
update v3 fishnet
stilnat Aug 15, 2023
d4d49a2
fixing icons not showing up
stilnat Aug 16, 2023
d7ff534
fix some warning and issues
stilnat Aug 17, 2023
0d168b5
Merge branch 'update-fishnet-v3' into basic-health-v3
stilnat Aug 17, 2023
8f233dc
remove require component network object on bodypart
stilnat Aug 17, 2023
86671c7
allow attach body parts to be destroyed
stilnat Aug 18, 2023
9738d09
add bodyparts on human
stilnat Aug 18, 2023
372cb06
add bodyparts tag
stilnat Aug 18, 2023
26d9d8a
allow to detach hands
stilnat Aug 18, 2023
d16741f
spawn body part when destroyed
stilnat Aug 19, 2023
e7f759f
add hurt coimmand to hurt a player
stilnat Aug 19, 2023
5c861eb
remove name as a member of bodypart
stilnat Aug 19, 2023
d34ae8d
move scripts on bodyparts for bodyparts instead of the armature
stilnat Aug 19, 2023
01727ee
same
stilnat Aug 19, 2023
71c7b50
rename some clothes gameobject
stilnat Aug 19, 2023
9fff702
move hand and hand container on bodyparts
stilnat Aug 19, 2023
63ee638
rename correctly some gameobjects
stilnat Aug 19, 2023
600a872
remove prefab member of item
stilnat Aug 19, 2023
ef09a17
remove useless log
stilnat Aug 19, 2023
79bb1aa
remove exception
stilnat Aug 19, 2023
3775e15
add item prefabs for body parts
stilnat Aug 19, 2023
8556fd1
make head convex
stilnat Aug 19, 2023
f808274
replace prefab to spawn when bodypart destroyed
stilnat Aug 19, 2023
ee1a666
some factoring and destroy bodyparts instead of only detach
stilnat Aug 19, 2023
a3c0ea4
mode id container on body parts
stilnat Aug 19, 2023
893a33e
move ears on head
stilnat Aug 19, 2023
5832266
tidy up human scripts and update doc
stilnat Aug 20, 2023
ce9c8aa
add head body part
stilnat Aug 20, 2023
f08789c
fix some issues with removing body parts
stilnat Aug 20, 2023
e8b530f
fix null ref
stilnat Aug 20, 2023
b140dda
change body parts collider to be triggers
stilnat Aug 20, 2023
3a048b1
can invoke disabled attached container
stilnat Aug 20, 2023
6e00fa7
remove items from bodyparts before detaching
stilnat Aug 20, 2023
169fff0
fix is kinematic on hand left item
stilnat Aug 21, 2023
a4b0132
some factoring on bodypart
stilnat Aug 21, 2023
d21b0e1
update attack by pressing f
stilnat Aug 21, 2023
035b6a5
update default prefab objects for fiishnet
stilnat Aug 21, 2023
78424b4
add entity on head when head detached
stilnat Aug 21, 2023
02e3cbc
refactor some stuff
stilnat Aug 21, 2023
1bc2d10
fix screen going black when non owned entity gets destroyed
stilnat Aug 22, 2023
505f1d0
simple script to check who owns a given go
stilnat Aug 23, 2023
1619795
fix ownership on clients when picking up stuff
stilnat Aug 23, 2023
79809b0
add brain to head
stilnat Aug 24, 2023
510a436
kill human brain by destroying head
stilnat Aug 24, 2023
33bb90c
add ghost prefab
stilnat Aug 24, 2023
8a4e9a4
add two commands to hurt body parts
stilnat Aug 24, 2023
d3d25d3
fix some stuff on bodyparts
stilnat Aug 24, 2023
626f734
set ref to ghost
stilnat Aug 24, 2023
049f524
refresh default prefab objects
stilnat Aug 24, 2023
99dc764
update bodyparts to fix rigidbody interpolation
stilnat Aug 24, 2023
51dd9c3
update human
stilnat Aug 24, 2023
50cae06
copy value to bodypart
stilnat Aug 25, 2023
872e67c
add ability to hit all layer of bodypart
stilnat Aug 25, 2023
4ff22ac
add examine body part command
stilnat Aug 25, 2023
ddf59d5
fix modified damagetypeQuantity
stilnat Aug 25, 2023
a2d8725
Merge branch 'develop' into basic-health-v3
stilnat Aug 26, 2023
ca9a158
fix isdetached check
stilnat Aug 26, 2023
5339ba6
fix detached bodypart
stilnat Aug 26, 2023
7e14494
some doc and clean up
stilnat Aug 26, 2023
b321188
simplified detach body part workflow
stilnat Aug 26, 2023
b4e6062
removing useless interactive container on player
stilnat Aug 27, 2023
161c2d8
no interactions for now
stilnat Aug 27, 2023
4a2d940
fix head body part issue with detaching
stilnat Aug 27, 2023
cf719ce
add hit interaction, for a combat basis
stilnat Aug 27, 2023
cef4ba6
some cleanup
stilnat Aug 27, 2023
91f4dcb
destroy container content when body part is destroyed
stilnat Aug 27, 2023
7cd70a1
add low speed with low foot health
stilnat Aug 28, 2023
ebea52e
remove serializers for body layers
stilnat Aug 29, 2023
c5b0087
move files around
stilnat Aug 29, 2023
2bbe3a3
add feet script to human
stilnat Aug 29, 2023
fa5861b
Hide brain
stilnat Aug 29, 2023
c844d79
add doc
stilnat Aug 29, 2023
48dbcc3
replace tabs with 4 spaces
stilnat Aug 29, 2023
8636f5e
hide body on head severed
stilnat Aug 31, 2023
6a95c6f
add cloth container script
stilnat Sep 1, 2023
061e833
add organ container
stilnat Sep 1, 2023
20e8466
correct namespaces
stilnat Sep 2, 2023
e9633df
change oxy to respiratory
stilnat Sep 2, 2023
52ac4d4
add human entity and some fix
stilnat Sep 2, 2023
b2f3bc2
separating feetcontroller and humanoid one
stilnat Sep 2, 2023
c0151ba
remove inventory UI when inventory is disabled.
stilnat Sep 2, 2023
c3aee5b
add possibility of hurting all body layers in hurt command
stilnat Sep 2, 2023
fc5063b
update to develop
stilnat Sep 2, 2023
5f6eadd
Revert "change oxy to respiratory"
stilnat Sep 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
159 changes: 0 additions & 159 deletions Assets/Content/Data/DefaultPrefabObjects.asset
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions Assets/Content/Scenes/Boot.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ MonoBehaviour:
_objectPool: {fileID: 0}
_persistence: 0
_logging: {fileID: 0}
_spawnablePrefabs: {fileID: 11400000, guid: 59af76506e3115f479c03aedaf5de785, type: 2}
_spawnablePrefabs: {fileID: 11400000, guid: 44b859ef8fa90fe4389e6da31fa16075, type: 2}
--- !u!114 &340427414
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -238,6 +238,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 57ce8bbb58966cb45a7140f32da5327a, type: 3}
m_Name:
m_EditorClassIdentifier:
_enableGlobalScenes: 1
_startInOffline: 1
_offlineScene: Assets/Content/Scenes/Boot.unity
_onlineScene: Assets/Content/Scenes/Game.unity
Expand Down Expand Up @@ -274,6 +275,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_authenticator: {fileID: 0}
_remoteClientTimeout: 2
_remoteClientTimeoutDuration: 60
_syncTypeRate: 0.1
SpawnPacking:
Position: 0
Rotation: 0
Expand Down Expand Up @@ -301,7 +305,6 @@ MonoBehaviour:
_maximumFrameTicks: 3
_tickRate: 120
_pingInterval: 1
_timingInterval: 2
_physicsMode: 0
--- !u!114 &340427418
MonoBehaviour:
Expand All @@ -316,6 +319,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
Transport: {fileID: 340427415}
_intermediateLayer: {fileID: 0}
_latencySimulator:
_enabled: 0
_simulateHost: 1
Expand Down
Loading