Commit Graph

455 Commits

Author SHA1 Message Date
chcurran 58dcbe42e4 Check for string param types in single result slot. LYN-2855 2021-04-20 17:51:05 -07:00
chcurran 4ae75a71d0 safety check on empty datum LYN-2855 2021-04-20 17:33:34 -07:00
chcurran bfe192cce8 Merge branch 'main' into carlitosan_scripting_first 2021-04-20 16:45:03 -07:00
Chris Santora c64632aeff Merge pull request #125 from aws-lumberyard-dev/TexturePresets-ATOM-14765
ATOM-14765 Add More Texture Preset Masks

Several image preset files had a full list of file masks for only one platform. I made sure that the same list was applied to every platform including the default preset.
Removed the "Swizzle" command from Displacement.preset. Swizzle "aaa1" is wrong since this preset expects a single channel image.
Added "_col" to Albedo.preset as an abbreviation for "_color".
Added "_rough" to Roughness.preset as it's a common abbreviation.
Added "_rgbmask" filter to LayerMask.preset to correspond to the "_mask" filter in Grayscale.preset.
Added a warning when an image can't be processed according to the assigned preset due to dimension issues. Otherwise it's difficult to figure out why it's using the ReferenceImage preset instead of what was expected.
Resized the "bark" textures to make them compatible with the image presets.
Removed the "bark1disp2.jgp" image and just applied the changes to the original bark1disp.jpg". It's just blurred a bit to remove excessive noise.
Renamed all the "bark" textures to include an underscore "_" after "bark1" to get the image pipeline to properly recognize the file masks.
Testing:

AtomSampleViewer automation.
All assets in AtomTest build.
Opened several levels in AtomTest.
Corresponds to aws-lumberyard/o3de-atom-sampleviewer#17
2021-04-20 16:23:40 -07:00
AMZN-daimini 62bc7a66bb Remove the Level Inspector from Prefab mode and move behavior to Entity Inspector. (#149)
* Remove Level Inspector from Prefab mode, and integrate the same behavior in the Entity Inspector

* Show prefab name in level entity row of the Outliner. Allow Ui Handlers to prevent renaming.

* Separate setting the prefab's template path and the container entity name.

* Disable reparenting to root level

* Disable the ability to rename the level entity.

* Fixes as per Ram's review
2021-04-20 16:22:34 -07:00
Luis Sempé 23656f0bd3 Merge pull request #167 from aws-lumberyard-dev/scripting/scriptevent_spec_6430
Brought over SC's command line fixes and add_node example script
2021-04-20 16:01:05 -07:00
Mike Balfour 7513486a0f Merge pull request #158 from aws-lumberyard-dev/mbalfour/spawner-isready
Added IsReadyToSpawn to SpawnerComponent
2021-04-20 17:44:26 -05:00
chcurran cdab4da419 Add mark complete to unit tests 2021-04-20 15:44:04 -07:00
srikappa-amzn f8c5048b56 Merge pull request #141 from aws-lumberyard-dev/Prefab/CreatePrefab
Fix prefab creation and support nested prefab creation when prefabs flag is enabled
2021-04-20 15:42:05 -07:00
chcurran fa947d84f7 Reflect testing enum properly 2021-04-20 14:44:51 -07:00
luissemp 65a1840e1d Removed commented out line 2021-04-20 14:38:03 -07:00
Shirang Jia b21f835d0c Merge pull request #166 from aws-lumberyard-dev/add_android_package
SPEC-6448: Add Android package in packaging pipeline
2021-04-20 14:32:47 -07:00
srikappa 78892c8d7e Improved a couple of comments 2021-04-20 14:30:56 -07:00
SJ 3df1ffe3b7 3rd Party static libraries need to be public dependencies to work from installed engine.
Merge pull request #168 from aws-lumberyard-dev/LYN-2588
2021-04-20 14:11:08 -07:00
Mike Balfour 6c65d5f666 Merge pull request #156 from aws-lumberyard-dev/mbalfour/behaviorcontext
Expose some helpful methods to BehaviorContext
2021-04-20 15:58:08 -05:00
sharmajs-amzn 2f9102f10a AssImp asserts on Linux processing (#118) (#138)
LYN-2645} Helios - AssImp asserts on Linux processing
* Linux builds have asserts off, to match Windows and Mac.
* Secondary UV channels support names are available now

Jira: https://jira.agscollab.com/browse/LYN-2645
2021-04-20 13:10:25 -07:00
Terry Michaels 990a40199b Removed the last remaining connections to the Clang 3rd Party (#159) 2021-04-20 15:05:45 -05:00
luissemp a2261a9d0b Merge branch 'main' into scripting/scriptevent_spec_6430 2021-04-20 12:53:20 -07:00
Mike Balfour 449df7e1ed Merge pull request #157 from aws-lumberyard-dev/mbalfour/material-property-value
Add Image as implicit converter for MaterialPropertyValue
2021-04-20 14:36:43 -05:00
Nicholas Van Sickle 68cc939c6d Merge pull request #144 from aws-lumberyard-dev/nvsickle/MainFontFixes
Fix debug font rendering & assert on game mode transition
2021-04-20 12:32:26 -07:00
amzn-sj f53c1e8084 3rd Party static libraries need to be public dependencies to work from installed engine. 2021-04-20 12:16:40 -07:00
chcurran 961f2ef113 Replace string/hash based execution out look up for indices, 10-50% speed up in lookup code. Fix bugs calling dependent functions. 2021-04-20 12:04:57 -07:00
nvsickle 33b485767f Address reviewer feedback, make FFont initialization state an atomic state machine 2021-04-20 11:49:59 -07:00
AMZN-mnaumov f4a57663fa Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
2021-04-20 11:38:34 -07:00
mbalfour d9fe89ba56 Addressed feedback - made string& into a string_view. 2021-04-20 13:37:10 -05:00
AMZN-mnaumov 3994d80c7e Merge pull request #148 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15271
[ATOM-15271] Fixing thumbnail pixelation
2021-04-20 11:37:02 -07:00
Brian Herrera 87155e0d5e Merge pull request #165 from aws-lumberyard-dev/build-strike/SPEC-6357
Add script to sync repo with upstream
2021-04-20 11:16:42 -07:00
galibzon 9ca29b5f33 Merge pull request #162 from aws-lumberyard-dev/Atom/garrieta/ATOM-15285/variantlist_bug
[ATOM-15285] ShaderVariantAssetBuilder code merge bug
2021-04-20 12:51:44 -05:00
shiranj dc5b4ee1dd Add Android package in packaging pipeline 2021-04-20 10:50:41 -07:00
luissemp 83324762b5 Brought over SC's command line fixes and add_node example script 2021-04-20 10:40:53 -07:00
cgalvan eee1597929 Merge pull request #163 from aws-lumberyard-dev/cgalvan/RemoveIPickObjectCallback
[LYN-3079] Removed IPickObjectCallback and edit tools that used it.
2021-04-20 12:33:42 -05:00
Steve Pham 58cef4e4c1 Merge pull request #161 from aws-lumberyard-dev/SPEC-6061
Removing 'periodic_test_profile' job from Android
2021-04-20 10:04:20 -07:00
Brian Herrera 8804ab8f1f Add script to sync repo with upstream 2021-04-20 09:56:46 -07:00
Chris Galvan fbc69e5fd7 [LYN-3079] Removed IPickObjectCallback and edit tools that used it. 2021-04-20 11:08:51 -05:00
garrieta 1a359ac50d [ATOM-15285] ShaderVariantAssetBuilder code merge bug
Fixing what appears to be a code merge/integration bug.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-04-20 10:59:02 -05:00
spham 37949abe25 Restoring original periodic_test_profile block but with the TAGS removed 2021-04-20 08:48:52 -07:00
cgalvan 22cfe18601 Merge pull request #140 from aws-lumberyard-dev/Editor/RemoveLegacyMaterialEditor
[LYN-3070] Removed legacy Material Editor.
2021-04-20 10:26:57 -05:00
spham fd7d3a41ee Removing 'periodic_test_profile' job from Android due to the fact that the Android Virtual Device is not supported on virtualized systems (Windows) 2021-04-20 08:06:27 -07:00
Aaron Ruiz Mora 1256994696 Cleaning up NvCloth gem. Removed any reference to LmbrCentral and legacy renderer since now it uses Atom. (#154)
- Removed any usage of LmbCentral and legacy renderer from NvCloth gem.
- Cloth rule can only be added to Mesh groups, not allowed in Actor groups anymore.
- Removed ActorAssetHelper since actors now share the mesh model format and therefore they also use MeshAssetHelper.
- Updated NvCloth gem.json file with the fields from the template.
- Updated cloth chicken asset to not convert axis.
2021-04-20 15:38:26 +01:00
mbalfour 3e8625b78b Added "IsReadyToSpawn" to help detect when a spawner is ready to start spawning. Also added a small optimization to SetDynamicSliceByAssetId so that it doesn't do anything when setting it to the same value as before.
(cherry picked from commit ff8a93e71f3017e8555012855f3e2155ec74a405)
2021-04-20 09:36:36 -05:00
mbalfour 5aa4642c12 Added another implicit converter to MaterialPropertyValue so that generated images can be used with material properties more easily.
(cherry picked from commit 66d7e9672ca0d6ced068dd95d8b52f88b5492c1f)
2021-04-20 09:29:43 -05:00
mbalfour e8459898a7 Exposed Quaternion::CreateFromEulerAnglesDegrees and Transform::Transform(Vector3, Quaternion, Vector3) to the behavior context to improve usability of these classes from scripts.
(cherry picked from commit 8156beb21181f9ff20972c8ea8be5e3dc61f1700)
2021-04-20 09:08:40 -05:00
mbalfour 33e61ad35b Added SetEntityName and exposed Get/SetEntityName to the behavior context for use from scripts.
(cherry picked from commit 4f2e0b74727cfe99c74ed588769a540f24d7aa46)
2021-04-20 09:08:19 -05:00
mbalfour 7139525abf Merge branch 'main' of https://github.com/aws-lumberyard/o3de 2021-04-20 08:54:01 -05:00
Aaron Ruiz Mora f5a28d3a41 Merge pull request #128 from aws-lumberyard-dev/NvCloth_Atom_ActorAsset
Cloth data is exported/imported from the Atom Mesh that the Actor references
2021-04-20 09:12:01 +01:00
Vicky 86e5df908a Merge pull request #139 from aws-lumberyard-dev/Atom/qingtao/ATOM-15272
ATOM-15272 Running game with Actor spams asserts in the log resulting in low framerate
2021-04-19 21:59:33 -07:00
AMZN-daimini 7901fe8625 Reset the whole Qt model when an entry in the EditorEntityModel is removed. (#48) (#82)
An optimization introduced in Prefab mode currently changes the relative ordering of children, causing stale QModelIndex variables to still be referenced and crash the Editor sporadically. This change is theoretically a bit slower, but still much faster than the pre-optimization times.

Co-authored-by: Shirang Jia <shiranj@amazon.com>

Co-authored-by: Shirang Jia <shiranj@amazon.com>
2021-04-19 21:52:10 -07:00
Steve Pham b15850176b Merge pull request #131 from aws-lumberyard-dev/SPEC-3516
Add linux (ubuntu) setup scripts
2021-04-19 21:00:43 -07:00
Chris Santora c0e7f475d7 Merge branch 'main' into TexturePresets-ATOM-14765 2021-04-19 20:35:50 -07:00
mnaumov 7e48bee48f Fixing thumbnail pixelation 2021-04-19 18:24:23 -07:00