f23798a10a
Merge commit '58b6a9c1acfc4e1344e9d0b79b5572ef173c030c' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:30 -06:00
f6faad4adb
Merge commit '2fa10d7e6a99c38d578fe5ed969cfd07c5f0df28' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:24 -06:00
065a3144fc
Merge commit 'a60fba5bec8180ca4859be29d9c37ea0e14300bf' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:19 -06:00
a07534ea51
Merge commit '7e5115114ca9500abf67095acb71fbb6087d06c8' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:13 -06:00
efaa5d4d0f
Merge commit '197e7b95e1b217991c5599134b492dbecf9cedfc' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 14:43:08 -06:00
2c8a93fb9c
Merge commit 'a2bb968371194a92bdd6e2841f73c85a79ce2a20' into mbalfour/gitflow_211220_stabilization_2111RTE
...
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com >
# Conflicts:
# Gems/GraphCanvas/Code/Source/Translation/TranslationSerializer.cpp
# Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.cpp
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilder.h
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp
# Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerBus.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTrackerDefinitions.h
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp
# Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.h
# Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp
# Gems/ScriptCanvas/Code/Editor/Framework/ScriptCanvasGraphUtilities.inl
# Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasAssetHandler.h
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.cpp
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasBaseAssetData.h
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Assets/ScriptCanvasFileHandling.h
# Gems/ScriptCanvas/Code/Editor/Include/ScriptCanvas/Components/EditorScriptCanvasComponent.h
# Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp
# Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp
# Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp
# Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.h
# Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.h
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/FileSaver.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Modifier.cpp
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/Scanner.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Asset/ScriptCanvasAssetBase.h
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Core.h
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Graph.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionInterpretedAPI.cpp
# Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/Interpreted/ExecutionStateInterpreted.cpp
# Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake
2021-12-20 14:42:47 -06:00
9ee60e6eba
AWSI automation tests support on Linux ( #6278 )
...
* AWSI automation tests support on Linux
Signed-off-by: Junbo Liang <68558268+junbo75@users.noreply.github.com >
2021-12-20 12:15:52 -08:00
7cce6dde41
Hide the invalid parameters in the EnhancedPBR in the Material Editor ( #6298 )
...
* Hide the invalid parameters in the EnhancedPBR in the Material Editor
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
* Fixed headers
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-20 14:09:00 -06:00
79fcef41b3
Merge commit '40e1116e26628849c91fc450f4ce2c3720aca297' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:24 -06:00
22df3a843e
Merge commit '6613030fe691d87c3a870f17c448746616c44787' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:19 -06:00
d586d5f80c
Merge commit 'ac03b6f50b3b417f723bb4d0699d254dc3edc78d' into mbalfour/gitflow_211220_stabilization_2111RTE
2021-12-20 13:49:13 -06:00
bb14675db7
Fix tests Debug ( #6405 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-12-20 16:53:41 +00:00
d5b9cf10cf
Collection of miscellaneous PAL changes required for restricted platforms. ( #6482 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-12-20 08:15:10 -07:00
fea4d0e6b1
adding TimeSystem unit tests ( #6446 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-12-20 14:32:25 +00:00
15c6f6a4a8
When the tag of Region Force component changed，the AABB of the
...
component should be appended to m_pendingAabbUpdates of local wind
handler in wind bus after the wind provider delete the Force Region
entity.
Signed-off-by: T.J. McGrath-Daly <tj.mcgrath.daly@huawei.com >
2021-12-20 09:48:46 +00:00
e58d8815f1
chore: add assertions to plane to ensure normalization
...
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-18 17:40:44 -08:00
8b041f5280
merging latest dev
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-12-18 10:34:49 -08:00
874bbbfca3
Better magic number naming based on review feedback
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-12-18 10:26:37 -08:00
92d3df17fa
Fix incomplete comment
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-12-18 10:16:02 -08:00
fd078e3c29
Small py var name change based on review feedback. Updating script graphs from previous commit to use new RPC name
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-12-18 10:11:20 -08:00
d508d5c4c2
Updating pytest code comments and RPC name based on review feedback
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-12-17 17:49:36 -08:00
798a8478ed
Merge pull request #6489 from aws-lumberyard-dev/Atom/scottmur/displaymapper_sandbox
...
sandboxing DisplayMapper P0 test for investigation
2021-12-17 17:48:41 -08:00
86d22c8bb3
Updated GraphCanvasSystemComponent::OnCatalogLoaded to use
...
TranslationRequests::Restore
The TranslationDatabase::Restore function will clear out the database
before merging in all the translation .names files making it idempotent.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-17 18:32:14 -06:00
20d55c6267
Fixed the translation error messages for GraphCanvas
...
It was unconditionally logging an AZ_Warning and AZ_Error if a
translation entry with the same key was added to the database.
This didn't account for the same key and value being added to the
database, so loading the same translation file twice would result in
error messages for each entry.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-17 18:32:05 -06:00
c6eead4efa
remove uber build exceptions ( #6466 )
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-17 15:23:14 -08:00
1ba23247b4
sandboxing DisplayMapper P0 test for investigation
...
Signed-off-by: Scott Murray <scottmur@amazon.com >
2021-12-17 15:16:24 -08:00
ddfcccfe2a
Add EditorPythonBindings as an explicit dependency of the White Box Tool ( #6479 )
...
* add EditorPythonBindings as an explicit dependency of the White Box Tool
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add Gem::EditorPythonBindings.Editor as a runtime dependency to White Box Tool Gem
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove redundant target scope
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-17 16:24:16 -06:00
18ce01ba7c
Add 2 performance testing levels ( #6463 )
...
First a level with approximately 10K cubes with various PBR materials
Second a level with a vegetation system set up to spawn between 10K - 30K instances of cubes with various PBR materials
Plus ancillary data files these levels need.
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-12-17 15:08:43 -06:00
9c7a558ccb
basic refactor of assets ( #6467 )
...
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com >
2021-12-17 12:36:05 -08:00
3ecf622804
[AudioSystem] ACE: Panels now can be resized horizontally by dragging the boundary between them.
...
Signed-off-by: Maxim Ivanov <imginimg@gmail.com >
2021-12-17 17:40:37 +03:00
d9e1e59af7
[AudioSystem] ACE: Added "File -> Refresh Audio System" action (same as "Game -> Refresh Audio") with "Ctrl-Shift-R" shortcut.
...
Signed-off-by: Maxim Ivanov <imginimg@gmail.com >
2021-12-17 17:40:36 +03:00
1be475c81a
[AudioSystem] ACE: Added Ctrl-R shortcut for the "File->Reload" action.
...
Signed-off-by: Maxim Ivanov <imginimg@gmail.com >
2021-12-17 17:40:35 +03:00
b2c9c01622
Remove incorrect comment
...
Signed-off-by: chiyenteng <82238204+chiyenteng@users.noreply.github.com >
2021-12-17 05:44:18 -08:00
2ddf55474e
chore: remove "using namespace " from AZCore Memory ( #6373 )
...
* chore: remove "using namespace " from AZCore Memory
REF: https://github.com/o3de/o3de/issues/6281
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix formatting
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix indentation for AllocatorBase.cpp
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: fix formatting
Signed-off-by: Michael Pollind <mpollind@gmail.com >
* chore: address minor checkstyle problems
Signed-off-by: Michael Pollind <mpollind@gmail.com >
2021-12-17 13:26:31 +00:00
d20aa935ba
Quaternion to scaled-axis angle representation (and back) helpers ( #6421 )
...
Direct conversion helpers for quaternion to the scaled axis-angle representation and back without the need to convert them first to the axis-angle format and manually scale (or normalize on the way back). This also avoids having to deal with the special case of an identity representation which is 0,0,0 in the scaled axis-angle format while our convention for axis-angle is 0,1,0 for the axis and 0 for the angle.
Added unit tests that check the conversion round-trips from quaternion -> (scaled) axis-angle -> quaternion as well as comparing the scaled axis-angle representations from the direct helper functions as well as the axis-angle while manually scaling/normalizing.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-12-17 09:43:35 +01:00
bf8422152b
Turn off stdout buffering when connecting to editor-server so that the editor properly gets all the server-logging without having to first fill up a buffer. Allows the logs to pipe instantly for easier debugging, and also fixes a problem where the logs wont reach the editor because the buffer doesn't fill
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-12-17 00:12:21 -08:00
34edd4d0c0
Fixed post rebase Spawnable issues.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 18:06:25 -08:00
c7c96d8baf
Code maintenance, improved OnCatalogLoaded logic and track additions and removals
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-12-16 17:20:37 -08:00
8dc5f9b07c
Merge pull request #6461 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-16956
...
Disable DiffuseProbeGridDownsamplePass
2021-12-16 17:39:56 -07:00
ae8f724124
Merge pull request #6394 from aws-lumberyard-dev/carlitosan-sc-redcode-asset
...
redcoding asset handler, holder, tracker, memory asset
2021-12-16 16:29:58 -08:00
ea04449fa0
Merge pull request #6266 from aws-lumberyard-dev/Neil_o3de_local
...
Converting PbrMaterialChart to prefab, and moving to AutomatedTesting
2021-12-16 16:23:42 -08:00
e8366040df
Added unit test to cover the updates to the Spawnable Entities Aliases.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:22 -08:00
1efbb7216f
Addressed issues found in/by the Spawnables benchmarks and unit tests.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:17 -08:00
02137e2219
Fixed existing tests for Prefab processing.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:13 -08:00
a964120b7a
Updated the NetworkPrefabProcessor with the latest Prefab builder changes.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:09 -08:00
43c42f63c6
Cleaned up some unused code in the Prefab processor.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:01:04 -08:00
7b5868d198
Added additional functions to edit prefabs during processing to PrefabDocument.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:00:54 -08:00
b8e3b27ea9
Added a PrefabDocument for Prefab to simplify working with Prefabs during conversion to spawnables.
...
The new PrefabDocument handles the Prefab and the Instance. This reduces the number of times the Instance has to be reloaded from the Prefab and keeps the entity ids stable between steps. The intention is for all the PrefabDocument to conceptually manipulate the Prefab DOM, although behind the scenes it will manipulate the Instance for now. The Instance should only be directly used in case the PrefabDocument doesn't provide the functionality yet.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 16:00:00 -08:00
9def902e1c
Fixes up parents for entities that are moved to another Prefab.
...
This fixes issues with entities that are moved to another Prefab and have a parent that was also moved to the same Prefab. Entities that have their parent moved to another Prefab continue to work as is because a placeholder entity is always left behind. Entities that are moved to another Prefab but have a parent that's still in the original Prefab will currently not work correctly. This will be a addressed in a future commit.
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:51 -08:00
76a913882c
Resolving links in the Prefab Processing Stack now also makes sure that entity ids of aliased entities are appropriately unique or match.
...
Signed-off-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
2021-12-16 15:35:47 -08:00
Mike Balfour
Junbo Liang
tjmgd
AMZN-Igarri
bosnichd
amzn-sean
T.J. McGrath-Daly
Michael Pollind
Gene Walters
jromnoa
lumberyard-employee-dm
carlitosan
Scott Murray
Tom Hulton-Harrop
rgba16f
Maxim Ivanov
chiyenteng
Benjamin Jillich
AMZN-koppersr
lsemp3d
dmcdiarmid-ly