Skip to content

feat: actions and actionsfx merge MTT-4244 MTT-4344 #705

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 72 commits into from
Aug 26, 2022
Merged

feat: actions and actionsfx merge MTT-4244 MTT-4344 #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
81b61fe
Adjusted GameStateBehaviour class description
pdeschain Jul 18, 2022
dd7fa7c
Removed ClientBossRoomState
pdeschain Jul 18, 2022
ee4532b
Removed NetworkGameState and NetworkWinState
pdeschain Jul 18, 2022
563e841
ClientMainMenuState renamed to MainMenuState
pdeschain Jul 19, 2022
edf4f6a
Removed ClientPostGameState and renamed ServerPostGameState to PostGa…
pdeschain Jul 19, 2022
25526e5
moving files to different subfolders for better organization
pdeschain Jul 25, 2022
532f31d
Changelog and typo fixes
pdeschain Jul 25, 2022
e206985
Merge branch 'develop' of github.com:Unity-Technologies/com.unity.mul…
pdeschain Jul 25, 2022
dce8b7b
nullref fix (was disposing of a subscription handle before it was ret…
pdeschain Jul 25, 2022
89e2811
Removed BufferedNetworkMessageChannel
pdeschain Jul 27, 2022
be16450
Merge remote-tracking branch 'origin/pdeschain/removing-bridge-classe…
pdeschain Jul 28, 2022
cfce191
actually setting win state
pdeschain Jul 28, 2022
6e094c4
#
pdeschain Jul 29, 2022
3cc0475
Merge remote-tracking branch 'origin/pdeschain/removing-bridge-classe…
pdeschain Jul 29, 2022
3f66c4c
further folder adjustments
pdeschain Jul 29, 2022
8c91aae
Namespace and funtion name changes for Actions
pdeschain Aug 1, 2022
02c1838
Start renamed to OnStart in ActionVisualization
pdeschain Aug 1, 2022
b55033a
wip preparing to join action and actionfx
pdeschain Aug 2, 2022
a1a01d2
wip merging actions
pdeschain Aug 2, 2022
ea93786
All actions have been merged
pdeschain Aug 3, 2022
ddc39c4
wip porting actions to be SOs
pdeschain Aug 8, 2022
443a216
wip refactoring for acitonid usage
pdeschain Aug 8, 2022
0bea75a
All compilation issues resolved, actions are now fully independent of…
pdeschain Aug 8, 2022
2e4cca3
Added tooling and brought back some of the deleted types to port them…
pdeschain Aug 9, 2022
24d77a8
#
pdeschain Aug 9, 2022
beb0035
Renamed AOEAction appropriately, changed some conversion cases
pdeschain Aug 9, 2022
32f5128
Recreated all abilities and assigned them to appropriate character Cl…
pdeschain Aug 9, 2022
e0743fb
OnCollisionEnter renamed in SO-dervied types to avoid weirdness with …
pdeschain Aug 9, 2022
aaff821
Tank - removed unused ability
pdeschain Aug 10, 2022
75c91f8
Removed new_ prefix from Action filenames
pdeschain Aug 10, 2022
7d4512c
Removed old ActionDescription class
pdeschain Aug 10, 2022
0c3506e
Merge branch 'develop' into pdeschain/action-system-cleanup
pdeschain Aug 17, 2022
216f7c5
Merge remote-tracking branch 'origin/pdeschain/action-system-cleanup'…
pdeschain Aug 17, 2022
bcb474d
Merge branch 'develop' into pdeschain/action-system-cleanup
pdeschain Aug 17, 2022
54b20af
Merge branch 'pdeschain/action-system-cleanup' into pdeschain/actions…
pdeschain Aug 17, 2022
3111192
Corrected the comment and changed the name of fields to be more self-…
pdeschain Aug 23, 2022
2e912fa
Removed unnecessary field and cleaned up the comments
pdeschain Aug 23, 2022
feb7032
removed virtual from Aciton.Initialize as it was unused
pdeschain Aug 23, 2022
db14620
merge error fix
pdeschain Aug 23, 2022
21d271f
added action so pooling in ActionFactory and player classes
pdeschain Aug 23, 2022
efc0721
a note on action system non-generic nature
pdeschain Aug 23, 2022
f212360
replaced Linq, fixed an error
pdeschain Aug 23, 2022
2affef7
ActionID comment
pdeschain Aug 23, 2022
07094ce
Boss trample didn't refer to the Stunned action - fixed.
pdeschain Aug 23, 2022
5806853
Update Assets/Scripts/Gameplay/Action/BaseTypes/Action.cs
pdeschain Aug 23, 2022
b5a7223
added better names for create asset menu items
pdeschain Aug 23, 2022
5b5f15d
Merge branch 'pdeschain/actions-merge' of github.com:Unity-Technologi…
pdeschain Aug 23, 2022
41e81aa
Merge branch 'develop' into pdeschain/action-system-cleanup
pdeschain Aug 24, 2022
8714f87
moving new actions appropriately
pdeschain Aug 24, 2022
d0e4324
Restored Client/Server names for game states
pdeschain Aug 24, 2022
318dbbe
Merge remote-tracking branch 'origin/pdeschain/action-system-cleanup'…
pdeschain Aug 24, 2022
57a36e7
Updated new Drop and Pickup actions to the new system
pdeschain Aug 24, 2022
4fde081
Updated GameDataSource
pdeschain Aug 24, 2022
549bdae
Merge branch 'develop' into pdeschain/action-system-cleanup
pdeschain Aug 24, 2022
91c1a29
Pick up is interruptable by Drop action
pdeschain Aug 24, 2022
7c68b96
Merge branch 'pdeschain/action-system-cleanup' into pdeschain/actions…
pdeschain Aug 24, 2022
cee0717
renamed AoeAciton to AOEAction
pdeschain Aug 24, 2022
20fdf12
Merge branch 'develop' into pdeschain/actions-merge
pdeschain Aug 24, 2022
75e034c
Fixed issues with over-releasing the action instances, fixed an issue…
pdeschain Aug 24, 2022
63426e3
Merge branch 'develop' into pdeschain/actions-merge
pdeschain Aug 24, 2022
6b9d94c
Chopped Actions that were too big into Client and Server partial clas…
pdeschain Aug 24, 2022
5ca02a0
fixed broken game data that caused errors
pdeschain Aug 25, 2022
38e8c53
Added Reset logic to all actions, so that they are reusable via pooling
pdeschain Aug 25, 2022
3a6d71e
Merge branch 'develop' into pdeschain/actions-merge
pdeschain Aug 25, 2022
04cfcb3
Changelog
pdeschain Aug 25, 2022
27d3427
Removed cached values that should've been looked up dynamically throu…
pdeschain Aug 25, 2022
58be8ed
fixed 0,0,0 rotation for targeted abilities
pdeschain Aug 25, 2022
d87eabe
Fixed issue with client anticipation action being over-returned
pdeschain Aug 25, 2022
57df669
formatting
pdeschain Aug 25, 2022
0703d22
Merge branch 'develop' into pdeschain/actions-merge
pdeschain Aug 26, 2022
e694dd5
Merge branch 'develop' into pdeschain/actions-merge
pdeschain Aug 26, 2022
a520c5a
formatting
pdeschain Aug 26, 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
4 changes: 2 additions & 2 deletions Assets/GameData/Action/Archer/ArcherBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Archer/ArcherBaseAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Archer/ArcherChargedShot.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Archer/ArcherChargedShot.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Archer/ArcherVolley.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Archer/ArcherVolley.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Boss/BossImpBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Boss/BossImpBaseAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Boss/BossImpTrampleAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Boss/BossImpTrampleAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Chase.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Chase.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Drop.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Drop.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote1.asset
View file
Open in desktop
Git LFS file not shown
13 changes: 1 addition & 12 deletions Assets/GameData/Action/General/Emote1.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote2.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Emote2.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote3.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Emote3.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Emote4.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Emote4.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/Action/General/Pick Up.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion ...GameData/Action/General/PickUp.asset.meta → ...ameData/Action/General/Pick Up.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/Action/General/PickUp.asset
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Revive.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Revive.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Stunned.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Stunned.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/General/Target.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/General/Target.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Imp/ImpBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Imp/ImpBaseAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Mage/MageBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Mage/MageBaseAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Mage/MageHeal.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Mage/MageHeal.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Rogue/RogueBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Rogue/RogueBaseAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Rogue/RogueDashAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Rogue/RogueDashAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Rogue/RogueStealthMode.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Rogue/RogueStealthMode.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankBaseAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankBaseAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankShieldBuff.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankShieldBuff.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankShieldRush.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankShieldRush.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/Tank/TankTestAoeAttack.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion Assets/GameData/Action/Tank/TankTestAoeAttack.asset.meta
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions Assets/GameData/Action/VandalImp/ImpToss.asset
View file
Open in desktop
Git LFS file not shown
2 changes: 1 addition & 1 deletion 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.

4 changes: 2 additions & 2 deletions Assets/GameData/Character/Archer/Archer.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/GameData/Character/Imp/Imp.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/GameData/Character/ImpBoss/ImpBoss.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/GameData/Character/Mage/Mage.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/GameData/Character/Rogue/Rogue.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/GameData/Character/Tank/Tank.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/GameData/Character/VandalImp/VandalImp.asset
View file
Open in desktop
Git LFS file not shown
Loading