564bf0c819
Merge commit 'fc547d902c2e110b671a095b9731aff18154e68d' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:46 -08:00
fa7d7e2ec3
Merge commit 'b3e2c3f075db1f28277c0a35987318449b4eeeb9' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 12:54:34 -08:00
ade8183473
Merge commit '76b7e73f6f1b34a2499e3d192a7683dc91ce70e2' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:26 -08:00
14e4fd40d4
Merge commit '5ec582484978e61429ccd7a962405c3e9f1ba819' into amzn-tommy/gitflow_211116_o3de2
2021-11-16 11:49:22 -08:00
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
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
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
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
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
19acf94606
Remove the legacy ViewSystem and some other tangentially related legacy code. ( #5558 )
...
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-11 13:29:51 -07:00
2b248ac485
Fix merge issue and validation issue
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-11 12:09:24 -08:00
3d21a9f4bd
Merge branch 'stabilization/2110' into Prism/DeleteUpdateGemsUI
2021-11-11 11:52:49 -08:00
cbe2948ba8
Merge pull request #5555 from aws-lumberyard-dev/ghi-4320/ProjectManagerLinuxDefaultClang
...
Project Manager Fixes for Linux
2021-11-11 11:21:06 -08:00
d71196102f
More PR feedback changes
...
Signed-off-by: nggieber <nggieber@amazon.com >
2021-11-11 10:20:46 -08:00
8d5dd4e35f
Merge remote-tracking branch 'upstream/stabilization/2110' into nvsickle/StabToDevNov21
...
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com >
2021-11-11 10:15:52 -08:00
08848ac781
Merge pull request #5493 from aws-lumberyard-dev/Prism/AdditionalProgressFixes
...
Handle servers with no content length and make downloading more obvious
2021-11-11 10:00:08 -08:00
289d783f25
Fixes for Project Manager on Linux
...
- Fix error with EngineFinder using the wrong path to locate project.json
- Simplified and expanded clang detection
- Remove forcing clang-12 for builds and will rely on the new cmake detection of clang by default
Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com >
2021-11-11 09:41:45 -08:00
2812ec2024
Fix brute force mesh intersection function ( #5447 )
...
* fix brute force mesh intersection function
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* add test for brute force ray intersection fix
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* refactor tests to remove as much duplication and provide API for future tests if required
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* small updates after review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* update following review feedback
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
* fix for pointer offset
Signed-off-by: Tom Hulton-Harrop <82228511+hultonha@users.noreply.github.com >
2021-11-11 16:33:08 +00:00
c07b666bec
Merge branch 'stabilization/2110' of https://github.com/aws-lumberyard/o3de into Prism/AdditionalProgressFixes
2021-11-11 08:19:21 -08:00
aee52d1677
Merge pull request #5533 from aws-lumberyard-dev/LYN-8169_ServerShouldNotLoadClientCfg
...
Removing Old Cry Code that Causes ServerLauncher to Load Client.cfg
2021-11-11 16:06:06 +00:00
6e70097ad7
Fixed all errors with default seeds ( #5489 )
...
* Cleaning up errors with default assets, used in bundled release builds
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
* Updated simple asset references to be to the product, not source assets
Signed-off-by: AMZN-stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-11 07:50:25 -08:00
2df8d5b620
Fixed crash if you save a bundle outside the default bundle folder ( #4974 ) ( #5255 )
...
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com >
2021-11-11 07:50:16 -08:00
edefb57cfd
Fixed crash when typing asset name and clicking browse ( #5495 )
2021-11-11 13:58:00 +00:00
de4e2d6308
Merge pull request #5544 from aws-lumberyard-dev/viewport/LYN-7989
...
Remove SurfaceManipulator.
2021-11-11 13:36:55 +00:00
039d2fc0c4
Remove SurfaceManipulator.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-11 12:13:55 +00:00
f24c3d3457
ASV Trace::Assert Environment.h(438) You are using an invalid variable, ( #5521 )
...
the owner has removed it!
This fixes the issue by forcing NameDictionary to not transfer
ownership. This means ComponentApplication()::Destroy will fully destroy
the NameDictionary before the OS::Allocator is destroyed.
In Windows the bug was not happening when running AssetProcessorBatch
because for Windows, _exit() is called before the application shutsdown
forcing all module to properly decrease the reference count of
EnvironmentVaqriableHolderBase::m_useCount for NameDictionary.
In MacOS, there's no _exit() so when the NameDictionary destructor was being called
before existing the application the reference count wouldn't be 0, and
would eventually try to destry the NameDictionary BUT the OS::Allocator
was already destroyed.
Signed-off-by: galibzon <66021303+galibzon@users.noreply.github.com >
2021-11-11 05:24:33 -06:00
f564903f37
Merge pull request #5497 from aws-lumberyard-dev/viewport/select_rect_fix
...
Fix attempted rendering of invalid Entity selection boxes.
2021-11-11 09:15:27 +00:00
161600a412
Removing old cry code that would load client.cfg for server launcher. Client.cfg should not be loaded by default. If you want to load a cfg then you should provide it via commandline (--console-command-file).
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-11-10 16:24:55 -08:00
Tommy Walton
amzn-mike
amzn-sj
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
bosnichd
nggieber
Steve Pham
Tom Hulton-Harrop
AMZN-Phil
AMZN-stankowi
AMZN-AlexOteiza
jonawals
Gene Walters