birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,275 Commits
3 Branches
3 Tags
148 MiB
development
monroegm-disable-blank-issue-2
main
2111.2
2111.1
2107.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'ee57885d64'
${ noResults }
Commit Graph

475 Commits (ee57885d640e2d7ea9e23756a2ced8c12d9cdbc0)

Author SHA1 Message Date
pereslav 64068991ed Merge branch 'development' of https://github.com/o3de/o3de into NetHierarchyInput 4 years ago
kberg-amzn bf136a567b Some shutdown crash fixes, reverted a whitespace, and added some basic unit tests for time additions 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
AMZN-Olex 65b82b41d6 Added unittest for an activation test 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
puvvadar 0a6ddfab5e Revert optimization change in favor of another PR 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
kberg-amzn 865ed60007 merging latest dev 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn 8d993494f6 Entity migrations now totally functional again, plus some fixes to network rigid bodies to make them work properly as they migrate around 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
puvvadar 2811a84187 Move did handshake logic to connection data plus an optimization 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
pereslav ef3552df69 First pass for network hierarchy input processing 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
AMZN-Olex bd0f5a1746 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 4 years ago
lumberyard-employee-dm 816a623c97
Added missing EntityId.h include to FocusModeInterface.h (#4396) 
* Added missing EntityId.h include to FocusModeInterface.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Non-unity build fix

Adding missing BehaviorContext.h includes to Multiplayer Gem

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added missing BehaviorContext.h include to NetworkCharacterComponent

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 4 years ago
Artur K f44169f7fa
Cleanup SerializeContext.h pt.1 (#4264) 
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 4 years ago
AMZN-Olex 94b320c967 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 4 years ago
kberg-amzn 02bc89cd92 Fixes to sending entity updates and entity rpcs within an environment set up for cross host entity migration 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn 0a829f9661 Merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn 95d7cc7212 Adding the NetworkConnectionComponent to hold user nonce and migration values for a backup host in case the current host crashes or abnormally disconnects 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
puvvadar 33029945cb Merge branch 'development' of https://github.com/o3de/o3de into mp_autogen_move 4 years ago
AMZN-Olex 1765934281 Merge branch 'development' of https://github.com/o3de/o3de into Network/olexl/nettransform_local_for_children_cr 4 years ago
kberg-amzn 2c19abf7ee
Merge pull request #4287 from aws-lumberyard-dev/LYN6657_MultiplayerScriptImprovementsForDemo 
LYN6657 Misc Improvements for Multiplayer Scripting
 4 years ago
SergeyAMZN 66a875bf79
Merge pull request #4261 from aws-lumberyard-dev/MPSpawnableHolderUpdate 
Updated NetworkSpawnableHolderComponent to use TransformBus instead o…
 4 years ago
puvvadar 5114c2e0f2 Move AutoComponent jinjas to Include and update cmake accordingly 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
pereslav bf1ebea202 Moved local variable to a smaller scope 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
pereslav 44c8ae2872 Changed NetworkSpawnableHolderComponent to use Entity::GetTransform instead of an ebus call 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
kberg-amzn f837f0494b many bug fixes 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
Gene Walters e91353143f Merge branch 'upstream/development' into LYN6657_MultiplayerScriptImprovementsForDemo 4 years ago
AMZN-Olex 40286b7bac A small optimization 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
Gene Walters a44af20f9a Adding parameter names to NetworkCharacterComponent script events so people know what the parameters are used for in scriptcanvas 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
puvvadar f142e30da6 Fix AutoGen of RPCs with no params 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
Gene Walters cd85df35b6 Make sure Multiplayer AutoComponents dont generate property OnChange script events if GenerateEventBindings is disabled 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Gene Walters c2c18f094b Exposing NetworkCharacterComponent::TryMoveWithVelocity to script. Updating Multiplayer AutoComponent baseclass behavior context to Reflect itself instead of its derived (human made) component. This is so the derived class can also create behaviorcontext classes of its own if needed. Misc copyright header edit. 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
AMZN-Olex 3c46336ab0 NetTransform replicates local transform for child entities 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
pereslav 1087498d00 Merge branch 'development' of https://github.com/o3de/o3de into MPSpawnableHolderUpdate 4 years ago
pereslav ae2525564d Updated NetworkSpawnableHolderComponent to use TransformBus instead of FindComponent. Added dependency on TransformService 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
AMZN-Olex cb75607106 Merged dev 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
SergeyAMZN 35517c4e6a
Merge pull request #4023 from aws-lumberyard-dev/MPSpawnableRework 
Reworked net entities instantiation in order to fix entity references…
 4 years ago
kberg-amzn aacb6a18db Hook up the last client inputId to the migrate notification 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn e8aeb9b101 Format fixing 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn d28bcbe027 Reverts changes to component application and adds further client migration handling hookup 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
AMZN-Olex 5f73061227 Adding client side on-parent-changed logic for Network Transform Component 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
kberg-amzn ca7de715fd minor code cleanup 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
AMZN-Olex f85a7dfeeb Merged dev 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
pereslav dc0bb00c10 Added an error check in case of a requested spawnable is not networked 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
pereslav 895974db57 Removed spawn/despawn events from the spawnable system. Used NetworkSpawnableHolderComponent instead 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
kberg-amzn 1000a07b3f merging latest main 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
Gene Walters 465f91c7f5 Fix compiler error because EntityPreRenderEvent only takes one float for deltaTime now 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
kberg-amzn 22ab484986 merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn 52004f6cb5
Merge pull request #4120 from aws-lumberyard-dev/LYN6527_MoveMPSampleComponents_into_MultiplayerGem 
Move Multiplayer Sample Components into Multiplayer Gem
 4 years ago
kberg-amzn 011bd5d10e merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
kberg-amzn 8401ee409b merging latest development 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
AMZN-Olex bcc77d75db Merge branch 'development' of https://github.com/o3de/o3de into Network/olex/hierarchy_component_phase1_pr 4 years ago
kberg-amzn 6e84495975 Changes to make client and entity migration functional, needed in the event of a host quitting necessitating a host migration 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
Gene Walters 95a1b9c1a3 Minor commenting improvements based on PR feedback 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
puvvadar bc8ccde318 Merge branch 'development' of https://github.com/o3de/o3de into mp_blending_cleanup 4 years ago
puvvadar 67e2498a12 Update GetPrevious to behave similarly to Get when rewound on owning connection 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
Gene Walters ca5e26e2f9 Merge branch 'upstream/development' into LYN6527_MoveMPSampleComponents_into_MultiplayerGem 4 years ago
puvvadar f2841f2eba Fix interpolation logic errors in NetworkTransform 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
pereslav 454ae90afb Added a few whitespaces 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
kberg-amzn f1f35a0ba8
Merge pull request #4003 from aws-lumberyard-dev/MultiplayerRewindClear 
Multiplayer rewind clear
 4 years ago
pereslav a3dfb88696 Added support for instantiating network spawnables for any spawnables, not just root spawnable 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
AMZN-Olex 2be5854beb Cleanup 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex 2637fa45b8 Minor refactor to address CR 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex 9e31c3ebf5 Refactoring m_isDeactivating into m_isHierarchyEnabled 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
Gene Walters 0cda54c84d Fixing copyright headers. Also removing some #includes that HitVolumes didn't need 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
AMZN-Olex 714dc0a0e8 Refactoring away the use of AZ::TransformNotificationBus. Added unittests for deactivating parents of inner roots. 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
Esteban Papp 36b7cb2814 Merge branch 'development' into cmake/warn_virtual 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/Memory/HeapSchema.h
#	Code/Framework/AzCore/AzCore/Memory/HphaSchema.h
#	Code/Framework/AzCore/AzCore/Memory/MallocSchema.h
#	Code/Framework/AzCore/AzCore/Memory/OverrunDetectionAllocator.h
 4 years ago
Gene Walters 73b04d7e34
Network Input Exposed to Script (#3990) 
* NetworkInput now has new attribute called ExposeToScript. NetworkInput with this attribute set to True will be exposed to behavior context. Also added a CreateFromValues for the NetworkInput where scripters can create an instance of the MyComponentNetworkInput class which will eventually be passed around CreateInput and ProcessInput events.

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Adding Create Input event handler. SC can now receive the event to create input, and send it over the network

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Auto-component controller will now generate CreateInput/ProcessInput methods if they have input exposed to script, not ready for use yet, just stubbed in

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Reducing code replication by putting common network input variables into AutoComponent_Common.jinja

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Fix minor comment typo in the CreateInput method

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Small fix. Changing ebus call from MyComponentNameCreateInput to just CreateInput. It's part of the MyComponentRequestBus so adding the component name before CreateInput is noisy

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Cleaning with jinja a bit using macro calls to iterate over scriptable netinputs

Signed-off-by: Gene Walters <genewalt@amazon.com>

* ProcessInput will now be triggered in script

Signed-off-by: Gene Walters <genewalt@amazon.com>

* ProcessInput event is sent to script. Script can now create and process input. Tested locally with a simple script.

Signed-off-by: Gene Walters <genewalt@amazon.com>

* Created a seperate CreateInputFromScript and ProcessInputFromScript. Developers no longer need to remember to call the BaseClass::CreateInput and ProcessInput since CreateInputFromScript will automatically be called beforehand.

Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Gene Walters 3973e1d3e5 Moved NetworkCharacterComponent out of MPSample and into MP gem 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
AMZN-Olex fcd5b3f184 Converted to use AZ::Events for hiearchy notifications. Added unittests. 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex 0d8b0fe496 Fixes for clang builds 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex 853cffbf7b Comment cleanup 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex 2a10c400a7 Comments cleanup 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
Gene Walters 28ca59ae61 Moving NetworkHitVolumesComponent and NetworkRigidBodyComponent to the MultiplayerGem 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
AMZN-Olex aa6c038880 Hierarchical components, phase 1, unittests 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
pereslav 9b0e3f26b1 PR feedback addressing 2 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
pereslav 1f66e8a760 PR feedback addressing 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
pereslav a0ada8fcd3 Reworked net entities instantiation in order to fix entity references e.g. parent-child relationship. Note: Only entities within network spawnable keep the references until the ticket system refactoring is done 
Signed-off-by: pereslav <pereslav@amazon.com>
 4 years ago
kberg-amzn 0b7c4fff85 Clear rewound entities if we attempt to sync rewind state outside of a scoped rewind 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
Esteban Papp 4a972d96f9 Gems others 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
puvvadar c5d8c194df Cleaning up NetworkTime and reworking how we approach network interpolation 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
puvvadar de512db010 Determine blended timestamp on client plus minor API cleanup 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
Gene Walters ffd0bbc165 Merge branch 'upstream/development' into GitIssue3155_MultiplayerComponentsUsingNetInputRequirePlayerInputComponent 4 years ago
kberg-amzn e7f0853b0e
Merge pull request #3689 from aws-lumberyard-dev/ContainerReplicationAndStats 
Container replication and stats
 4 years ago
puvvadar 91eb7476eb Remove superfluous AutoPacket params 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
Steve Pham fa0f2a1007
Fix unused warnings release (#3677) 
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS

Signed-off-by: Steve Pham <spham@amazon.com>
 4 years ago
kberg-amzn b1faad8406 Merge remote-tracking branch 'upstream' into ContainerReplicationAndStats 4 years ago
kberg-amzn 99d71cfbc5 Added delta replication and stat tracking to vector and array network property container types, + some minor cleanup I ran into when looking for the best hook points for this functionality 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
puvvadar a5d9e2e22d
Merge pull request #3434 from aws-lumberyard-dev/mp_custom_handshake 
Move packet dispatch to return an enum that includes a pending option
 4 years ago
puvvadar ebbe4b99a4 Add const to some funcs and fix a comment 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
puvvadar decf15df21 Move packet dispatch to return an enum that includes a pending option 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp ea2f74dc0f more fixes for Gems 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
Esteban Papp b406129fd2 Another warning fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 4 years ago
puvvadar 80584a7130
Merge pull request #3310 from aws-lumberyard-dev/mp_serverrpc_bugfix 
Fix type error with Server to Authority RPC generation
 4 years ago
puvvadar 4e618db62d
Merge pull request #3082 from aws-lumberyard-dev/MultiplayerForwardDeclControllerErrorFix 
Fix Multiplayer AutoComponent Delete Incomplete Type Compile Error
 4 years ago
SergeyAMZN 5bc46fc676
Merge pull request #2639 from aws-lumberyard-dev/nvsickle/NetworkingActivationOrder 
Ensure network autonomy gets set before entity activation
 4 years ago
SergeyAMZN 2f48973921
Merge pull request #3327 from aws-lumberyard-dev/MPWeaponsSQ 
Added the ability to look up a Net Entity ID for a given AZ Entity ID
 4 years ago
puvvadar 41ec5c6ddd Fix one more jinja issue with IsProtected in RPCs 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
puvvadar 99317a4ad1 Update naming to match other functions in jinja header 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
puvvadar cbf612d4e7 Update naming to match other functions in jinja 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
puvvadar ec351c9fce Correct jinja logic slightly 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
puvvadar bef2e1400c Add check for Client invocation in jinja 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago