a2d2a37220
Better commenting and readability fixes
2021-05-04 10:38:21 -07:00
b5d62b9cf6
Better variables
2021-05-04 10:36:57 -07:00
cc15e0d489
Avoid alignment issue if it ever went to cbuffer
2021-05-03 13:19:53 -07:00
cff730b4b8
Merge branch 'main' into Atom/mriegger/PLS
2021-04-30 11:46:08 -07:00
738883a9b0
Kens feedback
2021-04-30 11:43:32 -07:00
6f503b5225
Merge pull request #473 from aws-lumberyard-dev/mbalfour/cherrypick-lyn-3411
...
Cherrypick from 1.0 - [LYN-3411] Editor freezes when saving/reloading slice due to deadlock
2021-04-30 13:19:22 -05:00
1681e97a0c
ATOM-15369 LYN-3352 Expose sorting paramers to DynamicDrawContext's draw functions ( #451 ) ( #463 )
...
* ATOM-15369 Expose sorting paramers to DynamicDrawContext's draw functions
LYN-3352 LyShine: First element in Hierarchy does not properly draw in UI Editor
Add function to DynamicDrawContext to support set sort key for followed draw calls.
Use different sort key for background draw and top layer draw in UI canvas.
2021-04-30 11:19:13 -07:00
759e784e81
Merge pull request #480 from aws-lumberyard-dev/scripting/palette_fix
...
Removed BC Setters from showing up in the node palette
2021-04-30 11:10:19 -07:00
b294c88e2a
SPEC-5122 Git prune step fails to remove deleted branches in the work… ( #442 )
2021-04-30 10:43:40 -07:00
a1319983df
Remove the legacy renderer and all associated tools ( #476 )
...
Remove the legacy renderer and all associated tools:
- Code/CryEngine/Cry3DEngine/*
- Code/CryEngine/RenderDll/*
- Code/Tools/CryFXC/*
- Code/Tools/HLSLCrossCompiler/*
- Code/Tools/HLSLCrossCompilerMETAL/*
- Code/Tools/RC/*
- Code/Tools/ShaderCacheGen/*
- Tools/CrySCompileServer/*
- Tools/PakGenFromRCList/*
2021-04-30 11:22:33 -06:00
24fb48ea8c
Merge pull request #271 from aws-lumberyard-dev/mpgem_editor
...
Adding Multiplayer.Editor which allows specifying a server process for use with Editor on Ctrl+G
2021-04-30 09:54:30 -07:00
4652b4e38a
Merge pull request #475 from aws-lumberyard-dev/cgalvan/NewViewportInteractionBusRemoval
...
[LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled.
2021-04-30 11:40:03 -05:00
ab5ffc7604
Removed BC Setters from showing up in the node palette
2021-04-30 09:35:41 -07:00
3f607a1072
Merge pull request #477 from aws-lumberyard-dev/mbalfour/main-spec-6600
...
[SPEC-6600] Disabling unit tests that intermittently fail AR runs.
2021-04-30 11:30:41 -05:00
f8633f0ba8
LYN-3112 Add CMakeTestbed to github and setup the Jenkins job to use an installed version ( #461 )
2021-04-30 09:16:36 -07:00
70d53f117f
Merge pull request #471 from aws-lumberyard-dev/polygon_prism_genv_crash
...
Polygon prism genv crash
2021-04-30 16:30:37 +01:00
c69a00fd80
[SPEC-6600] Disabling unit tests that intermittently fail AR runs.
2021-04-30 10:25:48 -05:00
6ace9ffedb
[LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled.
2021-04-30 10:24:01 -05:00
cc148743fd
[main] replace cpack generator with zip for now
...
Merge pull request #464 from aws-lumberyard-dev/cpack_installer
2021-04-30 08:13:56 -07:00
ca08d78dd6
Merge pull request #441 from aws-lumberyard-dev/cgalvan/OldVIMLogicRemovalSecondPass
...
[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.
2021-04-30 09:55:08 -05:00
2cfb7d536e
[LYN-3411] Editor freezes when saving/reloading slice due to deadlock between main thread which is blocked waiting on a loading asset, and the loading thread, which is blocked on a mutex held by the main thread.
...
The specific mutex is "m_assetMutex" in the AssetManager. AssetManager::ReloadAssetFromData was holding this lock while calling AssignAssetData, which goes on to call OnAssetReloaded. This is dangerous, because any arbitrary logic can be executed during that call, including blocking asset loads, which is what happens in this specific deadlock case. The fix is to move the call to AssignAssetData outside of the mutex lock. AssignAssetData itself already grabs the assetMutex to protect the parts of its logic that are necessary, and then specifically releases the lock before calling OnAssetReloaded, so this change shouldn't introduce any dangerous threading conditions.
(cherry picked from commit 1581a28339f12d521955edef890acfb678a0df6f)
2021-04-30 09:13:30 -05:00
6eaf27e802
merging from main
2021-04-30 14:40:30 +01:00
1d4c483e73
Red code legacy renderer ( #383 )
...
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:
Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
2021-04-30 07:31:42 -06:00
d4d47cf492
fixing gEnv dereference crash in polygon prism debug draw
2021-04-30 14:31:07 +01:00
9da11f9d3b
[LYN-3419] Removed now unused viewportSearch from ViewportTitleDlg and all related code.
2021-04-30 06:58:16 -05:00
aa5ddbf532
[LYN-3344] EMotionFX: Data integrity error, missing keyframe at the end of the animation ( #418 )
...
Animation tracks in the DCC tool formats are often stored individually, each having its own duration. For EMotion FX motion data, it is required to have tracks with the same duration and e.g. a position track has to match the duration of a morph track. This will be automatically fixed by adding missing keyframes at the end of the tracks to match the animation's global duration. The value of these are the same as the last one of the given track so that they freeze at that value.
* Added function that adds missing keyframes to match the individual tracks' duration for the non-uniform motion data in emfx.
* Added data integrity checks for various stages of the motion data builder / motion exporter.
* Checking for data integrity issues with an assert in the emfx importer. This is just a safety check and we don't need that for release builds as they should be captured at asset processing time already.
2021-04-30 07:21:52 +02:00
2aa8e08b12
Merge pull request #460 from aws-lumberyard-dev/carlitosan-beta-fixes
...
Carlitosan beta fixes, parser fixes for function scope variables that need static initialization
2021-04-29 20:15:52 -07:00
aadc72aafb
[cpack_installer] replace cpack generator with zip for now
2021-04-29 19:08:45 -07:00
6d45e9e408
Merge branch 'main' into carlitosan-beta-fixes
2021-04-29 18:21:09 -07:00
1d7fc92930
Fixes errors in function scope variables that require static initialization
2021-04-29 18:19:14 -07:00
dcb253e08c
Merge pull request #321 from aws-lumberyard-dev/modify_test_timeout
...
Modify test timeouts
2021-04-29 18:03:45 -07:00
292e94fae8
Merge pull request #432 from aws-lumberyard-dev/fix_shaderlist
...
Fix shader list tool bug mixing positional and non-positional argparse flags
2021-04-29 18:02:40 -07:00
cdad99cefa
[main] fixed gem asset install logic and included gem registry folder in install
...
Merge pull request #436 from aws-lumberyard-dev/install_gem_assets_fix
2021-04-29 16:50:49 -07:00
07780e137b
Merge pull request #440 from aws-lumberyard-dev/pruiksma/ATOM-15427
...
Cherry pick [ATOM-15427] from 1.0 to main.
2021-04-29 18:44:31 -05:00
4fd9ad5341
Merge pull request #414 from aws-lumberyard-dev/Atom/moudgils/DisableMetalShaders
...
Disable metal shaders that dont cross compile correctly
2021-04-29 16:37:07 -07:00
37f0b44de4
[install_gem_assets_fix] include the Registry folder in the gem install filtering
2021-04-29 16:01:15 -07:00
8fc0b84d99
Merge branch 'main' into mpgem_editor
2021-04-29 15:14:28 -07:00
ef658b0cc7
Merge pull request #423 from aws-lumberyard-dev/MultiplayerPipeline
...
Added NetworkPrefabProcessor into Ctrl+G pipeline + minor fixes
2021-04-29 23:10:48 +01:00
217ba1e816
[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.
2021-04-29 16:45:39 -05:00
109605a733
Cherry pick 06044522763512b78ae504f658a3e7cb5f99996c from 1.0 to main.
...
[ATOM-15427] Fixing crash in DirectionalLightFeatureProcessor caused by incorrect use of a container.
2021-04-29 16:44:24 -05:00
ce17170bae
[install_gem_assets_fix] revert gem asset folder glob to use CMAKE_SOURCE_DIR instead of CMAKE_CURRENT_SOURCE_DIR
2021-04-29 14:40:49 -07:00
54e06b0f63
Update EBS deletion labmda to handle PR closed event ( #406 )
...
* Update EBS deletion labmda to handle PR closed event
* Remove print used for debugging
2021-04-29 14:07:19 -07:00
79886a7db3
Merge pull request #430 from aws-lumberyard-dev/carlitosan-beta-fixes
...
Carlitosan beta fixes - use long brackets for Lua implementation of ScriptCanvas strings
2021-04-29 13:56:13 -07:00
9df8ac76d4
[install_gem_assets_fix] fixed glob/filter logic for finding gem asset directories to install
2021-04-29 12:57:11 -07:00
dfb262c572
Merge branch 'main' into MultiplayerPipeline
2021-04-29 20:53:53 +01:00
6fe13be1ff
Merge pull request #428 from aws-lumberyard-dev/scripting/fix_lua_clear_cache
...
Scripting/fix lua clear cache
2021-04-29 12:05:20 -07:00
a746223c65
Change AtomSampleViewer screenshots to use png ( #336 )
...
Add functionality to capture png screenshots.
2021-04-29 12:01:32 -07:00
1234a3785a
Fix shader list tool bug mixing positional and non-positional argparse flags
2021-04-29 11:19:45 -07:00
3c5c692148
Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
...
Fix viewport box selection
2021-04-29 11:19:28 -07:00
b70103ae98
Merge branch 'main' into carlitosan-beta-fixes
2021-04-29 11:02:23 -07:00
Michael Riegger
Mike Balfour
Vicky
Luis Sempé
Esteban Papp
bosnichd
AMZN-puvvadar
cgalvan
luissemp
greerdv
mbalfour
Chris Galvan
Scott Romero
greerdv
Benjamin Jillich
carlitosan
Sean Sweeney
Ken Pruiksma
moudgils
puvvadar
SergeyAMZN
Shirang Jia
pereslav
hershey5045
Nicholas Van Sickle