Commit Graph

1074 Commits

Author SHA1 Message Date
Scott Romero 64872e024e [main] add 3rd party to engine registration
Merge pull request #1131 from aws-lumberyard-dev/default_3rdparty
2021-06-03 19:32:59 -07:00
scottr 9e7f8e45eb [default_3rdparty] fixed typo 2021-06-03 18:23:54 -07:00
scottr 08a2e50ee3 [default_3rdparty] missed updating a call to register 2021-06-03 16:28:15 -07:00
scottr d30fd8b1dd Merge branch 'main' into default_3rdparty 2021-06-03 16:24:55 -07:00
cgalvan deb3c5e74a [LYN-2446] Implemented support for duplicating instances. (#1097)
* [LYN-2446] Implemented support for duplicating instances.

* [LYN-2446] Addressed PR feedback.

* [LYN-2446] Addressed additional PR feedback.
2021-06-03 16:20:59 -07:00
lumberyard-employee-dm 816d05ef2d Updating manifest.py template query functions (#1113)
* Updating manifest.py template query functions
The get_project_templates, get_gem_templates and get_generic_templates
methods have been renamed to indicate that the methods return the
templates that can be used in a create-project, create-gem and
create-from-template command of the engine_template.py

Updated the print_registration.py script to support outputing project
specific gems and templates.
Add a unit test script for the manifest.py script.
Added unit test to validate the new functions:
`get_templates_for_project_creation`
`get_templates_for_gem_creation`
`get_templates_for_generic_creation`

* Implementing the project print registration methods

Added implementations of the project print registration methods and tested them locally
Removed implementations of the download print registration methods, since they have not went through app-sec review.

* Renaming get_restricted_data to get_restricted_json_data

Fixed the get_registered method in manifest.py when looking up projects

* Updated the print_manifest_json_data calls to return the result
2021-06-03 18:16:22 -05:00
scottr 85e6d06c2c [default_3rdparty] add 3rd party to engine registration + specific path registration fixes 2021-06-03 16:09:10 -07:00
carlitosan 96572888a9 Merge pull request #1125 from aws-lumberyard-dev/carlitosan-beta-fixes
Demo support updates and fixes to be integrated into main
2021-06-03 15:24:52 -07:00
Eric Phister 3634277317 Project dll is not loaded by the AP when opened from the launcher (#1123)
* Fixes locating the project dll when using SDK

SDK engine usage has project dll in the project build path, but
searching for module filepaths for loading would have a passing
SystemFile::Exists check but no full filepath was amended to the module.
This causes the module to fail to load.

* Fix locating project module for UnixLike platforms

Fixes the issue with project-centric workflows running GameLauncher, and
it opens AP which can't find the project dynamic module.  From AP's
perspective, the project module is not in the executable directory,
which is in engine bin.  The SystemFile::Exists check is true on the
file because it uses the 'cwd'.  In that situation, an absolute path
must be obtained for the module to be loaded.

* Add missing header to fix UnixLike builds

* Applies a suggested change from PR

Use operator-> on the AZStd::optional

* Add semicolon to a class macro line

Prevent auto formatting indenting the following line.
2021-06-03 16:15:46 -05:00
Danilo Aimini fda28bb7b2 LYN-1818 | [USE CASE] Reparenting between different prefab instances by drag/drop in the Outliner (#1088)
* Add the last known parent to the prefab undo cache to detect changes in the owning instance.
Still WIP.

* Progress in handling reparenting. Still WIP, need a change in CreateLink that will be addressed in a separate branch and then merged back.

* A few fixes, reparenting now works with entities. Still working on instances.

* Fix assert crashing the Editor because of the arguments being in the wrong order.

* Handle moving the patches when removing and recreating links when reparenting nested instances.

* Rearrange some code to prevent including instance removal in instance update undo node, as it would be redundant and cause errors in some edge cases.

* Reorder instance reparenting to account for correct order of operation during undo/redo

* Fix order of operations to support multiple operations in one edit (reparenting to non-container entities while changing instance)

* Add function to refresh patches on links to allow aliases to be restored correctly on reparenting.

* Removed RefreshEntityPatchOnLink function. Introduced a simpler way of handling porting patches.

* Removing unnecessary code that was left after testing.

* Minor fixes to naming and comments.

* Restore previous error, no longer printing the failed patch.

* Remove unused includes.

* Restore include removed by mistake.

* Simplified patches retrieval by using internal function. Renamed some internal functions and variables to be more accurate.
2021-06-03 14:02:40 -07:00
Mike Balfour d90a3d46a7 Support for nested slice conversions (#1121)
This set of changes enables conversions for singly-nested slices. Multiple nesting hierarchies are only partially supported at this point. Conversion is also significantly more deterministic, which makes it easier to convert single slices without needing to reconvert every slice or level that relies on it as well.
Changes:

- Added version of Instance::AddInstance() that takes in an alias to allow for deterministic aliases
- Added a "SliceConverterEditorEntityContextComponent" that's used to specifically disable entity activation on creation. The disabling is done this way vs adding a new public API, because the disable shouldn't be required in any normal case outside of this tool.
- Disabled more AWS gems for the SliceConverter, as they're unneeded and cause issues if they're around in the tool.
- Added a small null check to the Camera Controller.
- Added the actual support for slice instance conversion. This instantiates the entities, applies the data patches, turns them into a prefab instance, and generates a JSON patch out of the changes.
2021-06-03 15:59:45 -05:00
chcurran 46afeef77b Merge branch 'main' into carlitosan-beta-fixes 2021-06-03 13:14:33 -07:00
chcurran 0a9d6f5f0f Bug fixes and improvements brought over from demo work.
* Generic Multi Function Call ability added to extensible nodes
* Code gen improvements, including allowing for more manually codewritten extension of codegen facilities
* CVAR to disable automatic update of deprecated node
* Fixed variable sorting error that can apply to parser/runtime added variables
* Made Edit/SerializeContext ClassBuilder public, as it was needlessly private
* Fixed dangerous Datum::GetValueAddress(), it now checks for an empty storage AZSTd::any, as does Datum::Empty()
2021-06-03 13:13:22 -07:00
cgalvan b807eae416 Merge pull request #1122 from aws-lumberyard-dev/cgalvan/RemoveSliceRelationshipViewWhenPrefabsEnabled
[LYN-3008] Only register the Slice Relationship View when prefabs are disabled.
2021-06-03 13:21:38 -05:00
Esteban Papp 5d7aae9bd8 SPEC-2513 Fixes to enable w4459 (#1107)
* fixing w4459

* Fixes for nounity

* putting OLD_APARAM_USER in a common place to avoid duplicated declarations
2021-06-03 11:12:54 -07:00
rgba16f 54fdca353b Fix editor axis gizmo text rendering above gizmo
Add AzToolsFramework utility function to query the display scale for a viewport.
Use new function to fix the text location on the axis gizmo.
2021-06-03 12:54:14 -05:00
Chris Galvan eef5122ce5 [LYN-3008] Only register the Slice Relationship View when prefabs are disabled. 2021-06-03 11:56:20 -05:00
Esteban Papp 29c71b4e53 SPEC-2513 Fixes to enable w4701 (#1105)
* Some fixes

* more fixes

* fixes for debug
2021-06-03 09:30:33 -07:00
AMZN-puvvadar e340f3ca56 Merge pull request #1102 from aws-lumberyard-dev/MultiplayerPipeline
Fixed ctrl+g port number
2021-06-03 08:50:29 -07:00
kberg-amzn dbcb42b4c2 Merge pull request #1098 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components
2021-06-03 08:50:02 -07:00
Tom Hulton-Harrop cf08f4dab1 Improve camera orbit behavior (#1060) 2021-06-03 15:48:44 +01:00
pereslav e445c64321 Fixed TimedThread bled %d ms logging to not spam the console 2021-06-03 01:21:27 +01:00
srikappa 574563adaf Merge branch 'main' into DetachPrefab 2021-06-02 15:09:40 -07:00
karlberg 14bc0ba8ac Merge remote-tracking branch 'origin' into MultiplayerComponents 2021-06-02 14:57:00 -07:00
Danilo Aimini 8a7f156e2c LYN-4133 | Prefab Container Transform stores non-default values to template on Create Prefab (#1038)
* Show container transforms, reset container transform to zero before saving a prefab after create.

* Fix order of operations to prevent patching issues

* Reset the entity to the Identity Transform instead of the default constructor to correctly set the scale to 1.0
2021-06-02 14:45:43 -07:00
scottr c41283c3ec Merge branch 'main' into ftue_auto_register 2021-06-02 13:22:14 -07:00
Benjamin Jillich 5dff212398 Fixing non-unity build 2021-06-02 19:49:07 +02:00
Benjamin Jillich 1b96fc4361 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into prism/LYN-2514
# Conflicts:
#	Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp
2021-06-02 19:35:50 +02:00
AMZN-nggieber 8a28107299 Project Manager Setup Update Project Settings Screen and Flow
* Filled out and connected up UpdateProjectCtrl and UpdateProjectsSettingsScreen
2021-06-02 10:23:58 -07:00
Benjamin Jillich e7e85f91d6 Addressing PR feedback 2021-06-02 19:08:10 +02:00
AMZN-stankowi fc0de9e0e3 Added [[maybe unused]] to fix release build compile issue (#1090) 2021-06-02 09:36:34 -07:00
Esteban Papp 1f65c3ba3a LYN-4134 Automatically add --project-path=<project> to debugging parameters in Editor/AP for engine-centric (#1081) 2021-06-02 09:13:04 -07:00
Benjamin Jillich e6a8bf4689 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into jillich/prism/LYN-2514 2021-06-02 17:54:31 +02:00
Benjamin Jillich 39bb0bf2fc [LYN-2514] Create a new project control now reinits the gem catalog and enables gems based on the user selection 2021-06-02 17:53:49 +02:00
Benjamin Jillich b0ef89edf9 [LYN-2514] Update project control now reinits for the selected project and enabled/disables gems based on the user selection in the gem catalog 2021-06-02 17:53:02 +02:00
Benjamin Jillich f106273667 [LYN-2514] Adding functionality to reinit the gem catalog for a given project and enable/disable the changed gems
* Removed test data from gem catalog screen as we can now extract the real data.
* Reiniting the catalog to a project updates the filters, and clears and fills the gem model.
* Added functionality to enable/disable gems based on the user adjustments on the gem catalog.
2021-06-02 17:52:17 +02:00
Benjamin Jillich 53615230c1 [LYN-2514] Adding get engine gem infos to the python bindings 2021-06-02 17:49:40 +02:00
scottr 5554bdf329 [ftue_auto_register] use early return in registered engines loop instead of break 2021-06-02 08:46:57 -07:00
scottr 39d1f27021 [ftue_auto_register] post merge and linux build fixes 2021-06-02 08:39:57 -07:00
scottr 85fcac60a1 Merge branch 'main' into ftue_auto_register 2021-06-02 07:59:05 -07:00
Hasareej 274e1972f3 Adding a shortcut to hide clusters. (#1071)
Adding the shortcut "U" to hide the TransformModeSelection & SpaceSelection clusters from the viewport.
2021-06-02 15:54:30 +01:00
Benjamin Jillich 235cd1f937 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into jillich/prism/LYN-2514 2021-06-02 16:48:27 +02:00
Benjamin Jillich d467367103 Merge pull request #1058 [LYN-2514] Extending gem model & Item delegate changes enabled/disabled state in the gem model 2021-06-02 16:46:49 +02:00
jjjoness b0d06b9084 Changed logo and repositioned. (#1061) 2021-06-02 14:46:08 +01:00
Benjamin Jillich bcdb541b7c [LYN-2514] Sorting gems in the gem catalog after retrieving all gem infos
Added <operator() for sorting the gems after retrieving the list of all gems.
2021-06-02 13:29:10 +02:00
Benjamin Jillich ede8daaece [LYN-2514] Extending pythin bindings to adapt CLI changes for the gem catalog
* Added ExecuteWithLockErrorHandling() which returns an outcome with the actual error we get from python so that we can expose that to the UI.
* Added cmake pybind.
* Get gems now calling get_all_gems and alphabetically sorting the result.
* Added get enabled gems function which first gets the cmake enabled gems file path from the project path and then the list of gem names that are enabled.
* Some changes to the enable and disable gem functions.
2021-06-02 13:27:55 +02:00
jjjoness d02ba51d03 Changed svg and layout of the new logo. (#1059) 2021-06-02 10:34:08 +01:00
Benjamin Jillich 7b6226a8aa [LYN-2514] GemCatalog: Item delegate changes enabled/disabled state in the gem model
When clicking the button on the right side of the gem item delegate, it changes the enabled/disabled state of the gem in the model.
2021-06-02 08:07:16 +02:00
Benjamin Jillich 553318ed17 [LYN-2514] Extending gem model
* Added was previously added state for gems.
* Added helpers to add/remove gems from the model.
* Helpers for extracting the gem model indices to be added/removed.
2021-06-02 08:07:15 +02:00
Terry Michaels eab3db3d6d Fixed a few 'too big' dialog issues with various dialogs (#1083) 2021-06-01 20:19:12 -05:00