Commit Graph

56 Commits

Author SHA1 Message Date
karlberg e8917e0f06 Fix for format string type mismatch 2021-05-07 10:36:34 -07:00
karlberg 05a39a4412 Fix several build failures 2021-05-07 09:54:49 -07:00
karlberg b2b632aede Bug fixes for stats and for sending rpc and property updates from the client 2021-05-06 19:39:31 -07:00
karlberg 4b1fe9b10b Fix a comment and minor optimization to the server to client replication window 2021-05-06 17:35:48 -07:00
karlberg e7f0bc9ee2 Local prediction player controller is now functional 2021-05-06 17:23:03 -07:00
karlberg 751d13dd7b Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-05-05 20:07:49 -07:00
karlberg a1fe8fe419 Ported the local prediction player controller component 2021-05-05 20:07:16 -07:00
pereslav f4bd72880e Fixed tabs 2021-05-05 14:28:45 +01:00
pereslav 30625cf5d3 merge from main 2021-05-05 00:09:25 +01:00
pereslav e414cc151d SPEC-6590 Implemented network entities instantiation by network spawnable asset ID 2021-05-05 00:00:06 +01:00
karlberg d0a561fa01 merging latest origin 2021-05-03 21:27:27 -07:00
karlberg 822368ef01 Changes to get visibility system working again in-game 2021-05-03 16:26:11 -07:00
puvvadar 8fc0b84d99 Merge branch 'main' into mpgem_editor 2021-04-29 15:14:28 -07:00
pereslav 85e46a5f10 Merge branch 'main' into MultiplayerPipeline 2021-04-29 16:53:36 +01:00
pereslav 7e633d907e Enabled NetworkPrefabProcessor for Ctrl+G 2021-04-29 16:26:13 +01:00
lumberyard-employee-dm 3dec5d3b71 LYN-2537 engine assets (#254)
* LYN-2537 Moved the Engine and Editor folder to be within the EngineAssets folder

* Fixed Documentation in bootstrap.cfg to correct the path to the user project specific registry file

* Adding a newline to the output of AssetCatalog 'Registering asset..., but type is not set' message

* Updating the AssetProcessorPlatformConfig.setreg Scan Folder to detect
the @ENGINEROOT@/EngineAssets/Engine path for engine runtime assets and
@ENGINEROOT@/EngineAssets/Editor path for engine tool assets

* Updating references to Icons and other assets to account for moving the
Engine and Editor folder under a single EngineAssets folder

* Moving the Engine Settings Registry folder from Engine/Registry -> Registry

* Removed the LY_PROJECT_CMAKE_PATH define as it is not portable to other locations. It is hard coded to the project location that was used for the CMake configuration. Furthermore it paths with backslashes within it are treated as escape characters and not a path separator

* Updated the LyTestTools asset_processor.py script to copy the exclude.filetag from the EngineAssets/Engine directory now

* Fixed Atom Shader Preprocessing when running using an External Project

* Updated the TSGenerateAction.cpp to fix the build error with using a renamed variable

* Updated the Install_Common.cmake ly_setup_others function to install the
EngineAssets directory and the each of the Gem's Assets directory while
maintaining the relative directory structure to the Engine Root
Also updated the install step to install the Registry folder at the
engine root

* Fixed the copying of the Registry folder to be in the install root, instead of under a second 'Registry' folder

* Moving the AssetProcessorPlatformConfig.setreg file over to the Registry folder

* Updated the LyTestTools and C++ code to point that the new location of
the AssetProcessorPlatformConfig.setreg file inside of the Registry
folder

* Renamed Test AssetProcessor*Config.ini files to have the .setreg extension

* Converted the AssetProcessor test setreg files from ini format to json
format using the SerializeContextTools convert-ini command

* Updated the AssetProcessor CMakeLists.txt to copy over the test setreg files to the build folder

* Updated the assetprocessor test file list to point at the renamed AsssetProcessor*Config setreg filenames

* Removed the Output Prefix code from the AssetProcessor. The complexity that it brought to the AP code is not needed, as users can replicate the behavior by just moving there assets underneath a another folder, underneath the scan folder

* Adding back support to read the AssetProcessorPlatformConfig.setreg file from the asset root. This is only needed for C++ UnitTests as they run in an environment where the accessing the Engine Settings Registry is not available

* Updating the Install_common.cmake logic to copy any "Assets" folder to
the install layout.
The Script has also been updated to copy over the "Assets" folder in the
Engine Root to the install layout instead of an "EngineAssets" folder

* Updating References to EngineAssets source asset folder in code to be the Assets source folder

* Moved the Engine Source Asset folder of 'EngineAssets' to a new folder name of 'Assets'. This is inline with the naming scheme we use for Gem asset folders

* Adding the EngineFinder.cmake to the AutomatedTesting project to allow it to work in a project centric manner

* Updating the LyTestTools copy_assets_to_project function to be able to copy assets with folders to the temporary project root
Fixed an issue in LyTestTools where the temporary log directory could have shutil.rmtree being called twice on it leading to an exception which fails an automated test

Updated the asset_procesor_gui_tests_2 AddScanFolder test to not use the
output prefix, but instead place the source asset root into a
subdirectory

* Correct the AssetProcessorPlatformConfig Scan Folders for the EngineAssets directory to point at the Assets directory

* Updated the asset procesor batch dependency test scan folder to point at the 'Assets' folder instead of 'EngineAssets'
2021-04-28 21:38:43 -05:00
puvvadar 0dfd635b27 Merge branch 'main' into mpgem_editor 2021-04-28 15:51:53 -07:00
puvvadar bd435e2abb Build MP Editor RequiredSystem Components off standard version 2021-04-28 15:11:35 -07:00
karlberg 6bb51bd9e4 Merging latest origin 2021-04-27 19:14:11 -07:00
karlberg a73d25dfe6 One more broken component causing atom tests to crash + some extra PR feedback 2021-04-27 16:54:01 -07:00
karlberg 2fc710d73b Addressing PR feedback 2021-04-27 16:03:39 -07:00
karlberg 138b10c902 Unity build fixes 2021-04-27 14:19:41 -07:00
karlberg 51e8b21a0e Clang compile fix 2021-04-27 14:04:36 -07:00
karlberg b6a710a7fa Fixing more merge issues 2021-04-27 13:21:59 -07:00
karlberg 8cb1edb7d7 Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics 2021-04-27 11:37:56 -07:00
pereslav e3b016deba PR feedback addressing 2021-04-27 14:57:36 +01:00
puvvadar 925928bb20 Add MultiplayerEditorGem to clean up logic plus misc. cleanup 2021-04-26 17:28:49 -07:00
pereslav 008c653524 Added ReadyForEntityUpdates message allowing the server to send entity updates 2021-04-26 13:30:35 +01:00
karlberg 590785e4ad Stats are up, but require a ton of presentation polish to be more useful 2021-04-22 20:06:55 -07:00
puvvadar 8d84737743 Disable Ctrl+G server launch by default 2021-04-22 17:57:54 -07:00
puvvadar 0ddf6cd6d2 Merge main to mpgem_editor 2021-04-22 17:51:30 -07:00
karlberg 9b78646397 Missed these changes 2021-04-22 14:35:51 -07:00
karlberg c8bc5b7463 Initial work on multiple gem multiplayer components 2021-04-22 14:35:24 -07:00
pereslav c920e98da7 Added optional activation of selective entities spawning 2021-04-22 17:29:49 +01:00
karlberg f26d7f9301 First crack at the multiplayer component registry to allow multiplayer components to live in any gem 2021-04-21 12:47:48 -07:00
pereslav 374f690b5d tabs/whitespace fixes 2021-04-21 13:34:44 +01:00
karlberg 7adbdb2889 Fix some include paths after rename/refactor 2021-04-20 18:37:53 -07:00
karlberg 55304c8b9c Renamed Multiplayer.Imgui to Multiplayer.Debug 2021-04-20 18:00:39 -07:00
karlberg a2094e7308 Removing debug pragma 2021-04-20 17:20:37 -07:00
pereslav 2b6b4f5d17 Removed OnEntityAdded/OnEntityRemoved from NetworkEntityManager 2021-04-20 17:49:17 +01:00
puvvadar 0a1f0f5698 Merge branch 'main' into mpgem_editor 2021-04-19 17:26:45 -07:00
karlberg 4e75a099b8 Initial Imgui debug display for stats, some hookup between entity replication and the spawnable code to make testing possible 2021-04-17 19:06:28 -07:00
karlberg 0ce18593d2 Merging latest main 2021-04-15 17:40:21 -07:00
pereslav 4962218d29 Refactored root spawnable instantiation, added selective instantiation of root spawnable entities 2021-04-16 00:19:43 +01:00
puvvadar 2309c06709 Fix merge error in MP Gem Module 2021-04-15 14:37:15 -07:00
pereslav a5fdbddeda Merged MultiplayerPipeline from CodeCommit 2021-04-15 20:24:50 +01:00
karlberg 45faa26ffd Some initial updates for eventual support of locally predicted input processing 2021-04-14 17:50:04 -07:00
karlberg 88120999f9 Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-04-14 17:47:58 -07:00
puvvadar d1a65c8dc4 Merge main to Multiplayer Editor branch 2021-04-14 16:25:53 -07:00
puvvadar fa781fabc5 Add MultiplayerGem Editor components for Ctrl+G support 2021-04-14 16:20:45 -07:00