alexpete
c2a6addf1f
Integrating latest from github/TIF/Runtime
2021-04-20 10:42:39 -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
Chris Galvan
fbc69e5fd7
[LYN-3079] Removed IPickObjectCallback and edit tools that used it.
2021-04-20 11:08:51 -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
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
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
Steve Pham
407885dd1b
Merge pull request #77 from aws-lumberyard-dev/platform/SPEC-6061
...
SPEC-6061 Fixes for android nightly unit tests
2021-04-17 09:21:05 -07:00
spham
287a163af2
Merge branch 'main' into platform/SPEC-6061
2021-04-16 21:32:08 -07:00
lumberyard-employee-dm
7e81d407ca
Merge pull request #93 from aws-lumberyard-dev/LYN-2726-ProjectRoot
...
LYN-2726 Updated the Settings Registry Merge Utils logic to determine the project root in precedence of bootstrap.cfg -> *.setreg -> scan upwards for project.json location -> command line --project-path parameter
2021-04-16 22:51:21 -05:00
guthadam
d614b357e5
ATOM-5921 Material Editor: Select newly created materials in the asset browser
...
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.
https://jira.agscollab.com/browse/ATOM-5921
2021-04-16 22:11:01 -05:00
mcgarrah
6d3b9e4f51
Merge remote-tracking branch 'upstream/main' into LYN-2726-ProjectRoot
2021-04-16 21:12:55 -05:00
mnaumov
b3cc14dd5c
disabling source control thumbnails in material editor
2021-04-16 18:59:21 -07:00
Nicholas Van Sickle
944dab2ecb
Merge pull request #121 from aws-lumberyard-dev/nvsickle/ViewportFixesFrom10Round1
...
Cherry-pick from 1.0: Fix EditorViewportWidget stealing keyboard focus
2021-04-16 18:40:38 -07:00
lumberyard-employee-dm
1e80012df1
Merge pull request #79 from aws-lumberyard-dev/LYN-2461-Bootstrap
...
Removed AssetProcessor Settings from the bootstrap.cfg file as they get overridden by the Engine/Registry/bootstrap.setreg file and is therefore a "trap" to set them.
Users will not see any functionality change from modifiying those values.
2021-04-16 20:30:40 -05:00
mcgarrah
37b4b69bb9
Adding the */Code/Framework/AzCore/AzCore/PlatformId/PlatformDefaults.* path to the pal allowed list to allow mention of the IOS macro in the PlatformDefaults.h/PlatformDefaults.cpp file
2021-04-16 20:07:20 -05:00
spham
aaf2200122
Merge branch 'main' into platform/SPEC-6061
2021-04-16 17:58:49 -07:00