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
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
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
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
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
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
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
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
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
0b6c3382f1
Add an additional comment
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 16:05:38 -08:00
9c57c9e64f
Fix track view bug where postfxs do not render correctly. ( #5465 )
...
* Fix track view bug where postfxs do not render correctly.
Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com >
* Reduce scope and add comments.
Signed-off-by: hershey5045 <43485729+hershey5045@users.noreply.github.com >
2021-11-10 16:03:50 -08:00
27f0aa7f13
LYN-7468 | Viewport manipulators for the container of the focused prefab should be hidden ( #5432 )
...
* Extend the level entity behavior to open prefab containers in focus mode. Disable manipulators for these entities too.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor adjustments
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Fix enum casing in Entity Inspector.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Split views between for Level and FocusedContainer entities.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Slightly different fix to support components on focused containers.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
* Minor fixesto RefreshSelectedEntityIds.
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com >
2021-11-10 14:43:32 -08:00
0bc3e6a18f
Let cart overlay be opened to view downloads even when there are no gems to be added or removed
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 12:33:28 -08:00
61d0ec9d6b
Remove debug messages. ( #5429 )
...
Leaving in the print for absorbed asserts to avoid running into future situations where important asserts are accidentally absorbed
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-11-10 13:22:47 -06:00
e0cc86e898
Remove AssetProcessorManagerTest AssertAbsorber and update test to use the one from the base class instead ( #5216 ) ( #5381 )
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
(cherry picked from commit b3301414ad
2021-11-10 13:21:42 -06:00
541e501b06
Re-add the line to open the cart overlay automatically when a new download starts
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 10:56:44 -08:00
528a747876
Don't allocate memory when processing WM_INPUT messages. ( #5491 )
...
This change was made years ago in CrySystem (see CSystem::HandleMessage in System.cpp), but looks like it never made it into the NativeWindow_Windows version.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-10 11:28:21 -07:00
3ced915f8e
Fix attempted rendering of invalid Entity selection boxes.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 17:36:21 +00:00
21f9a789c1
Merged the Editor.Camera.Tests with the Editor.Tests ( #5463 )
...
* Merged the Edtiror.Camera.Tests witht eh Editor.Tests
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Adds dependency to Camera.Editor gem which is used by the test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Inheirts from TraceBusHook instead of adding the default env to the test
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* makes order consistent between Setup/Teardown
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* adds missing header for non-unity builds
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
* Removes dependency to Camera gem
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-11-10 08:57:39 -08:00
0102894a83
Handle servers with no content length and make downloading more obvious
...
Signed-off-by: AMZN-Phil <pconroy@amazon.com >
2021-11-10 08:44:24 -08:00
ab37eb138c
[development] removed CryLibrary ( #5474 )
...
* [redcode_crylibrary] replaced CrySystem loading in launcher and editor with new custom wrapper that uses AZ::DynamicModuleHandle
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] removed all remaining references to CryLibrary
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] migrate CrySystem loading to use AZ::DynamicModuleHandle directly instead
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] clean up of CrySystemModuleHandle and old CrySystem module [un]init functions
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
* [redcode_crylibrary] added trailing newline to DllMain.cpp in CrySystem
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com >
2021-11-10 09:43:13 -07:00
838970206b
Animation Editor: Remove preview label ( #5449 )
...
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-11-10 16:23:43 +01:00
eb775a48dc
Make InputDeviceId's constructor constexpr. ( #5433 )
...
* Make InputDeviceId's constructor constexpr.
See also https://github.com/o3de/o3de/pull/4220
Signed-off-by: bosnichd <bosnichd@amazon.com >
* Updates based on review feedback.
Signed-off-by: bosnichd <bosnichd@amazon.com >
2021-11-10 08:06:27 -07:00
adf3357176
Merge pull request #5486 from aws-lumberyard-dev/viewport/ghi_5239
...
Fix for Issue #5239 : Component Edit Mode does not disable Entity Inspector interaction
2021-11-10 14:50:36 +00:00
027b0f86ae
Activate AssetBrowserTableView feature ( #5367 )
...
Signed-off-by: igarri <igarri@amazon.com >
2021-11-10 13:41:59 +00:00
0e3df14ea2
Add missing bus connection/disconnection.
...
Signed-off-by: John <jonawals@amazon.com >
2021-11-10 11:59:28 +00:00
15586ee53e
Adding missing pragma once at XcbInputDeviceMouse.h ( #5448 )
...
Signed-off-by: moraaar <moraaar@amazon.com >
2021-11-09 15:42:01 -08:00
934c0f2ec7
Made SerializeContext and BehaviorContext consistent with their class name
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-09 15:25:06 -08:00
d3b8b761fd
Improved messaging on assert about argument types lacking reflection for scripting
...
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com >
2021-11-09 14:51:10 -08:00
461b63c61a
Temporarily disable the platform filter ( #5454 )
...
Signed-off-by: Alex Peterson <26804013+AMZN-alexpete@users.noreply.github.com >
2021-11-09 14:14:13 -08:00
e1d53395fe
Propagation Optimization ( #5355 )
...
* Merge changes
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
* removing leftover immediate flag
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-11-09 14:05:15 -08:00
e6a1f8ed0a
Merge pull request #5108 from aws-lumberyard-dev/Prefabs/SpawnableEntityAlias
...
Ability to setup aliases for entities spawned from spawnables.
2021-11-09 13:17:59 -08:00
Tommy Walton
amzn-mike
SergeyAMZN
amzn-sean
rgba16f
Terry Michaels
Sergey Pereslavtsev
Nicholas Van Sickle
bosnichd
Steve Pham
AMZN-Phil
Tom Hulton-Harrop
AMZN-Phil
AMZN-stankowi
AMZN-AlexOteiza
jonawals
galibzon
Gene Walters
hershey5045
Danilo Aimini
Esteban Papp
Scott Romero
Benjamin Jillich
AMZN-Igarri
moraaar
lsemp3d
Alex Peterson
Mikhail Naumov
Ronald Koppers