bb33f906d2
Merge branch 'development' into memory/benchmarks
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-08 10:45:48 -08:00
e79d79ec45
Fixes some missing includes/declaring budgets ( #6238 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-08 09:53:37 -08:00
558532f094
Process launcher updates ( #6183 )
...
* Enable process and ap connection tests on linux
* Updated 'OpenProjectManager' to use new the ProcessLauncher argument type
* Add logic to double-escape escaped double quotes in arguments on windows platforms
* Updated argument for LaunchProjectManager to reflect new ProcessLauncher argument type
* Fixed unit test arguments for 'arg=value' condition
* Fix compile errors for BuilderManager and RHI.Edit\Utils.cpp
* PAL'ify the GetCommandLineParametersAsString() to handle windows specific behavior
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
Co-authored-by: byrcolin <byrcolin@amazon.com >
2021-12-08 09:30:19 -08:00
29da71e64e
Updated Sponza Model (.ma, .fbx, textures) ( #6080 )
...
* Updated Sponza Model (.ma, .fbx, textures)
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Removed corrupted file
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Revisions to Sponza Scene
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Sponza updates
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Updated Cloth Irradiance Values
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Added Sponza scene to Automated Testing- request from QA
Signed-off-by: Benjamin Black <benblac@amazon.com >
* Clean up removed files
Signed-off-by: Benjamin Black <benblac@amazon.com >
2021-12-08 08:49:18 -08:00
47bd6fc4d4
[Mac] Format string specifier for size_t should be %zu ( #6237 )
...
Fixes this build error: error: format specifies type 'int' but the argument has type 'size_t' (aka 'unsigned long') [-Werror,-Wformat]
Signed-off-by: amzn-sj srikkant@amazon.com
2021-12-08 08:34:34 -08:00
045eea03e6
Converted NvCloth automated tests to prefabs ( #6253 )
...
* Deleted cloth slice assets and AutomatedTesting levels based on slices
Signed-off-by: moraaar <moraaar@amazon.com >
* Recreated nvcloth AutomatedTesting levels for prefabs
Signed-off-by: moraaar <moraaar@amazon.com >
* Run nvcloth automated tests with prefabs enabled (which is the default)
Signed-off-by: moraaar <moraaar@amazon.com >
2021-12-08 16:07:03 +00:00
16f5f45b7e
Merge pull request #6170 from aws-lumberyard-dev/LYN-8770_PrintNetEntityNameIfImproperlyDeleted
...
Print Entity name if Improperly Deleted
2021-12-08 07:38:43 -08:00
1e11e54702
Merge pull request #6246 from aws-lumberyard-dev/debug_compile_fix
...
Fix debug compilation.
2021-12-08 15:20:32 +00:00
9e7d5fe52b
Test the Terrain World configuration changes when parameters are chan… ( #6063 )
...
* Test the Terrain World configuration changes when parameters are changed in the component
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Before merge
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Before merge 2
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Changes from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Change from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Change before merge
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Change before merge 2
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Change before merge 3
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Change after merge to fix conflicts
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fix merge conflict
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* Fix merge conflict
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
* CHanges from PR
Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com >
2021-12-08 14:09:56 +00:00
5eb058f679
Use LegacySystemInterfaceCreated to initialize physics material library. ( #6168 )
...
* Use LegacySystemInterfaceCreated to initialize physics material library. OnCatalogLoaded was used before but it's not called when running the editor without assets processed yet.
Signed-off-by: moraaar <moraaar@amazon.com >
2021-12-08 12:23:19 +00:00
1a94caee47
Fix debug compilation.
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-08 11:06:02 +00:00
f9f11d98b1
Fixed critical json property (cherry picked from RTE branch) ( #6220 )
...
* Fixing critical tag as it needs a boolean, not a string.
Signed-off-by: moraaar <moraaar@amazon.com >
* Marking blast material library assets as criticals since it's necessary to be ready before the editor opens
Signed-off-by: moraaar <moraaar@amazon.com >
2021-12-08 10:26:02 +00:00
b54215552c
Prevent the camera from easily being set to an invalid orientation ( #6203 )
...
* add temporary debug logging
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* improvement for box select sometimes getting stuck on
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add temporary debug logging
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* improvement for box select sometimes getting stuck on
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove temporary logging
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fixes for camera pitch issues
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* missed file with camera pitch fixes
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* remove debug logs
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add some tests for new pitch constraint updates
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-12-08 09:42:40 +00:00
3dd8a60034
Merge branch 'development' into memory/benchmarks
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-07 18:44:03 -08:00
f96a466212
WIP trying to use SystemAllocator instead of raw reads
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-07 17:58:49 -08:00
a8ef23e4ae
Merge pull request #6232 from aws-lumberyard-dev/cgalvan/ReadOnlyPrefabWorkflowChanges
...
Some read-only prefab workflow updates.
2021-12-07 19:38:54 -06:00
3a7d9f9b3a
LYN-8633 | Read-Only Entities - Entity Outliner behavior changes ( #6230 )
...
* Add invalid entityId check to IsReadOnly
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Ensure read-only entities editing is limited (no renaming, limited drag/drop, no asset drop on them)
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Removing redundant class definition in wrong namespace.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-12-07 16:58:29 -08:00
da5ec1f478
Merge branch 'development' into memory/benchmarks
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-07 15:47:29 -08:00
3f86f31f2a
Redcode/driller removal
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-07 15:43:26 -08:00
6532c50c27
Some read-only prefab workflow updates.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-12-07 17:22:10 -06:00
c27a22abd4
Merge pull request #6223 from aws-lumberyard-dev/Atom/PixEventsOnIfDllLoaded
...
Enable Pix markers if the Pix DLL is loaded
2021-12-07 15:21:58 -07:00
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
cd5306febf
Merging from development
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-07 12:35:41 -08:00
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
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
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
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
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
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
2d1d9f1f5c
Enable Pix markers if the Pix DLL is loaded
...
Fixes a regression introduced when Nsight Pix markers were enabled.
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-12-07 10:32:09 -07:00
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
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
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
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
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
878d03e6b4
Merge branch 'development' into terrain/sphrose/macro_material_tests
2021-12-07 13:01:58 +00:00
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
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
f00923419d
Merge branch 'development' into terrain/sphrose/physics_collider_materials_LYN-6431
2021-12-07 08:19:08 +00:00
f06230f614
fix merge conflict
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-12-07 08:12:20 +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
4b07665496
Removes Heap allocator from being possible to use as a SystemAllocator since it doesnt allow dynamic allocating (only works with pre-allocated blocks)
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-06 18:35:39 -08:00
cf9aab9911
Adds recording functionality (disabled) and a benchmark that can run recordings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-12-06 18:34:52 -08:00
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
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
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
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
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
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
6cf805256b
Make backend write API string-based
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-12-06 15:55:35 -08:00
Esteban Papp
Steve Pham
benblack75
amzn-sj
moraaar
Gene Walters
sphrose
John Jones-Steele
Tom Hulton-Harrop
Chris Galvan
Danilo Aimini
Jeremy Ong
moudgils
Nicholas Van Sickle
amzn-mike
jromnoa
Alex Peterson
amzn-phist
Jeremy Ong
carlitosan
rgba16f
Nicholas Lawson
Guthrie Adams
Jonathan Capes
Guthrie Adams