Commit Graph

293 Commits

Author SHA1 Message Date
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
Chris Galvan 7677f2b49d Fixed additional copyright header issue from latest development pull
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 17:36:22 -05:00
Chris Galvan f47e71da36 Merged conflicts from pulling down latest development
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 16:29:27 -05:00
SergeyAMZN 0a957fb03a Merge pull request #1762 from aws-lumberyard-dev/MultiplayerEditorFixes2
LYN-4866 Fixed net entities indices when creating net spawnable
2021-07-02 21:31:42 +01:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
pereslav d17390befb LYN-4866 Fixed net entities indices when creating net spawnable
Signed-off-by: pereslav <pereslav@amazon.com>
2021-07-02 16:01:30 +01:00
lumberyard-employee-dm 2478c60793 Fixed several o3de python package and install layout issues (#1714)
* Updated the CrashLog directory path to save to the project user
directory instead of the engine-root directory

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

* Removing the custom OUTPUT_NAME for the Multiplayer Gem Builder target

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

* Changed the default value for the LY_3RDPARTY_PATH cache variable to be
~/.o3de/3rdParty

This simplifies the first time user experience when running cmake

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

* Fixed Windows only issue where using creating a VS Solution for an O3DE project on a different drive resulted in an unloaded "<drive letter>:" entry appearing in the solution explorer

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

* Refactored install layout logic for External Subdirectories

Instead of performing a regular expression over the Gems/* directory, now the each external subdirectory including the project (external) directory is recursied over and scanned for any folders that aren't excluded.
By default those folders are the [Cc]ache, [Bb]uild and [Uu]ser directories

Afterwards the list files to copy over are then split into a directory list and a file list that is filtered by an include regex
Next the directory list is iterated over and the directories are copied to the install layout
Finally the file list is iterated and the list of files are also copied to the install layout

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

* Fixed the o3de.bat script changing the working directory before running the o3de.py script

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

* Fixed exception in engine-template.py script when the create-gem command
is invoked with the --template-name parameter that does not correspond
to a registered Template

Updated the create-project command to register the project with the
o3de_manifest.json and the engine with the project as the final step

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

* Fixed register.py over-registration of non-engine directories when then
--this-engine parameter is supplied.
All the projects, gems and templates inside of the default o3de_manifest
folder locations were being registered with the engine that was being
registered

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

* Fixed register.py register_project_path() method to return 0 when the
project path is successfully registered.

This issue was that the save_o3de_manifest method "return" value was
being checked and that method doesn't actually return a value

Added question mark to the engine_template.py to correct text around
notifying the user if the project was registered

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

* Added doc comment on the new cmke ly_get_vs_folder_directory function()

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

* Added clarifying comment to the ly_setup_others() command logic to copy over directories and files from any external subdirectories(Gems) that are registered with the engine at the time of install

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

* Fixed infinite recursion when trying to create a template with the
source directory used to seed the template

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-07-02 00:22:12 -05:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
AMZN-Olex d7bfd34a67 IFilterEntityManager work
Signed-off-by: AMZN-Olex <5432499+AMZN-Olex@users.noreply.github.com>
2021-06-30 19:18:06 -04:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
2021-06-30 13:20:07 +01:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
puvvadar d6629eea2e Fix order of ops issue in MP Session Termination 2021-06-24 13:56:16 -07:00
Olex Lozitskiy be56cf648d sig/network - bugfix - removal of player prefabs on disconnect
sig/network - bugfix - removal of player prefabs on disconnect
2021-06-24 15:01:41 -05:00
sconel 2a1a523091 Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash
Fix issue where new projects would crash when exiting game mode
2021-06-24 10:50:09 -07:00
SergeyAMZN ba80c102b5 Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
SPEC-7469 Fixed EditorServerInfo packet serialization
2021-06-24 16:56:52 +01:00
pereslav 6b1d3d1f9a SPEC-7469 Multiplayer Editor Ctrl+G fails due to EditorInfo packets reordering. SPEC-7471 Multiplayer Editor Ctrl+G asserts after CreateEntitiesImmediate 2021-06-24 01:12:19 +01:00
sconel f91e640741 Fix issue where new projects would crash when entering game mode 2021-06-23 16:57:57 -07:00
AMZN-Olex 5a061e409d Fixed EntityDelete messages 2021-06-23 18:00:13 -04:00
puvvadar 632d774d4c Add disconnect type param to Terminate 2021-06-23 11:44:21 -07:00
puvvadar bda758a9c5 Adjust cleanup logic to handle Session events more cohesively 2021-06-23 10:56:22 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
AMZN-Olex 93a34033a9 Correcting tabs 2021-06-23 13:21:54 -04:00
AMZN-Olex b9dec79743 Clean up 2021-06-23 11:04:25 -04:00
pereslav 970dcea16e SPEC-7469 Fixed EditorServerInfo packet serialization 2021-06-23 15:29:31 +01:00
AMZN-Olex e5aa56d565 Added a runtime switch to turn on/off removal of player spawnable on disconnect 2021-06-23 09:38:43 -04:00
AMZN-Olex 35364c9403 Fixing a nullptr crash in NetworkTime 2021-06-22 23:13:23 -04:00
AMZN-Olex f79cca6f9d Corrects ReplicationSet to be ordered so that logic in EntityReplicationManager::UpdateWindow is correct 2021-06-22 16:43:21 -04:00
Mike Balfour 9aa44a56e7 Merge pull request #1489 from aws-lumberyard-dev/mbalfour/gitflow_210622
Integration from stabilization/2106 at commit d5490ecf69 .
2021-06-22 15:14:22 -05:00
AMZN-Olex 0f05791bd8 Corrects ReplicationSet to be ordered so that logic in EntityReplicationManager::UpdateWindow is correct 2021-06-22 15:30:38 -04:00
AMZN-Olex fd021f065a Fixes to codegen to avoid nullptr access during disconnects 2021-06-22 14:56:10 -04:00
AMZN-Olex fcbec8c202 Fixed removal of player's prefab on disconnect 2021-06-22 14:55:45 -04:00
mbalfour df648db62e Merge branch 'stabilization/2106' into mbalfour/gitflow_210622
# Conflicts:
#	Code/Framework/AzQtComponents/AzQtComponents/Components/Style.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Viewport/ViewportMessages.h
#	Gems/AWSCore/Code/Source/Editor/UI/AWSCoreEditorMenu.cpp
2021-06-22 12:55:18 -05:00
AMZN-puvvadar 0186911a3a Merge pull request #1425 from aws-lumberyard-dev/mp_systemcomp_cleanup
Cleanup and consolidate MultiplayerSystemComponent and add StopListening to AzNetworking
2021-06-22 10:03:20 -07:00
puvvadar 55f5e9f0ae Remove unnecessary forward declare 2021-06-22 09:25:29 -07:00
Olex Lozitskiy 706cf0e9c3 sig/network - Fixes EntityReplicationManager::UpdateWindow logic
Corrects ReplicationSet to be an ordered map
2021-06-22 06:09:16 -05:00
AMZN-Olex ece1187683 Corrects ReplicationSet to be ordered so that logic in EntityReplicationManager::UpdateWindow is correct 2021-06-21 20:28:43 -04:00
puvvadar f2bc80d103 Remove obvious comment 2021-06-21 14:53:19 -07:00
puvvadar f49e5cf645 Validate some base cases in InitializeMultiplayer 2021-06-21 14:49:49 -07:00
puvvadar 3a7df983d9 Cleanup listen and connect logic to prevent log spam 2021-06-21 14:31:14 -07:00
puvvadar 8f5681ffdb Add GetActiveConnectionCount to IConnectionSet 2021-06-21 11:46:16 -07:00
Gene Walters 530573abf3 Merge pull request #1424 from aws-lumberyard-dev/SPEC7185_RenamingIsNetEntityRoleMethods
Updating IsNetEntityRole Helper Methods for Clarity
2021-06-21 08:53:23 -07:00
Gene Walters 526a0f1289 Fix for Jenkins Validation: removing tabs and removing unwanted spaces. 2021-06-20 20:51:59 -07:00
Stephen Tramer b78fa5eed4 Merge pull request #1372 from aws-lumberyard-dev/stramer/az-networking-docs
Networking libraries + Gems API documentation
2021-06-18 15:53:42 -07:00
nvsickle e55580af57 Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18 2021-06-18 13:25:53 -07:00
stramer 673495c49d Address additional review comments.
Signed-off-by: stramer <169061+sptramer@users.noreply.github.com>
2021-06-17 18:01:44 -07:00
puvvadar 04387be083 Remove some redundant includes, forward declares and similar pieces 2021-06-17 16:25:44 -07:00
puvvadar a748c2e152 Cleanup and consolidate MPSystemComponent and add StopListening to AzNetworking 2021-06-17 16:17:36 -07:00
Gene Walters b9dd7a1ecd Updating IsNetEntityRole helper methods for more clarity. Also added tooltip scripting and comments for code 2021-06-17 16:16:38 -07:00
Gene Walters 4be9ce56c4 Merge pull request #1399 from aws-lumberyard-dev/CherryPickNetworkingFixes
Cherry pick networking fixes
2021-06-17 11:48:34 -07:00
Gene Walters 0810f353c6 Cherrypick 7adf5ca5a5911997102017e2db7981e7b2926100. Fixed assert for network prefabs when asset path was empty 2021-06-17 09:11:48 -07:00