Commit Graph

4529 Commits

Author SHA1 Message Date
Jeremy Ong 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
Jeremy Ong a5f072f7a9 Remove statistics profiler
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-18 17:33:10 -06:00
Jeremy Ong 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
Jeremy Ong d15d40fec6 Add Windows PIX runtime support
Signed-off-by: Jeremy Ong <jcong@amazon.com>
2021-08-18 17:33:07 -06:00
AMZN-koppersr 51792b8133 Merge pull request #3296 from aws-lumberyard-dev/mnaumov/LYN-3904
Improvements to Entity Outliner context menu
2021-08-18 14:00:01 -07:00
AMZN-nggieber 749ff5df74 Pressing Enter/Return Key While File Browse Widget is Focused Opens File Browser (#3304)
* Pressing enter or return opens file browse dialog on browse edit widgets

Signed-off-by: nggieber <nggieber@amazon.com>

* Remove unused header

Signed-off-by: nggieber <nggieber@amazon.com>
2021-08-18 13:37:19 -07:00
chcurran 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
Esteban Papp 1e136a02b0 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/Crcfix/crcfix.cpp
2021-08-18 12:39:24 -07:00
Esteban Papp 3f31a6f8bf Remove crcfix (#3294)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-18 12:38:00 -07:00
Mikhail Naumov 2c4e5c5630 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-3904
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-18 12:11:54 -07:00
Mikhail Naumov 8589bb99de cleaned up comments
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-18 12:01:07 -07:00
chcurran 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
Esteban Papp 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
chiyenteng 28d035c275 Add a new auto test for delete prefab workflow (#3143)
* Add a new auto test for delete prefab

Signed-off-by: chiyteng <chiyteng@amazon.com>
2021-08-18 10:55:45 -07:00
amzn-victor 7164b64bb5 Move BuildDebugSceneGraph function out of SceneProcessing gem (#3290)
Moved BuildDebugSceneGraph out of SceneProcessing gem and into DebugOutput class to allow the function to be shared, which ensures the same dbgsg format is outputted among any calls to the function.

* Move BuildDebugSceneGraph function, update all calls to this function

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Remove unused includes

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Remove z

Signed-off-by: Victor Huang <huavicto@amazon.com>
2021-08-18 09:48:24 -07:00
hultonha 350a088bd8 Merge pull request #3301 from aws-lumberyard-dev/hultonha_macfix
Move static variable initialization out of class definition
2021-08-18 17:15:05 +01:00
nggieber 599b1214ac Merge branch 'development' into Prism/RemoveTabFocus 2021-08-18 08:20:21 -07:00
John Jones-Steele 740ee1f8a4 Fixed wheel working on spinbox non focussed
Signed-off-by: John Jones-Steele <jjjoness@amazon.com>
2021-08-18 12:27:10 +01:00
hultonha 697fbcf121 move static variable initialization out of class definition
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-18 10:54:34 +01:00
Mikhail Naumov db91bdbf51 Improvements to Entity Outliner context menu
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 18:30:46 -07:00
Esteban Papp 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
Esteban Papp 1d7f690e06 missing header includes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 18:02:49 -07:00
Esteban Papp ea01904ecf PR comments
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 17:40:49 -07:00
Esteban Papp a49e07c8e9 improving comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 16:20:39 -07:00
Esteban Papp 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
amzn-phist 078e0a8693 Audio legacy cleanup - Move global functions to be handled by AudioSystemComponent (#3283)
* Removes legacy audio listener updates from ViewSys

These functions were empty and logging a warning, removed.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Move more audio functions to AudioSystemComponent

For global actions like Mute/Unmute, Reload, StopAll, Load/Unload Level,
we move those functions to be handled by the AudioSystemComponent in
LmbrCentral.  This lets us remove some includes of IAudioSystem.h from
Editor and Legacy/CrySystem.

There were several locations where audio banks were being loaded and
unloaded for a level.  Now they all call into the AudioSystemComponent
and we don't have multiple copies of the same code.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-08-17 17:59:09 -05:00
Esteban Papp e29479552b alignment fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 15:53:14 -07:00
chcurran de9e991ccc merge development
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 15:37:30 -07:00
Mikhail Naumov fca71f9455 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 14:14:56 -07:00
chcurran 88121f3bb4 move JsonUtils to AzCore
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
2021-08-17 14:06:24 -07:00
chcurran 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
Esteban Papp 0c6a838c6f fix warnigns after merge
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 13:22:52 -07:00
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
2021-08-17 12:10:46 -07:00
Esteban Papp 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
Mikhail Naumov 0d0a09b252 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 11:11:27 -07:00
mnaumov a20428d393 Fixing non unity build
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
2021-08-17 11:10:42 -07:00
Esteban Papp 3e06307461 Merge branch 'development' into cmake/AddressSanitizer
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-17 10:43:37 -07:00
mnaumov 6303b82976 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679 2021-08-17 09:53:04 -07:00
SergeyAMZN 5f8e970700 Merge pull request #3159 from aws-lumberyard-dev/MPWeaponsSQ
Fixed assert about memory override when logged string is longer than …
2021-08-17 17:14:15 +01:00
hultonha 7f603c59ad Fix for events that should have been consumed by manipulators (#3108)
* fix for events that should have been consumed by manipulators making their way to the main viewport handler

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add missing include for SANDBOX_API macro

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* add dependency on Qt::Test for AzToolsFrameworkTestCommon

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* fix order of buttons passed to QMouseEvent

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* potential fix for vtable error on linux

Signed-off-by: hultonha <hultonha@amazon.co.uk>

* potential fix for vtable error on linux again

Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-08-17 17:09:17 +01:00
Guthrie Adams c95f491635 Merge pull request #3126 from aws-lumberyard-dev/Atom/guthadam/atomtools_restore_source_control_spam_filter
AtomTools: restoring log message filter to ignore source control spam
2021-08-17 10:11:54 -05:00
amzn-victor eb1593a19c Changes to SDK wrappers and functions to allow more flexible scene file processing (#3112)
These changes allow for usage of different asset import SDKs to process scene files.

    Move AssImp specific code out of node, scene & material wrapper parent classes and into child wrapper classes (AssImpNodeWrapper, etc.), allowing child classes to expose import SDK code. Allows for more convenient implementation of other import SDK's elsewhere (such as in a gem).
    Add a loadingComponentUuid parameter to LoadSceneFromVerifiedPath to allow for usage of different loading components. Changed tests and all calls to this function accordingly.


* Move AssImp specific code out of wrapper parent classes and into child classes for gem usage

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Add loadingComponentUuid parameter to LoadSceneFromVerifiedPath function

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Make wrapper members protected, change pointer cast

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Adding spaces to fix style

Signed-off-by: Victor Huang <huavicto@amazon.com>

* Fix for pointer cast causing test failures

Signed-off-by: Victor Huang <huavicto@amazon.com>
2021-08-17 06:52:20 -07:00
Nicholas Van Sickle d1cedba042 Fix NativeWindow_Windows returning the wrong size. (#3153)
Make sure WM_WINDOWPOSCHANGED bubbles up so that we can see WM_SIZE.

Signed-off-by: nvsickle <nvsickle@amazon.com>
2021-08-17 08:20:33 -05:00
Esteban Papp e3cf15a00f Fixes for Android/Linux
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 19:52:00 -07:00
Esteban Papp 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
Esteban Papp 9a8ec8bfcd fix for clang
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 18:13:27 -07:00
Esteban Papp 0f26a6508a fixing comment
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 17:54:17 -07:00
Esteban Papp b8787739e1 more fixes after rebase
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 17:05:50 -07:00
Esteban Papp f0fa62bde3 PR comments/observations
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:46:48 -07:00
Esteban Papp 2963739288 Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-16 16:42:30 -07:00