4e0399b283
Merge pull request #3309 from aws-lumberyard-dev/carlitosan/development
...
JSON serialization of SC Editor Assets
2021-08-24 11:45:18 -07:00
0d74d3ed5d
Merge pull request #3377 from aws-lumberyard-dev/mnaumov/LYN-4539
...
Allowing prefabs with missing components to load, and clarifying error message
2021-08-24 10:42:40 -07:00
90912759f7
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-23 17:08:00 -07:00
b820c36c80
clang is more specific where the modifier should be
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 16:17:10 -07:00
794c22c02e
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-23 16:02:58 -07:00
f7eaa4490f
fixing syntax errors
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-23 13:40:01 -07:00
f224d657be
Ronald's feedback
...
Co-authored-by: AMZN-koppersr <82230785+AMZN-koppersr@users.noreply.github.com >
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-23 13:02:12 -07:00
875918deda
Allowing prebas with missing components to load, and clarifying error message
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com >
2021-08-23 12:59:13 -07:00
53dfb1a39e
remove unnecessary ALIGN macros
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 20:36:11 -07:00
d7d2e84fee
Added all the missing serializer support, fixed up serialization notification
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-20 19:35:38 -07:00
c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false
2021-08-20 13:42:19 -07:00
8bc9ed3d01
removing some rad leftovers ( #3366 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 13:39:51 -07:00
b3023242d0
Merge branch 'development' into cmake/win_fix_warn_4296
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 11:18:43 -07:00
4e618db62d
Merge pull request #3082 from aws-lumberyard-dev/MultiplayerForwardDeclControllerErrorFix
...
Fix Multiplayer AutoComponent Delete Incomplete Type Compile Error
2021-08-20 09:52:11 -07:00
62a0041245
enable warning 4296: 'operator': expression is always false
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 16:16:28 -07:00
d098b25b03
Adding support for ASan (Windows/MSVC) and fixing AzCore
2021-08-19 14:17:14 -07:00
f7831be7ce
Adding missing AssetManager_private.h header to cmake ( #3030 )
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-08-19 15:55:22 -05:00
61f7fe5dc5
Merge branch 'development' into cmake/AddressSanitizer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 12:25:41 -07:00
68b04fa6c1
Merge branch 'development' into cmake/AddressSanitizer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/LegacyAllocator.h
2021-08-19 11:44:28 -07:00
f8e99cd7dd
Merge branch 'development' into cmake/SPEC-2513_w4244
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/CryEditDoc.cpp
# Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
# Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
# Gems/PhysXDebug/Code/Source/SystemComponent.cpp
2021-08-19 08:53:41 -07:00
fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
...
Profiler spring cleaning
2021-08-19 08:48:23 -06:00
586678a5f9
Added a deferred queue to the AZ Console class ( #3298 )
...
* Added a deferred queue to the AZ Console class
An AZ Console instance will now store any console commands that could be
dispatched from a configuration file into a deferred queue, that can be
invoked later.
This can be used to defer execution of console commands in configuration files such as
.cfg, .setreg and .setregpatch files that are defined in gem modules that
have not been loaded yet.
The defered execution can then be invoked at any point later in the
application
Updated the Component Application CreateCommon function to invoke deferred console commands
after all the gems have loaded
fixes #2062
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Fixed variable shadowing in the Console Deferred Command Test
Updated commit for the ClearDeferredQueue function to just mention
clearing the queue
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Filtered out execution of the ConsoleRootCommandKey as a console command
The AZ::Console notification handler is tracking changes to the fields
of "/Amazon/AzCore/Runtime/ConsoleCommands" and it's children.
Now the "/Amazon/AzCore/Runtime/ConsoleCommands" field is the
ConsoleRootCommandKey and not an actual console command so it shouldn't
attempt to be invoked
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Moved the execution of deferred console commands after linking deferred
functors
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Moved the execution of deferred console commands into CreateModuleClass
hook
Any module that loads using the ModuleManager system will attempt to
execute any deferred console commands to allow newly registered commands
from that module to be dispatched.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-08-18 20:58:57 -05:00
cf44a4ad67
Address additional PR feedback
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 19:16:05 -06:00
cb7108e336
Addresses comments around AZ_TRAIT_UNIT_TEST_NAME_COUNT from PR
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-18 17:51:43 -07:00
f1349a3f60
Clean up vestigial PIX references in Atom
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:34:23 -06:00
ec6e9407f6
Remove RAD (pending future interface for external profiler registration)
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:15 -06:00
11d4543442
Reintroduce StatisticalProfiler and associated classes in deactivated
...
state
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:14 -06:00
5f2fe83c5b
Remove test associated with frame profiler going away
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:12 -06:00
a5f072f7a9
Remove statistics profiler
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:10 -06:00
df9b4d4a2f
Deprecate profiler categories based on global enum
...
(to be supplanted by registered budgets in the future)
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:09 -06:00
d15d40fec6
Add Windows PIX runtime support
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 17:33:07 -06:00
c701522adc
update error messaging, remove unnecessary comments
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 13:28:01 -07:00
1d1cea34dd
Undo artifacts for JsonUtils sojourn into AzToolsFramework
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-18 11:58:24 -07:00
dd80a3ebae
Linux and non-unity build fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-18 11:09:14 -07:00
ac7be2fb5a
PR observation about another race condition
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 18:29:24 -07:00
a49e07c8e9
improving comment
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 16:20:39 -07:00
4adf5c051e
more NameTest fixes, AzCore passing ASan
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 16:16:19 -07:00
e29479552b
alignment fix
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 15:53:14 -07:00
de9e991ccc
merge development
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 15:37:30 -07:00
88121f3bb4
move JsonUtils to AzCore
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 14:06:24 -07:00
0270fb7fbe
Initial saving/loading of JSON serialization of sc editor assets
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-08-17 13:47:20 -07:00
7be2b0b6c3
Fix for a leaky test
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 11:49:51 -07:00
964c2401df
Merge branch 'development' into cmake/AddressSanitizer
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 18:34:35 -07:00
06e6f83907
Cleanup and fixing of Code/Framework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:17 -07:00
e7f07147cb
More fixes for Code/Framework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:01 -07:00
58f8b563d0
fix them all
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:38:33 -07:00
75c388b746
change conversions to static_cast
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:43 -07:00
8ba0807cfc
Code/Framework/AzCore
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:29 -07:00
f6cdcddc52
fixes for Code/CryEngine
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:03:28 -07:00
81d26d322d
Code/Framework fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:02:53 -07:00
carlitosan
AMZN-koppersr
Mikhail Naumov
Esteban Papp
Mikhail Naumov
puvvadar
lumberyard-employee-dm
Jeremy Ong
Jeremy Ong
pappeste