birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
392 Commits 3 Branches 3 Tags
961f2ef1133ec27d68cbf2d6ee0c839cdecf1760
Commit Graph

392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
mnaumov 7e48bee48f Fixing thumbnail pixelation 2021-04-19 18:24:23 -07:00
mnaumov d1ba2155c5 PR feedback 2021-04-19 15:55:58 -07:00
Guthrie Adams 2cd2550771 Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921 
ATOM-5921 Material Editor: Select newly created materials in the asset browser
 2021-04-19 17:53:15 -05:00
mnaumov 34be0cd4b5 Fixing string search 2021-04-19 15:31:45 -07:00
mnaumov 6abf17439a Adding "Create New Material" context menu option to folder in Material Editor 
Improving MaterialBrowser filter to show empty folders
 2021-04-19 15:22:32 -07:00
Esteban Papp ddb08789d2 SPEC-6395 GameLauncher monolithic build failure in CreateModuleClass_Gem_Blas (#137) 2021-04-19 15:14:48 -07:00
spham 86be2647c5 Fix apt-get command for installing specific version of cmake based on distro of ubuntu 2021-04-19 14:56:54 -07:00
spham 4232fa4232 - Renamed install-awscli.sh to install-ubuntu-awscli.sh 
- Update to use $EUID instead of 'whoami' to determine if script is running as sudo
- Tagging cmake version 3.20.1 specifically
 2021-04-19 14:52:13 -07:00
cgalvan 146633050b Merge pull request #55 from aws-lumberyard-dev/cgalvan/EntityHelperRefactor 
[LYN-2255] Refactored some EditorEntityHelpers so they can be re-used.
 2021-04-19 15:57:23 -05:00
Chris Galvan 4fb407e130 [LYN-3070] Removed legacy Material Editor. 2021-04-19 15:39:50 -05:00
Luis Sempé 95f701b74d Merge pull request #90 from aws-lumberyard-dev/scripting/function_node_fixes 
Scripting Canvas function variable scoping rules
 2021-04-19 13:39:28 -07:00
Guthrie Adams 3b4e424d38 Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950 
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
 2021-04-19 14:46:11 -05:00
qingtao c9153b0353 ATOM-15272 Running game with Actor spams asserts in the log resulting in low framerate 
The condition was setup wrongly when introducing DynamicInputAssembly.
 2021-04-19 11:47:57 -07:00
Chris Galvan 7f169855f3 Merge branch 'main' into cgalvan/EntityHelperRefactor 2021-04-19 13:18:27 -05:00
AMZN-mnaumov dc7cc77be6 Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269 
[ATOM-15269] disabling source control thumbnails in material editor
 2021-04-19 10:57:03 -07:00
Chris Galvan 06d6ab9715 [LYN-2255] Updated unit test to use matchers to reduce lines and improve readability. Also fixed some other minor code feedback. 2021-04-19 12:29:58 -05:00
spham 9a0b47137a Add linux setup scripts to: 
1. Install Linux AWSCLI
2. Install Linux Git, GitLFS, and GCM
3. Install Linux build libraries and tools for O3DE
 2021-04-19 10:14:59 -07:00
jackalbe a7f5462f3d Merge pull request #114 from aws-lumberyard-dev/sceneapi_script_regression 
{LYN-2635} Helios - Wrote auto tests for Python asset builder and scene API
 2021-04-19 12:07:32 -05:00
lumberyard-employee-dm d6788996fc Merge pull request #130 from aws-lumberyard-dev/LYN-3055 
Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or
 2021-04-19 11:52:16 -05:00
jackalbe 5c3e5aa7db removing all to_lower() 2021-04-19 11:26:15 -05:00
jackalbe 387dd1e43a normalizing Linux path 2021-04-19 11:09:55 -05:00
Benjamin Jillich 568b31cf1c [LYN-2856] EMotionFX: Creating an Anim Graph snapshot crashes the Editor (#67) 
Cherry picking bug fix from 1.0
 2021-04-19 18:03:28 +02:00
AMZN-stankowi 4c2260af97 Lyn 2651 rebased to main (#74) 
* Helios - LYN-2651 Lerping bones, cleaned up key frame generation for morph targets. Merge from 1.0.
 2021-04-19 08:51:52 -07:00
jackalbe febad58c64 LYN-652 to unblock Linux Automated Testing 2021-04-19 10:26:41 -05:00
mcgarrah 9412078992 Fixed issue if the "/Amazon/AzCore/Bootstrap/<platform>_assets" or 
"/Amazon/AzCore/Bootstrap/assets" key is set, then it would append that
value to the default asset platform value for the OS
 2021-04-19 10:23:58 -05:00
jackalbe ce6d9e51ee Merge branch 'main' into sceneapi_script_regression 2021-04-19 09:32:29 -05:00
moraaar 4e19d6a83a Merge branch 'main' into NvCloth_Atom_ActorAsset 2021-04-19 11:23:57 +01:00
dmcdiarmid-ly c5657373b5 Merge pull request #127 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15245 
[ATOM-15245] Baking a Reflection Probe crashes the Editor
 2021-04-18 23:52:01 -07:00
dmcdiar 46b9f1934d Removed commented line 2021-04-18 23:15:02 -07:00
dmcdiar 456bcb3bf9 Updated the EnvironmentCubeMapPipeline to match recent changes to the MainPipeline. 
Set the multisample state on the EnvironmentCubeMapPipeline render settings.
 2021-04-18 14:57:52 -07:00
guthadam 8fead27c45 ATOM-13950 Material Editor: Removing auto select option from lighting and model presets 
Remove option from presets

Updated code to select current default options

Will data drive default options with editor settings or settings registry in upcoming tasks

https://jira.agscollab.com/browse/ATOM-13950
 2021-04-18 12:12:32 -05:00
jckand-amzn cc6393b074 Merge pull request #119 from aws-lumberyard-dev/jckand/LYN-2764 
LYN-2764: Replacing image asset for ImageGradient automated test
 2021-04-17 12:06:59 -05:00