b6a710a7fa
Fixing more merge issues
2021-04-27 13:21:59 -07:00
ff635064bd
Forgot to stage this fix to a bad merge
2021-04-27 13:06:11 -07:00
901428668c
Merging latest origin
2021-04-27 13:03:31 -07:00
1a66d8db31
Using official ImGui fix for unused variable warning
2021-04-27 11:42:05 -07:00
71c315b2b7
SPEC-6510 Illegal instruction in asset_mac.sh on clean asset builds ( #349 )
2021-04-27 11:38:10 -07:00
8cb1edb7d7
Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics
2021-04-27 11:37:56 -07:00
a00d47365e
Merge pull request #295 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14585
...
[ATOM-14585] Enlarged thumbnails on hover
2021-04-27 10:53:18 -07:00
6aa5b5698f
Removed Cry FogVolume component ( #346 )
2021-04-27 12:17:50 -05:00
28d7b1f76b
Merge pull request #330 from aws-lumberyard-dev/LYN2903_ScriptCanvasDeleteComponentVariableCrash
...
Null check when removing old component variables.
2021-04-27 10:12:10 -07:00
c86314123e
Merge pull request #350 from aws-lumberyard-dev/SPEC-6538-main
...
SPEC-6538: Update Lua for mac to rev6 (Fix missing debug libs)
2021-04-27 10:00:46 -07:00
0042848b8a
Merge pull request #326 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6522-test-fix
...
SPEC-6522: Fixes AutomatedTesting::AtomRenderer_HydraTests_Main test.
2021-04-27 09:57:45 -07:00
001675aea4
Merge pull request #333 from aws-lumberyard-dev/fix-ctest-entrypoint-cmd-dev-dir-variable
...
SPEC-6543: fix DEV_DIR variable for ctest_entrypoint.cmd
2021-04-27 09:56:39 -07:00
66bdf4e26d
Fix and re-enabled blast tests and moved them to main
...
* Fixed and reenabled Blast tests
* moved blast tests to main
Co-authored-by: aljanru <aljanru@amazon.com >
2021-04-27 17:53:03 +01:00
17997b3df8
[LYN-3135] Animation Editor: Some of the default animation assets are broken ( #348 )
...
* Cowboy asset was missing mesh group.
* There was a coordinate system rule mismatch between the animations and the character that led to skinning artefacts.
2021-04-27 18:40:04 +02:00
fc3a48bb26
EMFX: Fix a crash when deleting blend tree node ( #331 )
2021-04-27 09:07:34 -07:00
5452b5d876
- Update Lua for mac to rev6 (Fix missing debug libs)
2021-04-27 08:09:07 -07:00
6987dac6f3
Merge pull request #242 from aws-lumberyard-dev/physx_ragdoll_create
...
Ragdoll now uses Add/Remove SimulatedBody
2021-04-27 15:53:23 +01:00
d20fb50c9d
Cloth CPU Skinning using MCore DualQuaternions instead of Cry DualQuat
2021-04-27 14:52:33 +01:00
00fca9489c
Fix editor crashing by protecting gEnv->g3DEngine
2021-04-27 14:52:10 +01:00
5e50fc2961
fix build failure
2021-04-27 14:43:54 +01:00
82fce4a90c
Merge branch 'main' into physx_ragdoll_create
2021-04-27 14:21:10 +01:00
95a44c481a
fixed errors from main merge
2021-04-27 14:17:05 +01:00
7f1e3b4054
Moving largeworlds's failing tests to sandbox
2021-04-27 13:56:31 +01:00
9fa470e2e8
Merge pull request #234 from aws-lumberyard-dev/hultonha_LYN-3064_trackview-simplemotion-only
...
LYN-3064 - Fix bug for setting SimpleMotion asset in Track View
2021-04-27 12:45:06 +01:00
b85c5f42ed
Merge branch 'main' into hultonha_LYN-3064_trackview-simplemotion-only
2021-04-27 11:41:13 +01:00
fbb8727407
Merge branch 'main' into physx_ragdoll_create
2021-04-27 11:04:04 +01:00
c415fcc0b4
Cloth will override all the vertices of the mesh and do CPU skinning on the non-simulated vertices when the optimization 'remove static particles' is enabled
2021-04-27 10:00:27 +01:00
cfc09ccfb7
Merge pull request #305 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15244
...
[ATOM-15244] Crash: Reflection Probe, Untoggle 'Use Baked Cubemap' when probe entity is deactivated
2021-04-26 21:56:42 -07:00
ab60db65cb
Merge pull request #147 from aws-lumberyard-dev/genewalt_emfx_ReleaseUnusedRawAssetDataAfterInit
...
Release unused raw asset data in EMotionFX asset
2021-04-26 19:27:28 -07:00
9da7349907
fix DEV_DIR variable for ctest_entrypoint.cmd
2021-04-26 17:52:19 -07:00
3998a8b622
Merge branch 'main' into Atom/dmcdiar/ATOM-15244
2021-04-26 17:35:19 -07:00
7da10ac924
Null check when removing old component variables. This is used for graph properties that have been deleted.
2021-04-26 16:17:14 -07:00
4f28b82862
Merge pull request #323 from aws-lumberyard-dev/mbalfour/newlevelcrashes
...
Added a handful of null checks to let new level creation succeed.
2021-04-26 17:59:20 -05:00
bf70ccaa39
remove unused import
2021-04-26 15:32:29 -07:00
8c54cf8633
increase test timeout and add missing test case IDs
2021-04-26 15:29:49 -07:00
6c6bd09ee5
Merge pull request #152 from aws-lumberyard-dev/Atom/antonmic/pbr_01
...
Atom/antonmic/pbr 01
2021-04-26 15:15:16 -07:00
f76b69d480
Added a handful of null checks to let new level creation succeed.
2021-04-26 16:15:25 -05:00
44f1a627e7
Merge pull request #300 from aws-lumberyard-dev/Prefab/LYN-3100
...
KEYSTONE USE CASE | Save changes to non-root container entities in the link to the parent instance
2021-04-26 13:20:35 -07:00
764cd52c26
Fixed whitebox tests using correct imports
...
Fixed whitebox tests using correct imports
Co-authored-by: aljanru <aljanru@amazon.com >
2021-04-26 21:06:01 +01:00
c4e3c39ee2
PR feedback
2021-04-26 12:44:51 -07:00
e5b5067748
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false ( #315 )
...
Change LOAD_LEGACY_RENDERER_FOR_EDITOR from true -> false, and added some null checks to protect against gEnv->pRenderer and gEnv->p3DEngine now being null in the editor as well as the launcher.
2021-04-26 13:15:32 -06:00
d27c43e595
Merge pull request #316 from aws-lumberyard-dev/cgalvan/GetSelectedEntitiesCount
...
[LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API.
2021-04-26 13:50:48 -05:00
5d2db78f74
[LYN-3272] Added missing call in unit test.
2021-04-26 13:25:55 -05:00
818c2526c9
[LYN-3306] EMotionFX: Client sample asset does not animate with simple motion component ( #313 )
...
* Removed discrepancy between editor and game simple motion components which led to an animation being played in the game one while the editor component looked broken for animations with root joints animated only.
* Sharing a new in-place attribute between the game and editor components that lets users control whether positional and rotational changes shall be applied onto root joints or not.
2021-04-26 19:53:39 +02:00
a1685ecca9
{LYN-2074} Add Animation data types Behavior for the scene graph ( #253 )
...
{LYN-2074} Add Animation data types Behavior for the scene graph (#253 )
* https://jira.agscollab.com/browse/LYN-2074
* moved scene API color to centeralized location
BlendShapeDataFace
BlendShapeData
2021-04-26 12:08:43 -05:00
9d57095e1c
[LYN-3272] Added API for retrieving the number of selected entities. Updated InfoBar to use this new API.
2021-04-26 11:49:48 -05:00
2c437d7af4
Merge pull request #294 from aws-lumberyard-dev/jckand/FoundationAuto
...
Moving Large Worlds tests back to CPU test suite
2021-04-26 11:13:21 -05:00
e468a93a13
Convert OpenSSL to the new 3p package system ( #213 )
2021-04-26 08:35:40 -07:00
90f51961c4
Merging main and resolving conflicts
2021-04-26 09:54:32 -05:00
fbfc2e4968
Fix cloth editor component logic to keep the last known mesh node and restore it later.
...
- Fix cloth editor component logic to keep the last known mesh node and restore it later.
- Fix cloth assets slices, materials were missing.
2021-04-26 15:49:44 +01:00
karlberg
Esteban Papp
AMZN-mnaumov
Terry Michaels
Gene Walters
Steve Pham
jromnoa
AMZN-AlexOteiza
Benjamin Jillich
rhongAMZ
spham
amzn-sean
Aaron Ruiz Mora
Tom Hulton-Harrop
hultonha
dmcdiarmid-ly
jromnoa
dmcdiar
Gene Walters
Mike Balfour
antonmic
mbalfour
AMZN-daimini
mnaumov
bosnichd
cgalvan
Chris Galvan
jackalbe
jckand-amzn
Chris Burel
jckand