birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,651 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 'de41653d26'
${ noResults }
Commit Graph

435 Commits (de41653d26e87eed74f1d8d71009a2d44715b40c)

Author SHA1 Message Date
Stephen Tramer 396edd22fb
Merge pull request #4461 from aws-lumberyard-dev/LYN-7080_FixEditorServerConnectionRaceCondition 
Fix EditorServer Connection
 4 years ago
AMZN-Olex ecd358a53e Cleaning up 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex a114077e72 Final touches on the first pass of imgui hierarchy debugger 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
AMZN-Olex 77c23b6c8f Hierarchy imgui debugger, first take 
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
 4 years ago
Gene Walters 7e6d35b046 small fix to include using <> 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Gene Walters b464ff966c merging latest dev + resolving 1 merge conflict 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Gene Walters 50fe8bc04d pass in AZ::Utils::GetProjectPath().c_str() directly since converting projectpath is not needed 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
Gene Walters d36041d1b7 Update based on feedback. Adding event to MPSystemComponent for receiving a server acceptance packet. The editor system component subscribes to this event and tells the server we're ready for entity updates 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 4 years ago
puvvadar 170a32d667 Merge latest to mp_handshake_conndata 
Signed-off-by: puvvadar <puvvadar@amazon.com>
 4 years ago
kberg-amzn 5acb360fbb
Merge pull request #4253 from aws-lumberyard-dev/MigrationFixup 
Migration fixup
 4 years ago
kberg-amzn 66ab15a4b6 Removing old EntityReplicationManager.h that got re-added, this has been moved to public includes 
Signed-off-by: kberg-amzn <karlberg@amazon.com>
 4 years ago
Gene Walters 73891c71b7 Fix EditorServer connection by ensuring that SendReadyForEntityUpdates is only called after a handshake is finished and the editor has accepted the editorserver's connection. Also allow engine-centric projects to use editor-server by passing in the project-path when launching the editor-server. Also allow devs to set sv_defaultPlayerSpawnAsset from inside the editor and it'll be used by the editor-server 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 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
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