birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,161 Commits 3 Branches 3 Tags
5cca52e73c3fcf6aefd2a2f4ee98f0a99a542fec
Commit Graph

10161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
 2021-12-07 13:31:55 -08:00
Esteban Papp cd5306febf Merging from development 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 12:35:41 -08:00
moudgils 577280cc11 Disable shaders for metal compilation until the issues are addressed properly (#6222) 
* Disabling shaders for metal compilation until the issue is fixed properly.

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>

* Adding a missed shader

Signed-off-by: moudgils <47460854+moudgils@users.noreply.github.com>
 2021-12-07 11:45:55 -08:00
Nicholas Van Sickle 3d8664ee92 Merge pull request #5511 from aws-lumberyard-dev/nvsickle/GenericDomJson 
Generic DOM: Add DomBackend abstraction and JSON support
 2021-12-07 11:20:53 -08:00
amzn-mike 7c96bc4f1f Fix loaded procprefabs not going through the asset hint fixup process… (#6077) 
* Fix loaded procprefabs not going through the asset hint fixup process for all versions of LoadInstanceFromPrefabDom.

Fixes procprefab asset references not working when pressing Ctrl+G in the editor

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add unit test

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add missing include

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-07 13:00:47 -06:00
jromnoa 1be7845cd2 Merge pull request #6085 from aws-lumberyard-dev/Atom/jromnoa/add-remaining-gpu-tests-to-optimized-classes 
Enable optimized GPU tests and make them the main GPU tests.
 2021-12-07 10:52:03 -08:00
Alex Peterson 3405cee2ef GUI for engine force registration and renaming (#6184) 
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com>
 2021-12-07 10:46:30 -08:00
amzn-phist 72b5539259 Add verbosity option to some o3de.py sub-commands (#6079) 
* Add verbosity option to some o3de.py sub-commands

- Added the -v/-vv option to the most commonly used o3de sub-commands
- Adds a custom argparse Action to make it easy to add verbosity option
  to other commands as needed.
- Sets up parent-child loggers so that when verbosity is changed in a
  sub-command it will be applied globally to all logger instances.

Also:
- Fixes up many warnings, PEP8 improvements

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Update the log format in o3de script modules

- Use a bit nicer format than the default, which was harder to read.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
 2021-12-07 12:28:17 -06:00
carlitosan 4b97f7bac2 Merge pull request #5296 from aws-lumberyard-dev/sc-editor-asset-redux 
Sc editor asset redux
 2021-12-07 09:15:52 -08:00
rgba16f aad16acf1f Jobify the draw item list sort in View::FinalizeDrawLists (#6176) 
Jobification of the sort saves 0.7ms/frame on the HighInstanceTest on my pc.
Make MeshFeatureProcessor update of the mesh cull bounds part of the job work rather than part of the simulate work. This saves 0.1ms/frame on the HighInstanceTest

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-12-07 10:44:12 -06:00
Nicholas Lawson 201777c1d1 ASTC (Ios texture compressor) for mac was built in debug. (#6182) 
* Updates the mac version of ASTC Encoder to actually use release build

Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com>
 2021-12-07 08:42:52 -08:00
Guthrie Adams baab10dd99 Merge pull request #6180 from aws-lumberyard-dev/Atom/guthadam/materialeditor/async_load_presets 
Material editor asynchronously loads lighting and model presets
 2021-12-07 10:33:51 -06:00
sphrose 49a1f00671 Merge pull request #5659 from aws-lumberyard-dev/terrain/sphrose/macro_material_tests 
LYN-6357 Terrain Macro Material tests
 2021-12-07 14:11:23 +00:00
sphrose 878d03e6b4 Merge branch 'development' into terrain/sphrose/macro_material_tests 2021-12-07 13:01:58 +00:00
sphrose 06511c6fd0 Merge pull request #4960 from aws-lumberyard-dev/terrain/sphrose/physics_collider_materials_LYN-6431 
LYN-6431 Added materials support to TerrainPhysicsCollider, added uni…
 2021-12-07 11:49:37 +00:00
Jonathan Capes 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
sphrose f00923419d Merge branch 'development' into terrain/sphrose/physics_collider_materials_LYN-6431 2021-12-07 08:19:08 +00:00
sphrose f06230f614 fix merge conflict 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-12-07 08:12:20 +00:00
sphrose 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
jromnoa 9038cdfcf9 fix merge conflict between constants in atom_constants.py 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 17:53:31 -08:00
Guthrie Adams 1cef580cad Material editor asynchronously loads lighting and model presets 
changed several sequential blocking loads into asynchronous loads to improve material editor startup time

Signed-off-by: Guthrie Adams <guthadam@amazon.com>
 2021-12-06 19:49:10 -06:00
jromnoa 523691497d call AtomComponentProperties.light(), AtomComponentProperties.directional_light(), etc. as is for its component name, rather than make a component name variable 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:43:07 -08:00
jromnoa 9d6dc1ac63 add ATTENUATION_RADIUS_MODE constant with its 2 available options of automatic or explicit 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:38:42 -08:00
benblack75 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
jromnoa ad3148ece5 add new enter_exit_game_mode_take_screenshot() shared function 
Signed-off-by: jromnoa <80134229+jromnoa@users.noreply.github.com>
 2021-12-06 16:05:55 -08:00
Nicholas Van Sickle 6cf805256b Make backend write API string-based 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 15:55:35 -08:00
Danilo Aimini 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
Allen Jackson 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
carlitosan d4206270a6 Use weak reference for undo state, as it is an entirely internal class 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 13:37:29 -08:00
mrieggeramzn 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
Chris Galvan 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
Danilo Aimini 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
Nicholas Van Sickle 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
Chris Galvan d04f4d238c Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/ReadOnlyViewportChanges 2021-12-06 14:24:19 -06:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
Chris Galvan 10e95cd863 Updated logic to use AZStd::erase_if 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 14:21:00 -06:00
Danilo Aimini 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
carlitosan a76e9bba69 Restore undo/redo 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:12:46 -08:00
Danilo Aimini 663bd52e8f Merge commit 'dc8f9dc233b3819a5c4e6c2e0de273e635213c60' into daimini/gitflow_211206_o3de 2021-12-06 10:54:00 -08:00
Danilo Aimini 3434ea6906 Merge commit '7b22bc64f35a941c4f3a9159267d1cb7b46a27bd' into daimini/gitflow_211206_o3de 2021-12-06 10:53:55 -08:00
Nicholas Van Sickle ea9d7c9d82 Add optional size parameter to ReadFromBufferInPlace 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 10:45:45 -08:00
Chris Galvan e24323660b Fixed typo. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-12-06 12:44:52 -06:00
Nicholas Van Sickle 1c42cd98cc Address a bit more review feedback 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 10:31:35 -08:00
jckand-amzn 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
Chris Galvan 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
Chris Galvan 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
lumberyard-employee-dm 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
Guthrie Adams 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
smurly 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
Guthrie Adams 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