6b96be82ea
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CrySystem/Log.cpp
# Code/Tools/Standalone/Source/Driller/Annotations/AnnotationHeaderView.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.cpp
# Code/Tools/Standalone/Source/Driller/AreaChart.hxx
# Code/Tools/Standalone/Source/Driller/ChannelDataView.cpp
# Code/Tools/Standalone/Source/Driller/DrillerCaptureWindow.cpp
# Code/Tools/Standalone/Source/Driller/Profiler/ProfilerDataView.cpp
2021-08-25 11:47:19 -07:00
d64c034fee
Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/FixedTrackViewNodeCrash
2021-08-25 12:05:09 -05:00
c37c0cab08
Refactor budget definitions as named functions instead of template specializations
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-24 15:07:30 -06:00
5e04c3737f
Add preliminary budget tracking system and remove driller integration
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-24 15:07:29 -06:00
07a14bdce1
Add AZ_BUDGET_DEFINE/AZ_BUDGET_DECLARE and remove driller
...
NOTE: The memory driller is still intact for now to avoid needing to
modify allocators, but the frame/cpu portions of driller and the
standalone executable are now gone.
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-24 15:07:27 -06:00
306a7a622d
Fixed memory stomping leading to Track View nodes with invalid labels and crash.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-24 15:29:00 -05:00
5ca84cb07e
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/Cry_Camera.h
# Code/Legacy/CryCommon/IShader.h
2021-08-24 10:46:18 -07:00
9c7b55a31d
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
# Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
# Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
# Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
2021-08-24 10:43:48 -07:00
63a2925720
more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 17:21:59 -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
a75994e0b9
more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 15:11:09 -07:00
7308578e55
reverting a change that will be cleaned by another PR
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 14:58:47 -07:00
cb7b084e6b
Code/Legacy
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 13:01:03 -07:00
8c526eeeb6
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-23 11:13:56 -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
7558a3d233
fixes for Android
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 19:40:13 -07:00
c07b9d31bf
PR comments/improvements
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 19:21:50 -07:00
3eb795a305
alignment mismatches
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:40:20 -07:00
e98bab8a75
fixing format strings
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 18:39:00 -07:00
ca03f65a5d
Code/Legacy/CryCommon
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 17:54:03 -07:00
c86d650c1a
Updated the CrySystem module to execute deferred console commands ( #3371 )
...
* Updated the CrySystem module to execute deferred console commands
This allows the CVars declared in CrySystem module to execute commands
invoked before it was loaded.
This is particularly useful for the load level command
resolves #2062
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Moved the invocation of deferred console commands after the LevelSystem
instance has been created
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-08-20 19:46:36 -05:00
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:51:35 -07:00
9245a31196
more fixes for Code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 14:48:42 -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
a35464ca08
more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 10:09:44 -07:00
30e46cc377
Merge pull request #3361 from aws-lumberyard-dev/cgalvan/FixConsoleVarsCrash
...
Fixed console variables crash.
2021-08-20 11:43:29 -05:00
bf42e3f02a
Non-terrain-gem changes in support of upcoming terrain work. ( #3345 )
...
In preparation for a prototype Terrain Gem to get submitted, there are a few changes that are needed outside of the Terrain Gem as well:
The TerrainDataNotificationBus lives in AzFramework/Terrain, and needed to be extended to contain an optional OnTerrainDataChanged event to notify other systems when a terrain region has changed.
The HeightmapUpdateNotificationBus was removed, as this was a legacy file from the old already-removed terrain system.
The EditorWrappedComponentBase<> wrapper received a small optimization to ensure that ConfigurationChanged() is only called when the value of visibility actually changes. With prefabs, it appears that sometimes OnEntityVisibilityChanged could be called multiple times in a row with the same visibility value.
The TerrainSurfaceDataSystemComponent was updated to use the correct busses, and is ready to be moved to the Terrain Gem in a subsequent PR.
Signed-off-by: Mike Balfour 82224783+mbalfour-amzn@users.noreply.github.com
2021-08-20 11:31:19 -05:00
69c6e63249
Fixed console variables crash.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-08-20 10:41:03 -05:00
63cd3db956
Removes LOADING_TIME_PROFILE_SECTION macros that are unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 18:26:09 -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
a97bccbf38
some fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-19 14:01:50 -07: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
cf44a4ad67
Address additional PR feedback
...
Signed-off-by: Jeremy Ong <jcong@amazon.com >
2021-08-18 19:16:05 -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
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
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
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
ea01904ecf
PR comments
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-17 17:40:49 -07:00
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
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
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
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
14990012f8
Code/Legacy
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:42:22 -07:00
75dc3e5836
CryEngine
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:39:13 -07:00
f76d09e215
Fixed assert about memory override when logged string is longer than the buffer size
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-08-17 00:19:57 +01:00
27c0ed9878
warning fixes for new code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:05:41 -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
4f2d4d00ec
Auto-completing the inserted text by pressing TAB within Editor's Console results in a silent crash
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 08:40:27 -07:00
Esteban Papp
Chris Galvan
Jeremy Ong
lumberyard-employee-dm
Mike Balfour
amzn-phist
pappeste
pereslav