Skip to content

feat: NetworkRigidbody-based toss action [MTT-2333] #671

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

Merged
merged 22 commits into from
Jun 22, 2022
Merged

feat: NetworkRigidbody-based toss action [MTT-2333] #671

Show file tree
Hide file tree
Changes from 21 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e5d85cc
Merge branch 'develop' into feature/networkrigidbody-wip
fernando-cortez May 25, 2022
e27473c
bomb throw first pass
fernando-cortez May 26, 2022
ecd1920
damage as var on the bomb
fernando-cortez May 27, 2022
e0e6a31
Merge branch 'develop' into feature/networkrigidbody-wip
fernando-cortez May 30, 2022
6150d28
bomb damages PCs/NPCs, bomb graphics added & bomb world-space display
fernando-cortez May 31, 2022
7045811
adding health visuals and fixing HP reference
fernando-cortez May 31, 2022
b058f96
late update movement of world-space bomb UI display
fernando-cortez May 31, 2022
df8ccb2
Merge branch 'develop' into feature/networkrigidbody-wip
fernando-cortez Jun 1, 2022
212fb70
removing old vandalimp prefab
fernando-cortez Jun 1, 2022
3c42407
renaming action itself and adding knockback to the explosion
fernando-cortez Jun 1, 2022
546fc01
more renaming
fernando-cortez Jun 1, 2022
ad7a36d
cleanup
fernando-cortez Jun 1, 2022
b1a0991
addition to changelog
fernando-cortez Jun 1, 2022
3b12c26
merge develop (folder path modification)
fernando-cortez Jun 2, 2022
919937b
physic material rename
fernando-cortez Jun 2, 2022
82dfdad
exposing detonate & destroy times for testing
fernando-cortez Jun 2, 2022
a3236ae
trailing line fix
fernando-cortez Jun 3, 2022
7d5729b
restructuring of detonate message & RPC response
fernando-cortez Jun 15, 2022
78e4c44
moving prefab spawning class to utils
fernando-cortez Jun 16, 2022
d73e419
restructuring of rpc response, renaming
fernando-cortez Jun 16, 2022
2f96c77
merge develop (changelog)
fernando-cortez Jun 16, 2022
ae2feb2
simplification of client-server separation
fernando-cortez Jun 22, 2022
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
8 changes: 8 additions & 0 deletions Assets/GameData/Action/VandalImp.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/GameData/Action/VandalImp/ImpToss.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/GameData/Action/VandalImp/ImpToss.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions Assets/GameData/Character/Imp/VandalImp.asset
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions Assets/GameData/Character/VandalImp.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/GameData/Character/VandalImp/BaseHP.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/GameData/Character/VandalImp/BaseHP.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/GameData/Character/VandalImp/VandalImp.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion ...meData/Character/Imp/VandalImp.asset.meta → .../Character/VandalImp/VandalImp.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions Assets/GameData/Game/ImpTossPhysics.physicMaterial
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!134 &13400000
PhysicMaterial:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ImpTossPhysics
dynamicFriction: 0.1
staticFriction: 0.6
bounciness: 1
frictionCombine: 0
bounceCombine: 0
8 changes: 8 additions & 0 deletions Assets/GameData/Game/ImpTossPhysics.physicMaterial.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading