27d5f662f9
Update default project to include PrefabBuilder ( #5619 )
...
Signed-off-by: Jonathan Capes <j.capes@gmail.com >
2021-12-07 09:15:45 +00:00
2316ddac65
Merge pull request #5784 from aws-lumberyard-dev/terrain/sphrose/vegetation_tests
...
Terrain/sphrose/vegetation tests
2021-12-07 08:04:21 +00:00
9698047340
Modified Color Swatch Fix ( #6137 )
...
* Modified Color Swatch Fix
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Updating Macbeth Colors to work with new material formatting
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Tweaks to red color values
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Tweaked red swatch color values provided by Ken
Signed-off-by: Benjamin Black <benblac@amazon.com >
2021-12-06 16:18:32 -08:00
6e0ac97f13
Merge pull request #6178 from aws-lumberyard-dev/daimini/gitflow_211206_o3de
...
Merged `stabilization/2111RTE` to `development`
2021-12-06 15:51:01 -08:00
dae25beef5
{lyn2264} Adding Python API for Actor Group ( #6064 )
...
* {lyn2264} Adding Python API for Actor Group
* updating the IBoneData with behavior attributes
* adding actor_group.py for making actor group JSON data
* adding physics_data.py for making physics JSON data
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com >
* fixing dictionary issues
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com >
* updated comment style to numpydoc
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com >
* updated to numpydoc style
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com >
* example of actor group rules
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com >
* Updated based on feedback
Signed-off-by: Allen Jackson <23512001+jackalbe@users.noreply.github.com >
2021-12-06 17:11:30 -06:00
35b7705119
Atom/mriegger/overflow ( #6119 )
...
* first pass
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
* more nice fixes
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
* feedback addressing
Signed-off-by: mrieggeramzn <mriegger@amazon.com >
2021-12-06 13:33:13 -08:00
f2f85ffe40
Merge pull request #6175 from aws-lumberyard-dev/cgalvan/ReadOnlyViewportChanges
...
Updated viewport to hide the transform manipulators for entities marked as read only.
2021-12-06 15:20:59 -06:00
efe63f3e95
Merge commit 'c5615f812ccc9d235747a1c5ba396ac2e9a23690' into daimini/gitflow_211206_o3de
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
# Conflicts:
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.cpp
# Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h
# Code/Framework/AzToolsFramework/Tests/UI/EntityOutlinerTests.cpp
2021-12-06 13:14:14 -08:00
b5bad63e72
Merge pull request #6081 from aws-lumberyard-dev/jckand/PrefabTestOptimization
...
Enabling optimized test runner for Prefab tests
2021-12-06 13:11:42 -08:00
d04f4d238c
Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ReadOnlyViewportChanges
2021-12-06 14:24:19 -06:00
10e95cd863
Updated logic to use AZStd::erase_if
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 14:21:00 -06:00
476e66d902
LYN-8631 + LYN-8632 | Display appropriate read-only icons and procedural prefabs ui in the Outliner ( #6160 )
...
* First step of procedural prefab styling and read-only registration.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* WIP - Introduce read-only handler for procedural prefabs (not hooked up)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Introduce read-only entity interface, handler and unit tests.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Introduce temp read-only icon, use new icon hierarchy in Outliner.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Switch from a push paradigm to a pull paradigm - handlers get to implement logic to determine if an entity should be read-only. This allows multiple systems to weigh into whether an entity is read-only.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fixed to missing call in test
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Post-rebase fixes to class name changes
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Display a lock icon on top of the entity icon in the Entity Outliner. This icon is added programmatically, which prevents having to alter all Outliner icons and future-proofs this functionality.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor style changes to procedural prefabs in the Outliner (use white icon)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Ensure cache is refreshed when the handler is created, and also whenever the focus changes.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove Procedural Prefab setreg that was added in the wrong place
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove redundant function
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix spacing issue caused by rebase
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Change tooltip so that it accurately says "inspect" instead of "edit" for procedural prefabs.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Address minor styling issues mentioned in PR.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-06 12:16:16 -08:00
663bd52e8f
Merge commit 'dc8f9dc233b3819a5c4e6c2e0de273e635213c60' into daimini/gitflow_211206_o3de
2021-12-06 10:54:00 -08:00
3434ea6906
Merge commit '7b22bc64f35a941c4f3a9159267d1cb7b46a27bd' into daimini/gitflow_211206_o3de
2021-12-06 10:53:55 -08:00
e24323660b
Fixed typo.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 12:44:52 -06:00
02fbf31311
Merge branch 'development' of https://github.com/o3de/o3de into jckand/PrefabTestOptimization
...
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com >
2021-12-06 12:30:16 -06:00
1f279ca713
Updated viewport to hide the transform maniuplators for entities marked as read only.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 12:19:02 -06:00
d583256b17
Merge pull request #6144 from aws-lumberyard-dev/cgalvan/ReadOnlyEntityInspectorChanges
...
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
2021-12-06 12:01:39 -06:00
83cb085a28
Fixed the register.py command with a --project-path to check against a ( #6158 )
...
supplied --engine-path parameter to determine if it should update the
project.json if one has been provided.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-12-06 11:24:04 -06:00
c62b0bf427
Merge pull request #6145 from aws-lumberyard-dev/Atom/guthadam/optimizing_graph_canvas_translation_serializer
...
Optimizations to graph canvas translation json serializer
2021-12-06 11:20:33 -06:00
e3306f948f
Atom Level component test support in editor_entity_utils.py and tests for level components ( #6082 )
...
* Level component helper and test cases for Atom Level components which currently crash
Signed-off-by: Scott Murray <scottmur@amazon.com >
* moved a close paren to end of previous line to match existing style
Signed-off-by: Scott Murray <scottmur@amazon.com >
* adding a forgotten import
Signed-off-by: Scott Murray <scottmur@amazon.com >
* minor refactor and prep for adding back the Display Mapper Game component test
Signed-off-by: Scott Murray <scottmur@amazon.com >
* putting Game compoenent Display Mapper test back with addition of setting property Enabled to true
Signed-off-by: Scott Murray <scottmur@amazon.com >
* typo in line fixed Test. bocomes Tests.
Signed-off-by: Scott Murray <scottmur@amazon.com >
2021-12-06 12:18:16 -05:00
aa5563803f
Merge pull request #6110 from aws-lumberyard-dev/Atom/guthadam/update_trace_logger_to_clear_log
...
Changing trace logger to clear log file when opened
2021-12-06 11:17:46 -06:00
e9c09f6359
Merge pull request #6159 from gusmccallum/development
...
Updated android launcher to remove confusing branding
2021-12-06 11:14:53 -06:00
be252d797d
Remove disabled failed asset load tests trait from linux ( #6100 )
...
* Remove trait AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS for Linux
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-12-06 09:11:56 -08:00
3c3529c8cd
Merge pull request #6117 from aws-lumberyard-dev/jckand/LinuxCrashTest
...
Handling crash.log for Editor crashes during Linux tests
2021-12-06 10:58:17 -06:00
e5a3f21e29
fix merge conflict
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-06 16:43:08 +00:00
a7989df051
Fixed status combo box style in Entity Inspector.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-06 10:39:49 -06:00
5e0313d453
Multiplayer benchmark cleanup
2021-12-06 11:05:36 -05:00
7cabe3e6af
Merge branch 'development' of https://github.com/o3de/o3de into jckand/LinuxCrashTest
...
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com >
2021-12-06 09:11:02 -06:00
969dbf407a
Add tests for planar manipulator draw when dealing with scaling ( #6164 )
...
* add support to add a custom debug display request interface for manipulator test framework
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* wip changes to support tests for manipulator view drawing
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test for planar manipulator draw when dealing with scaling
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* additional comments for added context
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* small updates/fixes after PR feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for missing NullDebugDisplayRequests
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-06 14:53:45 +00:00
c5615f812c
Fixing pivot offset when performing undo on Transform component ( #6150 )
...
* Fixing undo offest on transform component
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Fixining possible issue with firing an unnecessary OnTransformChanged event when entity is manually disabled/enabled
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Adding better comments
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Unit tests
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Cherrupicking changes
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-12-06 14:46:47 +00:00
dc8f9dc233
Add additional check to check material library is loaded when trying to retrieve names ( #6165 )
...
* Add additional check to ensure material library is loaded when trying to retrieve names.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Mark physmaterial assets as critical
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
Co-authored-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
Signed-off-by: moraaar moraaar@amazon.com
2021-12-06 13:26:23 +00:00
09c9548ba4
Automated testing create_backup and restore_backup respects file flags. ( #6062 )
...
* Automated testing create_backup and restore_backup respects file flags.
Example:
If the file that is to be backed-up is readonly, when restored that file will be readonly.
If the file that is to be backed-up is not readonly, when restored that file will be not readonly.
Fixes an issue that would mark physics setreg files to readonly after running AutomatedTesting when restoring from the backup.
* update LyTestTools tests that use create/restore backup to expect copy2 instead of copy
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-12-06 11:23:52 +00:00
fc8fd89ff9
Updated android launcher to remove confusing branding
...
Signed-off-by: gusmccallum <gusmccallum@hotmail.com >
2021-12-03 21:46:16 -05:00
86b397f2bb
Merge pull request #6061 from aws-lumberyard-dev/test_logs
...
Remove remote console flag suppressing game logs in GameLauncher and ServerLauncher apps
2021-12-03 16:13:27 -08:00
87fb6be964
Fixes to Procedural Prefab instantiation - ensure the container of the procprefab has the correct editor components, and remove limitation to instantiating at the root. ( #6147 )
...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-03 15:38:29 -08:00
b470f917ca
Listen to read-only entity state changes so we can refresh if the read-only state changes on one of our selected entities.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 16:37:35 -06:00
273fb87eeb
Renamed variable to be more descriptive.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 16:21:31 -06:00
af75b3a52a
Made clearing the log file optional and renamed the function
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-12-03 15:44:04 -06:00
1ae18faf9f
Merge pull request #6124 from aws-lumberyard-dev/Atom/antonmic/AsvPassWarning
...
Fixed pass warning in ASV
2021-12-03 13:16:13 -08:00
fa385ec842
Fix number argument in notifications ( #6121 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-12-03 13:11:23 -08:00
b3bf2158b4
Right click menu support for project buttons ( #6122 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-12-03 13:10:35 -08:00
d56cfa40dd
Changing trace logger to clear log file when opened
...
Also switched the log message sink from a vector to a list so the entire container does not have to be rebuilt every time and entry is added.
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-12-03 15:00:53 -06:00
be607521e7
Optimizations to graph canvas translation json serializer
...
A handful of places in tight loops were looking up JSON and map entries multiple times in a row
Moving and reusing string variables in tight loops
Deferring string creation, copying, assignment until needed
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-12-03 14:21:22 -06:00
2569ba4214
merging dev because AR succeeded but failed to notify github, will re-run AR with latest merged
...
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com >
2021-12-03 11:47:04 -08:00
da06c84d5e
Adding crash_log() to base resource locator class
...
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com >
2021-12-03 13:46:42 -06:00
954642c1ce
Updated Entity Inspector to changed behavior when an Entity has been marked as read-only.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-03 13:40:07 -06:00
fcd2ae3bc0
Merge pull request #6101 from aws-lumberyard-dev/Atom/antonmic/RenderdocBuildFail
...
Fixing build fail when Renderdoc is enabled
2021-12-03 11:36:47 -08:00
ef423abc9f
Merge pull request #6134 from aws-lumberyard-dev/scripting/fix_legacy_format_graph
...
Resaved LY_SC_UnitTest_NodeableDelay.scriptcanvas to update to json f…
2021-12-03 11:29:11 -08:00
658877a9a1
Merge branch 'development' of https://github.com/o3de/o3de into jckand/LinuxCrashTest
...
Signed-off-by: jckand-amzn <82226555+jckand-amzn@users.noreply.github.com >
2021-12-03 13:15:28 -06:00
Jonathan Capes
sphrose
benblack75
Danilo Aimini
Allen Jackson
mrieggeramzn
Chris Galvan
Nicholas Van Sickle
jckand-amzn
lumberyard-employee-dm
Guthrie Adams
smurly
Steve Pham
Olex Lozitskiy
Tom Hulton-Harrop
Mikhail Naumov
moraaar
amzn-sean
gusmccallum
Sean Sweeney
Guthrie Adams
antonmic
Alex Peterson
Luis Sempé