cef82f0313
Fix the GameStateSamples Gem and remove an unused variable from DebugConsole.h ( #3347 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-08-20 09:58:33 -06:00
aa642bd566
Merge pull request #3156 from aws-lumberyard-dev/Atom/guthadam/material_component_api_script_canvas_support
...
AtomTools: better script canvas support for material component
2021-08-19 16:23:43 -05:00
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
90845313fb
Overhaul of LookModification ( #3282 )
...
* Fixed log2 shaper equations. Added bspline sampling for lut. Added options for custom log2 or linear lut with custom exposure ranges.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Added support for PQ shaper. Added shader option & cvar for lut sampling quality. Fixed issues in the blend lut shader that were causing considerable quality loss. No longer always changing to the log2 1000 nit shaper when blending luts - if the source luts all use the same shaper, keep using that shaper in the blended lut.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Fixed an integer -> float
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Minor PR reveiw updates
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-08-18 16:59:34 -05:00
d5ed0cc385
AtomLyIntegration
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:40:04 -07:00
58f8b563d0
fix them all
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:38:33 -07:00
33cbc2db21
AtomLyIntegration
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:10:42 -07:00
75c388b746
change conversions to static_cast
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:43 -07:00
90cad016de
Gems/Atom
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:31 -07:00
b3e895d10c
fixed AtomLyIntegration
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:03:38 -07:00
c67a9f3d12
Updated material component request bus to better support script canvas
...
Change all name parameters to use standard string so that they could be headed in in script canvas nodes and RPE
Added explicitly type functions for getting and saving property overrides
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-08-16 17:13:43 -05:00
994403bfa0
Updated Radius Weight Modifier component name for consistency.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-16 11:56:50 -05:00
f55ffae994
Merge branch 'development' into redcode/crythread-2nd-pass
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-11 20:31:58 -07:00
ce7598c10b
[redcode/crythread-2nd-pass] fixed missing includes
...
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-08-11 12:59:32 -07:00
5f22dc817c
Merge branch 'development' into cmake/SPEC-7182
2021-08-11 12:39:51 -07:00
37ffe90353
Merge branch 'development' into cmake/SPEC-7182
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/QtUtil.h
# Code/Legacy/CryCommon/Linux_Win32Wrapper.h
# Code/Legacy/CryCommon/ProjectDefines.h
# Code/Legacy/CryCommon/StringUtils.h
# Code/Legacy/CryCommon/UnicodeBinding.h
# Code/Legacy/CryCommon/UnicodeEncoding.h
# Code/Legacy/CryCommon/UnicodeFunctions.h
# Code/Legacy/CryCommon/UnicodeIterator.h
# Code/Legacy/CryCommon/WinBase.cpp
# Code/Legacy/CryCommon/platform.h
# Code/Legacy/CryCommon/platform_impl.cpp
# Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
# Gems/Maestro/Code/Source/Cinematics/Movie.cpp
2021-08-11 11:16:24 -07:00
193fa3c918
Merge pull request #2584 from aws-lumberyard-dev/Atom/antonmic/SrgDebugImprovements
...
Shader resource group debug improvements
2021-08-11 10:37:36 -07:00
2361490c8b
Fixes for Android
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-10 20:18:59 -07:00
2147b1d128
Merge branch 'development' into cmake/SPEC-7484
2021-08-10 14:30:07 -07:00
2d1ed48fea
Merge branch 'development' into cmake/SPEC-2513_w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/EMotionFX/Code/EMotionFX/Source/Actor.cpp
2021-08-10 11:45:02 -07:00
e3b22f51b2
@lumberyard-employee-dm suggestion to use (w)string_view as the src to simplify functions in conversions.h
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-10 11:32:49 -07:00
ec1a08d487
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/ConfigGroup.cpp
# Code/Editor/ControlMRU.cpp
# Code/Editor/CryEdit.cpp
# Code/Editor/CryEdit.h
# Code/Editor/IEditorImpl.cpp
# Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/GameController.cpp
2021-08-10 09:23:34 -07:00
8d7d560d9d
Merge branch 'dev' into Atom/antonmic/SrgDebugImprovements
2021-08-09 23:47:40 -07:00
1837d05169
Rename EMotionFX class members to follow the m_ naming convention
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-08-09 16:40:35 -07:00
2cfee517a0
Adjust EMotionFXAtom to work with the new EMotionFX size_t API
...
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-08-09 09:22:38 -07:00
868d718a18
Added automatic bounding box expansion, fixed several bugs in the aabb calculations and removed node OBBs ( #2871 )
...
Merge pull request #2871 from aws-lumberyard-dev/jillich/EmfxAabbImprovements
2021-08-09 01:19:42 -07:00
f4164ef3a3
Merge branch 'development' into cmake/SPEC-2513_w4018
2021-08-06 11:57:55 -07:00
6db7488939
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/Animation/SkeletonHierarchy.cpp
# Code/Editor/Animation/SkeletonMapper.cpp
# Code/Editor/Animation/SkeletonMapperOperator.cpp
# Code/Editor/LogFile.cpp
# Code/Editor/ResourceSelectorHost.cpp
# Code/Editor/SettingsManager.cpp
# Code/Editor/Util/EditorUtils.cpp
# Code/Editor/Util/FileUtil.cpp
# Code/Editor/Util/IXmlHistoryManager.h
# Code/Editor/Util/ImageTIF.cpp
# Code/Editor/Util/StringHelpers.cpp
# Code/Editor/Util/XmlHistoryManager.cpp
# Code/Editor/Util/XmlHistoryManager.h
2021-08-06 10:08:37 -07:00
2c7f6f9742
Adds Links to Gem Directory and Documentation for Gems ( #2922 )
...
* Changed blue text to white that is not meant as a link, made 'View in Director' link work for gems in the inspector, added parsing for gem documentation link
Signed-off-by: nggieber <nggieber@amazon.com >
* Added documentation links for gems, changed markup for urls in summaries and requirements so they are clickable
Signed-off-by: nggieber <nggieber@amazon.com >
* Fixed a couple of the documentation links
Signed-off-by: nggieber <nggieber@amazon.com >
* Added documentation url to edit gem properties script and updated unit tests
Signed-off-by: nggieber <nggieber@amazon.com >
2021-08-06 10:19:35 -05:00
e28d04aea6
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Editor/CryEditDoc.h
# Code/Legacy/CryCommon/CryArray.h
# Code/Legacy/CryCommon/CryString.h
# Code/Legacy/CryCommon/UnicodeBinding.h
# Code/Legacy/CrySystem/LocalizedStringManager.cpp
# Gems/LyShine/Code/Source/StringUtfUtils.h
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-05 20:05:25 -07:00
10f950b726
fix w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:43:56 -07:00
19d79f1559
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-05 14:57:24 -07:00
8a47476498
Merge branch 'development' into jillich/EmfxAabbImprovements
2021-08-05 15:13:29 +02:00
1e4c147e0b
Fixed asset name for default groundplane.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-04 15:34:22 -05:00
3a689aa319
Reenable support for UI Elements that use Render Targets ( #2352 )
...
* Re-add support for UI Elements that use Render Targets
* Move LyShine pass request from Atom's MainPipeline.pass to project's
* Make all dynamic draw contexts in LyShine draw to pass directly without the need of draw list tags
* Remove local RPI changes that are no longer needed
* Prevent crash if LyShine gem is enabled but its custom pass hasn't been added to the main render pipeline
* Revert to default UI pass if the LyShine pass has not been added to project's main render pipeline
Signed-off-by: abrmich <abrmich@amazon.com >
2021-08-03 10:14:09 -07:00
dd3f0b86e0
Merge branch 'development' into cmake/SPEC-7484
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/ToolBox.cpp
2021-08-02 18:45:25 -07:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
ad14d9cdd7
AtomFont
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 17:55:27 -07:00
b9cfce8165
Gems/AtomLyIntegration
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-02 09:26:06 -07:00
b840b24de2
Ported the actor and a few other places
...
* Fixed a bug with updating the static aabb for actors. It called that before the mesh was loaded resulting in an invalid aabb.
* Ported a few more places to AZ::Aabb from MCore::AABB
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-08-02 14:38:20 +02:00
b407e501e3
Merge branch 'development' into Atom/santorac/OptionalSceneApiMaterialConversion
2021-07-30 14:54:14 -07:00
13679a7cc3
Reverted partial support for property overrides on default material assignments. This needs more UI design discussion first.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:15 -07:00
1a478608a7
Restored the previous behavior of preventing material property overrides when there is no explicit material override assignment.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:12 -07:00
b19a895889
Reverted accidentally commented out code.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:10 -07:00
6fa891848d
Factored out redundant call to GetMaterialSlots().
...
Removed code that was intended to handle duplicate default material assignments, but duplicacate default material assignments aren't possible yet.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:09 -07:00
21d5baa184
Fixed an issue where I had changed prior functionality by mistake, preventing exported materials from replacing material assignments.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:07 -07:00
abec7a4f5b
Fixed an issue where a default material should show up as a filled-in value in the UI even though it should appear as empty, indicating the default is being used.
...
Also, I'm going back on what I said in my last commit, and removing the converter for version 3 in EditorMaterialComponent::ConvertVersion. The code that I had put in before wouldn't work because it was relying on the new m_defaultMaterialAsset which will be empty for old data. The only way we could support version conversion is if we preserve legacy versions of multiple types like EditorMaterialComponentSlot and MaterialAssignmentId. Since this serialization version is old and pre-dates the public release of O3DE, it's unlikely that we need to continue supporting this version so isn't worth maintaining.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:06 -07:00
75b4d62dcb
Restored the version converter EditorMaterialComponent::ConvertVersion for version 3, which wasn't possible with an earlier version of my changes.
...
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:04 -07:00
fec79a7d53
Moved the material slot list from ModelLodAsset to ModelAsset, so all the slots live in one main list. This removes data duplication between LODs and cleans up the code a bit.
...
I had to update the ModelLod class to take in both the ModelLodAsset and ModelAsset for initialization so it can fetch the slots for each mesh.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-07-30 11:41:02 -07:00
bosnichd
Guthrie Adams
Esteban Papp
Jeremy Ong
Ken Pruiksma
pappeste
Guthrie Adams
Chris Galvan
AMZN-ScottR
antonmic
Chris Burel
Benjamin Jillich
AMZN-nggieber
Benjamin Jillich
michabr
santorac
Chris Santora