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

Jump to bottom
Merged
merged 72 commits into from
Aug 26, 2022
Merged

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

merged 72 commits into from
Aug 26, 2022

Conversation

pdeschain
Copy link
Contributor

@pdeschain pdeschain commented Aug 3, 2022 •
edited
Loading

Description

This PR introduces changes to our action system:

  • I've merged Action and ActionFX into a new Action class - both server and client logic now runs in the same class
  • I've taken my chance to rename Server and Client action players accordingly, from their prior quite arbitrary names.
  • all Action types are now scriptable objects
  • ActionType is removed, ActionLogic stays
  • Instead of relying on a ActionType enum we now can figure out what an action is by using an ActionID - a runtime ID that's generated by all peers from the GameDataSource information
  • Actions are pooled using unity's pooling API.
  • Actions now have a Reset virtual function that restores them to pristine reusable state.

Things to consider:

  • We still heavily rely on a rather pervasive singleton - GameDataSource , but it's better to take it's refactoring as a separate PR.

Issue Number(s)

MTT-4244
MTT-4344

Contribution checklist

  • Tests have been added for boss room and/or utilities pack
  • Release notes have been added to the project changelog file and/or package changelog file
  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • JIRA ticket ID is in the PR title or at least one commit message
  • Include the ticket ID number within the body message of the PR to create a hyperlink

pdeschain added 20 commits July 18, 2022 11:41
@pdeschain
Adjusted GameStateBehaviour class description
81b61fe
@pdeschain
Removed ClientBossRoomState
dd7fa7c 
And renamed ServerBossRoomState to BossRoomState.
Added lifetime scopes to all the subscenes of BossRoom scene. These autoinject gameobjects that live under the "static network objects" groupings.
@pdeschain
Removed NetworkGameState and NetworkWinState
ee4532b 
replaced with BufferedNetworkMessageChannel (an addition in this entry) - this message channel is identical to NetworkMessageChannel, but it inherits from a buffered message channel instead. This is used as a way to pass data that syncs from server to clients between different scenes without the need for SO variables, which are hard to understand.
@pdeschain
ClientMainMenuState renamed to MainMenuState
563e841
@pdeschain
Removed ClientPostGameState and renamed ServerPostGameState to PostGa…
edf4f6a 
…meState

also added auto-injected objects to the PostGameState-bearing game object.
@pdeschain
moving files to different subfolders for better organization
25526e5
@pdeschain
Changelog and typo fixes
532f31d
@pdeschain
Merge branch 'develop' of github.com:Unity-Technologies/com.unity.mul…
e206985 
…tiplayer.samples.coop into pdeschain/removing-bridge-classes
@pdeschain
nullref fix (was disposing of a subscription handle before it was ret…
dce8b7b 
…urned from the method)
@pdeschain
Removed BufferedNetworkMessageChannel
89e2811 
Replaced it's usage with WinState with a NetworkWinState that's preserved by BossRoomState to survive onto the next scene, PostGameState, which then destroys that preserved gameobject/NetworkWinState when we exit PostGameState to whatever next state.
@pdeschain
Merge remote-tracking branch 'origin/pdeschain/removing-bridge-classe…
be16450 
…s' into pdeschain/action-system-cleanup
@pdeschain
actually setting win state
cfce191
@pdeschain
#
6e094c4
@pdeschain
Merge remote-tracking branch 'origin/pdeschain/removing-bridge-classe…
3cc0475 
…s' into pdeschain/action-system-cleanup
@pdeschain
further folder adjustments
3f66c4c
@pdeschain
Namespace and funtion name changes for Actions
8c91aae 
Moved all Action-related code into .Actions namespace, adjusted the rest of the codebase accordingly.
Renamed Start and Update methods of Actions to be OnStart and OnUpdate (to avoid confusing overlap with MonoBehavior event calls).
Moved FXProjectile to GameplayObjects folder.
@pdeschain
Start renamed to OnStart in ActionVisualization
02c1838
@pdeschain
wip preparing to join action and actionfx
b55033a
@pdeschain
wip merging actions
a1a01d2
@pdeschain
All actions have been merged
ea93786
@pdeschain pdeschain added the 5-Design Review Draft to review design ideas before committing to future work label Aug 3, 2022
SamuelBellomo
SamuelBellomo reviewed Aug 3, 2022
View reviewed changes
SamuelBellomo
SamuelBellomo previously approved these changes Aug 25, 2022
View reviewed changes
SamuelBellomo
SamuelBellomo previously approved these changes Aug 25, 2022
View reviewed changes
LPLafontaineB
LPLafontaineB previously approved these changes Aug 26, 2022
View reviewed changes
@pdeschain pdeschain dismissed stale reviews from LPLafontaineB and SamuelBellomo via 0703d22 August 26, 2022 17:32
SamuelBellomo
SamuelBellomo previously approved these changes Aug 26, 2022
View reviewed changes
LPLafontaineB
LPLafontaineB previously approved these changes Aug 26, 2022
View reviewed changes
@pdeschain pdeschain enabled auto-merge (squash) August 26, 2022 17:39
@pdeschain pdeschain disabled auto-merge August 26, 2022 19:49
@pdeschain pdeschain dismissed stale reviews from LPLafontaineB and SamuelBellomo via e694dd5 August 26, 2022 19:52
SamuelBellomo
SamuelBellomo previously approved these changes Aug 26, 2022
View reviewed changes
@pdeschain pdeschain enabled auto-merge (squash) August 26, 2022 21:15
@pdeschain pdeschain added the 0-URGENT Blocker for a release and needs to be merged ASAP label Aug 26, 2022
@pdeschain pdeschain merged commit a241655 into develop Aug 26, 2022
@pdeschain pdeschain deleted the pdeschain/actions-merge branch August 26, 2022 21:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fernando-cortez fernando-cortez fernando-cortez left review comments

@SamuelBellomo SamuelBellomo SamuelBellomo approved these changes

@LPLafontaineB LPLafontaineB LPLafontaineB approved these changes

Assignees
No one assigned
Labels
0-URGENT Blocker for a release and needs to be merged ASAP 1-Needs Review PR needs attention from the assignee and reviewers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pdeschain @SamuelBellomo @fernando-cortez @LPLafontaineB