Commit Graph

2021 Commits

Author SHA1 Message Date
sconel 2dee4d3ac9 Add support to export nested container entities. Resolves missing parents in spawnables 2021-06-09 17:37:41 -07:00
scottr 5061241992 [cpack/stabilization/2106] early out if sys import fails in PythonBindings::StartPython 2021-06-09 17:03:13 -07:00
AMZN-koppersr 4f4cb4e220 Merge branch 'stabilization/2106' into JsonSerialization/UnsupportedWarnings 2021-06-09 17:02:25 -07:00
lumberyard-employee-dm a9e59fd75f Updating the DefaultProject template to not insert the project-path parameter (#1223)
* Updating the DefaultProject template to not insert the project-path parameter into the VS Debugger Arguments for any applications

Added project-path injection directly within the LauncherUnified and AssetBuilder cmake scripts where their targets are defined

* Removing the add_vs_debugger_arguments call from the AutomatedTesting CMakeLists.txt
2021-06-09 18:50:47 -05:00
cgalvan da4e006621 Merge pull request #1227 from aws-lumberyard-dev/cgalvan/RemoveUnhandledEventMessages
[LYN-3145] Removed unnecessary spam message from legacy CEntityObject class when entering game mode.
2021-06-09 18:49:15 -05:00
AMZN-koppersr 773dc42537 Merge pull request #1228 from aws-lumberyard-dev/Prefab/EntitySpawnNotificationRemoval
Removed AddOn(De)SpawnedHandler from Spawnable Entities Interface
2021-06-09 16:42:08 -07:00
Terry Michaels 05d177568c Fixed cut & paste error of menu item name (#1230) 2021-06-09 18:33:12 -05:00
AMZN-nggieber 5330309cb1 Set Desktop Icon for Project Manager (#1225)
* Set executable icon for O3DE
2021-06-09 16:01:48 -07:00
Terry Michaels aa7bab1027 Make SimpleAssetPropertyHandler handle showing the edit button on component cards (#1221) 2021-06-09 17:47:35 -05:00
scottr 2eefc08d2e [cpack/stabilization/2106] fixed startup crash in project manager from installer build 2021-06-09 15:21:30 -07:00
Chris Galvan 6ac13c19a3 [LYN-3145] Removed unnecessary spam message from legacy CEntityObject class when entering game mode. 2021-06-09 16:32:15 -05:00
daimini d6d2cbae7e Merge branch 'stabilization/2106' into gitflow_210609 2021-06-09 14:26:29 -07:00
AMZN-koppersr 4ad0560d06 Removed AddOn(De)SpawnedHandler from Spawnable Entities Interface
The calls AddOnSpawnedHandler and AddOnDespawnedHandler were removed from the SpawnableEntitiesInterface. These functions will eventually be called from multiple threads and AZ::Event currently doesn't have a thread-safe version to support this. There's also a performance concern as these callbacks are called for each individual (de)spawn requests which can lead to multiple handlers being called without information that's relevant to the callback. It would be better to batch up all (de)spawn requests per ProcessQueue call and only have a single event do a single signal. Since both events are currently not being used they have been removed for now, but can be introduced -with the previously mentioned concerns in mind- when needed.
2021-06-09 14:22:40 -07:00
Terry Michaels 3c23f5fead Fixed size of Save As window (#1208) 2021-06-09 16:21:02 -05:00
AMZN-koppersr e3fe4705f6 Post merge and Linux fixes. 2021-06-09 13:44:18 -07:00
Esteban Papp 47205d088f SPEC-2513 Fixes to enable w4310 2021-06-09 13:05:45 -07:00
lumberyard-employee-dm 217eddc8bd Fixing the enable_gem.py and disable_gem.py commands (#1207)
* Fixing the enable_gem.py and disable_gem.py commands
The project path wasn't taking into account when querying for gems,
templates and restricted directories registered with the project

Fixing the cmake.py add_gem_dependency and remove_gem_dependency methods
to properly detect a gem within a `set(ENABLED_GEM ...)` cmake variable
Also updated the add_gem_dependency to add the gem right before the end
marker of ')'
Updated the remove_gem_dependency to remove each instance of a gem with
a content that is in between in the `set(ENABLED_GEM ...)` cmake
variable

* Correct Typo in manifest.get_registered doc string
2021-06-09 14:14:01 -05:00
AMZN-koppersr ccbb0f45f5 Merge branch 'stabilization/2106' into JsonSerialization/UnsupportedWarnings 2021-06-09 12:12:39 -07:00
AMZN-nggieber b26b472bba Fix Editor being opened twice by project (#1213) 2021-06-09 11:59:15 -07:00
Esteban Papp 68ffdd6714 SPEC-2513 Fixes to enable w4324 (#1197)
* Fix warning 4324

* warning that doesnt trigger anything

* missed warning
2021-06-09 11:33:13 -07:00
AMZN-koppersr 6063e3a391 Simplified Json Serializer registration code
Updated the Json Serializer registeration code in the RegistrationContext.cpp to use try_emplace instead of find + end check + insert.
2021-06-09 11:07:28 -07:00
AMZN-puvvadar 5bdf9e3c6d Merge pull request #1175 from aws-lumberyard-dev/mp_session_integ
Integrating AzFramework Session hooks to Multiplayer
2021-06-09 10:39:31 -07:00
srikappa-amzn 20dc47e6d0 Merge pull request #1198 from aws-lumberyard-dev/Prefab/RemoveFileSizeLimits
Remove file size limits when loading prefabs and prefab-based-levels
2021-06-09 10:05:45 -07:00
carlitosan 52425d0949 Merge pull request #1194 from aws-lumberyard-dev/carlito/stabilization/2106
Fixes for internal if-branch node parser bug  (LYN-4347) and exposing…
2021-06-09 09:57:54 -07:00
rhongAMZ 3fd2f1305f Selecting and deleting the level prefab root entity crashes editor (#1179)
Early remove the level instance from the entity id list in the delete function and duplicate function.
2021-06-09 09:15:09 -07:00
jjjoness fc33a0496d LYN-2509 Welcome page for active project when opening O3DE (#1187)
* First changes to ui

* Pre merge from main checkin

* Commit before merge from main

* Pre-merge from maon checkin.

* Commit before merge from main

* Commit before merge from main

* Pre merge from main.

* Old and new levels handled.

* New WelcomeScreenDialog.

* Fixed qss file errors.

* Removed unused file from cmake.

* Commit before change to development branch

* Final changes to WelcomeScreenDialog
2021-06-09 15:34:00 +01:00
igarri be21e585a0 Merge branch 'develop' into LYN-1767-AB 2021-06-09 11:42:31 +01:00
igarri 66bbcb08e5 Fixing Thumbnails preview from TableView 2021-06-09 11:02:09 +01:00
srikappa b23c95cab3 Removed the new added flavor of ReadFile and reused existing one 2021-06-08 17:58:59 -07:00
AMZN-koppersr dba1832821 Improved reporting on unsupported types by the Json Serialization
The Json Serialization currently doesn't support AZStd::any, AZStd::variant and AZStd::optional due to various JSON formatting concerns. This wasn't properly reported resulting in confusion about whether the missing functionality is intentional or a bug. This change makes this explicit with an error message.
As this solution uses a custom json serializer to report the issue, an option was added so it's possible to overwrite a serializer for a specific type.
This doesn't mean that the three listed types will never be supported. If/when a suitable format is found an implementation will be added.
2021-06-08 17:53:26 -07:00
srikappa 9dec723e33 Remove file size limits when loading prefabs and prefab-based-levels 2021-06-08 17:28:23 -07:00
chcurran 8cb6ef0721 Fix tmeplate arg names 2021-06-08 16:39:36 -07:00
chcurran 8d35a4255e Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106 2021-06-08 16:08:17 -07:00
Tom "spot" Callaway ef2d89a843 fix AzGenericTypeInfo template handling with clang 12+ (#833)
Co-authored-by: Tom spot Callaway <spot@fedoraproject.org>
2021-06-08 16:38:52 -05:00
Esteban Papp 4b3d0d1054 LYN-4327 [SDK] External Gem's aren't added to the project solution when using SDK (#1191)
* should pickup the external directories registered by the project

* Add support for AzTest and AzTestRunner in the SDK

* missing IMPORT_LIB

* Moved where .Assets targets get generated so they are visible in the SDK

* generate the Directory.Build.props in the right path

* excluding target on platforms that dont support it
2021-06-08 14:01:50 -07:00
chcurran a766e3af5c Fixes for internal if-branch node parser bug (LYN-4347) and exposing properties for AZStd::tuple (LYN-3910) 2021-06-08 13:54:25 -07:00
puvvadar fa55b495c4 Add handling for session provider ticket 2021-06-08 13:36:27 -07:00
Danilo Aimini 80f62d0523 LYN-3708 | Optimize Prefab instance propagation to stabilize UX (#700)
* Add instanceToIgnore to calls leading to instances being added to the queue for propagation.

* Change PrefabUndoEntityUpdate to make it so that the instance triggering the prefab template change is not reloaded on propagation, since it will already be up to date due to the way we generated the patch to begin with.

* Add FindPrefabDomValue utility function for paths

* Expose the level root prefab template id in the Prefab EOS Interface

* Fix Instance Alias Path generation to work with the new FindValueInPrefabDom function

* Stop reloading ancestors on propagation, and fix instance reloading so that the level dom is used (and overrides are preserved)

* Remove commented out code, refactor FindPrefabDomValue for paths (was handling an edge case incorrectly, and it's not even triggered)

* Fix issue with PathView reference - with PathView already being a reference, this resulted in a copy and triggered a warning during automated review builds.

* Additional fix to the build warning, remove redundant error message

* Revert changes to Instance::GetAbsoluteInstanceAliasPath(), as they were impacting serialization.

* Remove the dependency to the level root prefab template in the propagation code, climb up the hierarchy instead. This allows tests to work despite not using the EOS properly.
Also use PrefabDomPaths to retrieve the instance dom from the root dom instead of iterating.

* Remove now unused PrefabDomUtils function, extend optimization to link updates.

* Trigger a full instance propagation to correctly refresh alias references.
This is an issue in the test because some operations are called from the backend API and will not trigger propagation properly. Tests will soon be rewritten to more properly represent frontend workflows.

* Fixes lingering issues with propagation:
- Restores code that fixes the selection if entityIds have changed;
- Fixes Do() function on link update. Prefab containers will propagate correctly while still being stable during editing.

* Remove GetRootPrefabInstanceTemplateId (no longer necessary after the code has been rewritten)

* Fix optimization code to account for instances being removed and propagation being run out of order in Create Prefab undo.

* Renamed variable, added comments for clarity.

* Restore asserts on instance not being found; Rename Do to Redo for clarity; Add comments.

* Fixed incomplete comment.
2021-06-08 10:44:20 -07:00
amzn-sean 47e5c72f2e fixed missing methods in SC from Trigger and Collision events (#1185) 2021-06-08 18:20:34 +01:00
Danilo Aimini 2d1e47793d Move Duplicate menu items and shortcuts out of the Prefab Wip flag
Make duplicate prefab workflows available by default in Prefab mode.
2021-06-08 10:06:25 -07:00
Terry Michaels 0fcd6e84ec Added mechanism for viewpanes to request buttons on the main toolbar (#1189) 2021-06-08 12:02:02 -05:00
jonawals e2d601ad59 Merge branch 'TIF/Runtime' into TIF/Jenkins 2021-06-08 16:52:26 +01:00
jonawals dd93c42342 Fix missing keys 2021-06-08 16:49:49 +01:00
jonawals a9e6eaa57a Fix anon enum clash with uber files 2021-06-08 16:43:02 +01:00
jonawals 98670a21bc Fix missing copyright header 2021-06-08 15:42:49 +01:00
jonawals 6db9a00315 Merge branch 'TIF/Runtime' into TIF/Jenkins 2021-06-08 14:27:18 +01:00
jonawals a2a9c23c7c Merge branch 'main' into TIF/Runtime 2021-06-08 14:23:05 +01:00
jonawals 656aa528d8 Implement new handling of tiaf seed data 2021-06-08 13:39:37 +01:00
jonawals 7a884c85b3 Address PR comments 2021-06-08 12:19:07 +01:00
jonawals 9e187d67a4 Fix typo with delete files filter 2021-06-08 12:08:42 +01:00