Commit Graph

3010 Commits

Author SHA1 Message Date
puvvadar 1d6c69dea2 Merge main to mp_session_integ 2021-06-03 15:36:45 -07:00
puvvadar c55f65b78f Integrate parts of Session Server API 2021-06-03 15:35:16 -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
AMZN-mnaumov c155271167 Merge pull request #1095 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15692
[ATOM-15692] Ebus for registering custom feature processors for thumbnail generation
2021-06-03 13:29:37 -07: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
amzn-mgwynn 77d861c124 Merge pull request #1108 from aws-lumberyard-dev/Prism/gem-db
Prism/gem db to main. Adding ability to modify project settings (display name, origin, icon, summary, user tags) through the o3de CLI with edit-project-properties using a project path or registered project name.
2021-06-03 16:10:56 -04:00
lumberyard-employee-dm 1245e0b327 Adding Tools and Builders alias to the DccScriptingInterface gem targets (#1087)
* Adding a Tools and Builders variant to the DccScriptingInterface gem target to allow it to be used as a gem in the AtomTest project

* Adding support to ly_create_alias to be able to specify an alias with no
dependencies
Updated the SettingsRegistry.cmake generation code to support generating
a Gem target entry in the cmake_dependencies.*.setreg file when an
interface library with no dependencies is parsed
2021-06-03 15:02:03 -05:00
Eric Phister 1b8810b963 Remove Project namespace from project template (#1124)
In the enabled_gems.cmake file, can remove the Project:: namespace on
the project module because it's treated the same as a Gem module now.
2021-06-03 14:52:21 -05:00
lumberyard-employee-dm dce87534c7 Removing the Pyside implementation of the project manager python scripts (#1112)
* Removing the Pyside implementation of the project manager python scripts

* Removing reference to the scripts/project_manager directory 

The Install_common.cmake script reference to the project_manager directory has been removed.
2021-06-03 14:37:16 -05:00
mgwynn e99a95d909 Added copyright header for validation 2021-06-03 15:02:18 -04:00
mgwynn 7bba5ed2fc Incorporated suggestion to use setdefault to handle missing tag property rather than explicitly checking for and creating it. 2021-06-03 14:43:13 -04: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
mgwynn 6681a53768 Add the ability to remove tags. Updated some descriptions, and updated some log messages to include parameters. 2021-06-03 14:13:44 -04: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
Vincent Liu ba02652e63 [LYN-4200] Fail and log error if required aws config file is not found (#1099) 2021-06-03 10:59:11 -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
mnaumov 8704b9233a build fix 2021-06-03 10:53:00 -07:00
Qing Tao c009e7d50b ATOM-4782 [Material] Transparent pass is using StandardPBR_Forwardpass shader with incorrect SRG (#1103)
Removed TransparentPassSrg until we have pbr shaders TransparentPassSrg
2021-06-03 10:42:20 -07:00
mgwynn 5838975d62 Incorporating review comments. Minor formatting changes and changes to parameter descriptions.
Removed try-catch for property modification and added creation of user_tags element if it does not exist
but is modified through CLI
2021-06-03 13:29:51 -04:00
Gene Walters 8666ca6467 Merge pull request #1119 from aws-lumberyard-dev/SPEC7150_AllowScriptCanvasUsersToSendRPC
SPEC-7150 Allow Script Canvas Users to Send RemoteProcedures via EntityId
2021-06-03 10:10:54 -07:00
Chris Galvan eef5122ce5 [LYN-3008] Only register the Slice Relationship View when prefabs are disabled. 2021-06-03 11:56:20 -05:00
Tommy Walton d56688e6cd Adding a file that was missed when merging PR 481 from 1.0->main. Also, updated the comment a bit (#912) 2021-06-03 09:41:31 -07: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
Gene Walters cd619e14dc Allow script canvas users to send RPCs via entityId 2021-06-03 08:31:38 -07:00
Tom Hulton-Harrop cf08f4dab1 Improve camera orbit behavior (#1060) 2021-06-03 15:48:44 +01:00
Terry Michaels f2a7cd9a2d Fixed monolithic build warning/error (#1116) 2021-06-03 08:29:24 -05:00
clujames 2da7825e37 Merge pull request #1042 from aws-lumberyard-dev/LYN-3969
Added an optional variable to the cdk deploy function to allow additional flags and arguments.
2021-06-02 19:53:07 -07:00
Gene Walters 89b1afc50e Adding Multiplayer:: namespace to RpcIndex so components outside the Multiplayer gem can compile 2021-06-02 19:37:35 -07:00
karlberg afeea87862 Fix for linux being a banned keyword 2021-06-02 19:21:39 -07:00
mgwynn 35fed77223 Adding CLI script for modifying project properties (LYN-3918). Updating O3de to support it.
Fixing some typo errors in manifest.py and minor optimizations
2021-06-02 21:56:03 -04:00
rgba16f bb92e4c0b8 Font update to dynamic draw per view (#1085)
* Move AtomFont over to use the new per viewport dynamic draw context.

Remove scene tracking and listening for bootstrap scene created.
Remove build dependency on the Bootstrap gem.
Add build dependency on the AtomBridge gem.
FFont's are now initialized with a viewport Id.
Remove previous DynamicDraw context per scene system.
Verify FFont can get a dynamic draw context before attempting initialization.
Ensure a render scene exists before attempting font initialization (as a proxy for rendering has begun)

* Move AtomFont FFont to use ShaderInputNameIndex's

This allowed removing all of the InitFont function as no longer need to query compiled shader info for constant data offsets.

* cache the AZ::Name used to find the dynamic draw context rather than recreate it each use
2021-06-02 19:49:38 -05:00
Qing Tao 312c704ba6 ATOM-15352 Find a solution to modify a render pipeline when enable a feature gem (#960)
* Added atom_rpi_tools python module in Atom_RPI gem.
The tool includes functions to modify pass template data and some utility functions.
* Added pytest tests for atom_rpi_tools
2021-06-02 17:39:50 -07:00
pereslav e445c64321 Fixed TimedThread bled %d ms logging to not spam the console 2021-06-03 01:21:27 +01:00
pereslav bffb7d1b28 Simplified the change to rely on sv_port cvar 2021-06-03 01:20:22 +01:00
pereslav 3b519c6475 removed whitespace 2021-06-03 01:06:15 +01:00
pereslav c752b9d0fc Fixed ctrl+g port number. Enabled server spawn for levels with no network entities since we can spawn net entities from the scripts 2021-06-03 01:04:01 +01:00
Esteban Papp f1dbeb584a LYN-4206 CMake bakes install prefix during configure (#1100) 2021-06-02 16:50:18 -07:00
srikappa-amzn 39e47a2906 Merge pull request #1036 from aws-lumberyard-dev/DetachPrefab
Implement Detach Prefab workflow
2021-06-02 16:24:59 -07:00
karlberg 38853eb2c2 Linux build fix 2021-06-02 15:34:35 -07:00
karlberg 82f9d08cfd Build fix for uniform scale changes 2021-06-02 15:21:43 -07: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
karlberg b013d7ac67 Minor cleanup 2021-06-02 14:53:33 -07:00
karlberg 8ef2bd7518 Turn off desync debug by default, as this explodes network input sizes 2021-06-02 14:47:05 -07:00