e44fa2a52a
Merge commit '520c2b52d48f5e1c95e4a0ea2ec864088c70d0b9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:19 -08:00
d9eb4fa688
Merge commit 'c0df1846f4f34e7a8adb5191fbda213ff68a5a24' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:42:11 -08:00
fc61bce3af
Merge commit 'a544800536a5bebda96812951befa4d43b0474d3' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:59 -08:00
4ab3bd487f
Merge commit 'e0d736dd844a82b0c232739540a168078e63e276' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:39 -08:00
6080801c55
Merge commit '0b211d3743f612177cf529de9dbd30e5ae5216b2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:35 -08:00
65c3ad6545
Merge commit 'cbe2948ba87397fca12af8061fa90f74206ee426' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:22 -08:00
830c10b8b0
Merge commit '08848ac7817a704135014f222f156003c4a16832' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:41:18 -08:00
cb5c4256c7
Fix license text eliding
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-16 10:18:37 -08:00
db3d41ad9d
Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MaterialEditorHandlesMissingTextures
2021-11-16 10:06:28 -08:00
4d6e7f7ef9
Address PR comments.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 17:59:18 +00:00
921612594a
Add placeholder icon for back button.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 17:54:19 +00:00
3428bcb5da
Updated splash screen and about dialog with development name
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-16 10:07:45 -06:00
c3dacb1e52
Unlocked a mutex after modifying the associated variable ( #5625 )
...
* Unlocked a mutex after modifying the variable the mutex was meant for.
This fixes an issue where mounting bundles in the Editor was causing the Editor to freeze up, because the following line, m_levelOpenEvent.Signal, resulted in another attempt to lock that same mutex.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Added a comment describing why the unlock is necessary.
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-16 08:07:20 -08:00
83df483813
Updated splash screen and about dialog with Stable 21.11 name
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-16 10:05:48 -06:00
1546247922
Trivial refactor of comments.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 16:02:22 +00:00
f369fcb3d1
Merge remote-tracking branch 'origin/stabilization/2110' into viewport/EditorModeUIBackButton
2021-11-16 15:56:53 +00:00
6b201bf97c
Add back button to editor mode UI.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-16 15:55:22 +00:00
5e04ddcc02
Merge pull request #5647 from aws-lumberyard-dev/cgalvan/UpdateSplashScreenName
...
Updated splash screen and about dialog with Stable 21.11 name
2021-11-16 09:34:22 -06:00
b20a9b5f39
Some modifications required for restricted platforms: ( #5624 )
...
- Replace AZ_TRAIT_MAX_JOB_MANAGER_WORKER_THREADS with AZ_TRAIT_THREAD_NUM_JOB_MANAGER_WORKER_THREADS that allows the number of threads created by the job manager to be set directly.
- Add AZ_TRAIT_THREAD_NUM_TASK_GRAPH_WORKER_THREADS that allows the number of threads created by the task graph to be set directly.
- Add a define that forces the AsyncUploadQueue to use the primary copy queue instead of creating a secondary copy queue.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-16 08:27:32 -07:00
ce10906671
Updated splash screen and about dialog with Stable 21.11 name
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-16 08:08:53 -06:00
a5adf33427
Deactivate new Asset Picker View by default in the Editor ( #5614 )
...
Signed-off-by: AMZN-Igarri <82394219+AMZN-Igarri@users.noreply.github.com >
2021-11-16 10:47:02 +00:00
7f57548023
Adds triangle under cart button when cart is shown
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-15 20:00:20 -08:00
7d849cc0d2
Changed the overall strategy for how to handle missing image references. Instead of replacing it with one of the placeholder assets, we replace it with an random UUID which will be interpreted as a missing asset (unless some discovers discovers a UUID collision). This eventually gets replaced by one of the placeholder textures at runtime. This approach gives more consistent results in how missing texture are handled between Material Editor and Material Component.
...
I actually tried this approach before and it didn't seem to work the way we needed, but I realized that's because PropertyAssetCtrl wasn't handling missing assets properly. I fixed a few issues there including showing the error button when the asset can't be found, and fixing a broken reference to the error icon file.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com >
2021-11-15 16:51:22 -08:00
7031147e32
Added event to signal when the Editor is fully initialized so test scripts can listen for that instead of needed arbitrary wait commands. ( #5623 )
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-11-15 17:01:47 -06:00
8b7e538dd3
Cherry Pick: [LYN-7463] Fix insert streaming request failure ( #5604 ) ( #5622 )
...
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Re-enable disabled test which was failing for the same reason.
Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Instead of using a mutex, re-order the statements to remove the streamer request first
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit 0cea59d66980125227+amzn-mike@users.noreply.github.com >
2021-11-15 14:14:43 -08:00
63713ca284
Fix AssetBus connection policy to re-lock the mutex afterward since some destructors in the calling methods are still altering the context ( #5575 )
...
Also made the unlock conditional.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 12:23:56 -08:00
fc547d902c
Add message to indicate Json serialization of bitset is not supported ( #5590 )
...
Signed-off-by: amzn-sj <srikkant@amazon.com >
2021-11-15 14:09:43 -06:00
18cf128854
Remove some code duplication
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 11:50:28 -08:00
0cea59d669
[LYN-7463] Fix insert streaming request failure ( #5604 )
...
* Fix race condition where asset would finish loading and another request would start before the streamer request could be cleared
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Re-enable disabled test which was failing for the same reason.
Fix test timeout which was way too long.
Reduce test iterations to keep test time safely under 5 seconds.
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
* Instead of using a mutex, re-order the statements to remove the streamer request first
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-15 11:28:06 -08:00
b3e2c3f075
SetComponentProperty is now supported by undo operation ( #5599 )
...
* Adding undo support to SetComponentProperty to make it function with prefab system
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* Renaming a variable
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* PR feedback
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-11-15 11:01:42 -08:00
1ed0e09399
Merge branch 'stabilization/2110' into Prism/FixGemCart
2021-11-15 10:20:36 -08:00
e62af4260b
Moves Cart to Right Panel with Gem Inspector
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-15 10:20:04 -08:00
07c142b975
Remove temporary changes and remove key before building
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-15 08:51:00 -08:00
f9824fc4ee
Merge pull request #5586 from aws-lumberyard-dev/IMGUI_EntityOutlinerFix
...
Fixed IMGUI Entity Outliner to show net entities
2021-11-15 14:23:10 +00:00
38a03817bb
Removal and Replacement of the CryTimer (gEnv->pTimer) ( #5409 )
...
Replaced and removed the CryTimer (gEnv->pTimer). The new TimeSystem is a merger of the current time functionality found in the engine.
* Rename TimeSystemComponent.h/.cpp to TimeSystem.h/.cpp
* Adding New TimeSystem
* remove old timer cvars
* small improvements to the time system.
- updated parts to use the time conversion functions.
- in AdvanceTickDeltaTimes applying t_simulationTickScale is now uses doubles instead of floats.
* Replace gEnv->pTimer / ITimer usages with TimeSystem
* Updating usages of AZ::TimeMs{ 0 } and AZ::TimeUs{ 0 } to AZ::Time::ZeroTimeMs and AZ::Time::ZeroTimeUs
* red code the CryTimer
* using TimeUs instead of TimeMs is some cases + updating usages of old cvars to new
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-11-15 12:11:58 +00:00
76b7e73f6f
Fully Replaces Remote Gems in Model and Selects Them When Downloading and Deleting ( #5593 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 16:23:04 -08:00
5ec5824849
Hide the "up one level" button temporarily. ( #5595 )
...
Signed-off-by: Danilo Aimini <daimini@amazon.com >
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-12 14:16:44 -08:00
520c2b52d4
Merge pull request #5584 from aws-lumberyard-dev/Atom/guthadam/remove_mtl_references
...
Removing references and builders for legacy MTL assets
2021-11-12 13:47:50 -06:00
57adfd795e
Add a name to JobManager ( #5576 )
...
* Add a name to JobManager, all worker threads use that name to label their threads
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
* update with PR feedback, changed to use AZStd::fixed_string::format
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
* Fix copy paste errors using local variable names
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com >
2021-11-12 13:15:41 -06:00
c0df1846f4
Create desktop shortcut functionality ( #5536 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-12 11:03:43 -08:00
9e84c409bd
Trackview Fixture now disables save on finalize
...
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-11-12 08:03:43 -06:00
876576e568
Trackview Fixture now disables save on finalize
...
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-11-12 08:02:12 -06:00
435f839666
Fixed IMGUI Entity Outliner to show net entities
...
Signed-off-by: Sergey Pereslavtsev <pereslav@amazon.com >
2021-11-12 13:36:14 +00:00
a544800536
LYN-4946 | Merge Game Mode buttons in the Play Controls toolbar ( #5557 )
...
* LYN-4946 Double play buttons - Tranformer style into one.
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* compile fix
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Changes as per review.
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
* Address minor confusion points.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix rename operation missing some matches...
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Remove extra newline.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
Co-authored-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-11-11 17:36:12 -08:00
320ae45989
Removing material type asset info
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:09 -06:00
92c0e598d5
Starting to remove MTL asset references
...
Signed-off-by: Guthrie Adams <guthadam@amazon.com >
2021-11-11 19:20:04 -06:00
2c2c1d8137
Merge pull request #5562 from aws-lumberyard-dev/nvsickle/StabToDevNov21
...
Merge `stabilization/2110` as of `fac3d0b1bf` into `development`
2021-11-11 15:04:18 -08:00
bc20208f13
Create file in project directory on successful build for Project Manager
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-11 14:39:10 -08:00
e0d736dd84
Fixed the other call to CreateVariable ( #5561 )
...
in favor of CreateVariableEx
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com >
2021-11-11 16:04:22 -06:00
0b211d3743
Merge pull request #5513 from aws-lumberyard-dev/Prism/DeleteUpdateGemsUI
...
Adds Update and Uninstall Options for Downloaded Remote Gems to Gem Catalog
2021-11-11 14:01:42 -08:00
Tommy Walton
nggieber
santorac
John
Chris Galvan
AMZN-stankowi
bosnichd
AMZN-Igarri
amzn-mike
amzn-sj
AMZN-Phil
Mikhail Naumov
SergeyAMZN
amzn-sean
AMZN-nggieber
Danilo Aimini
Guthrie Adams
rgba16f
Alex Peterson
Terry Michaels
Sergey Pereslavtsev
Guthrie Adams
Nicholas Van Sickle
galibzon
AMZN-Phil