d92dd162d0
Gems/ImGui
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-10 20:21:32 -07:00
c805d443d2
Merge branch 'development' into cmake/warn_virtual
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Legacy/CryCommon/IConsole.h
# Code/Legacy/CrySystem/LocalizedStringManager.h
# Code/Legacy/CrySystem/XConsole.h
# Code/Legacy/CrySystem/XConsoleVariable.h
# Code/Legacy/CrySystem/XML/XmlUtils.cpp
# cmake/Platform/Common/Clang/Configurations_clang.cmake
2021-09-07 18:42:40 -07:00
46c6923bf7
Enabling warnings around format security
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-07 15:17:40 -07:00
2a2847b15d
Legacy code cleanup - part 3 ( #3903 )
...
* Legacy cleanup - part 3
Not much is left that can be easily removed,
so I think this will be last cleanup before the legacy functionality is replaced.
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* fix windows build, remove a few more things, re-add one file
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Remove legacy RenderBus + more cleanups
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
* Remove MaterialOwnerBus.h
Clean-up in Cry_Matrix34/33
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-09-07 12:14:16 -06:00
bc27e5a6c7
Gems/ImGui
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-03 20:37:17 -07:00
ec8e6bcadf
Fixes clang cases
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-09-03 13:27:31 -07:00
fa0f2a1007
Fix unused warnings release ( #3677 )
...
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS
Signed-off-by: Steve Pham <spham@amazon.com >
2021-08-30 13:10:41 -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
89cc27fdef
Fix input priority conflict with LyShine and ImGuiPass ( #3329 )
...
* Fix input priority conflict with LyShine and ImGuiPass
Signed-off-by: abrmich <abrmich@amazon.com >
* Add GetPriorityDebugUI() input listener priority
Signed-off-by: abrmich <abrmich@amazon.com >
2021-08-23 13:05:19 -07:00
a35464ca08
more fixes
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-20 10:09:44 -07:00
23b2a51757
ImGui
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-16 16:03:50 -07:00
10f950b726
fix w4018
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-08-05 19:43:56 -07:00
b33a4db332
Merge branch 'development' into cmake/SPEC-2513_w4267
2021-08-02 18:03:04 -07:00
70b3840288
Fix the home key popping up ImGui when it shouldn't. ( #2620 )
...
This disables WM_INPUT forwarding to the input system while in game mode and makes ImGui listen to the synthetic keyboard events from the viewport instead - these synthetic events go through Qt's event system, so will only show up when the viewport "sees" a home key press.
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-29 16:30:45 -05:00
2ae8b36589
ImGui
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-27 19:30:07 -07:00
e76b65fce9
Reduce inclusion overhead a little bit
...
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com >
2021-07-20 02:31:38 +02:00
1f9b284de2
Merge branch 'development' into cmake/SPEC-7179
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
# Conflicts:
# Code/Editor/Plugins/ComponentEntityEditorPlugin/ComponentEntityEditorPlugin_precompiled.h
# Code/Editor/Plugins/EditorCommon/EditorCommon_precompiled.h
# Code/Editor/Plugins/EditorCommon/stdafx.cpp
# Code/Editor/Plugins/FFMPEGPlugin/FFMPEGPlugin_precompiled.h
# Code/Editor/Plugins/PerforcePlugin/PerforcePlugin_precompiled.h
# Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsTool_precompiled.h
# Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h
# Code/Tools/AssetProcessor/native/precompiled.h
# Code/Tools/Standalone/StandaloneTools_precompiled.h
# Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h
# Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h
# Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/Mac/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Include/Platform/iOS/Atom_RHI_Metal_precompiled_Platform.h
# Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h
# Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake
# Gems/Atom/RHI/Null/Code/Source/Atom_RHI_Null_precompiled.h
# Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Android/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Linux/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Mac/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Include/Platform/Windows/Atom_RHI_Vulkan_precompiled_Platform.h
# Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h
# Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp
# Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake
# Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h
# Gems/Blast/Code/Source/StdAfx.cpp
# Gems/Camera/Code/Source/Camera_precompiled.h
# Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h
# Gems/FastNoise/Code/Source/FastNoise_precompiled.h
# Gems/Gestures/Code/Source/Gestures_precompiled.h
# Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h
# Gems/GraphCanvas/Code/precompiled.h
# Gems/ImGui/Code/Source/ImGui_precompiled.h
# Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h
# Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h
# Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp
# Gems/LyShine/Code/Editor/UiCanvasEditor_precompiled.h
# Gems/LyShine/Code/Source/Animation/LyShine_precompiled.h
# Gems/LyShine/Code/Source/LyShine_precompiled.h
# Gems/LyShineExamples/Code/Source/LyShineExamples_precompiled.h
# Gems/Maestro/Code/Source/Cinematics/Maestro_precompiled.h
# Gems/Maestro/Code/Source/Maestro_precompiled.h
# Gems/MessagePopup/Code/Source/MessagePopup_precompiled.h
# Gems/Metastream/Code/Source/Metastream_precompiled.h
# Gems/Microphone/Code/Source/Microphone_precompiled.h
# Gems/Multiplayer/Code/Source/Multiplayer_precompiled.h
# Gems/PhysX/Code/NumericalMethods/Source/NumericalMethods_precompiled.h
# Gems/PhysX/Code/Source/PhysXUnsupported_precompiled.h
# Gems/PhysX/Code/Source/PhysX_precompiled.h
# Gems/PhysX/Code/physx_unsupported_files.cmake
# Gems/PhysXDebug/Code/Source/PhysXDebugUnsupported_precompiled.h
# Gems/PhysXDebug/Code/Source/PhysXDebug_precompiled.h
# Gems/ScriptCanvas/Code/Editor/precompiled.h
# Gems/ScriptCanvas/Code/Source/precompiled.h
# Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h
# Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h
# Gems/ScriptEvents/Code/Source/precompiled.h
# Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp
# Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h
# Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h
# Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h
# Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h
# Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h
# Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h
# Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h
# Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h
# Gems/Twitch/Code/Source/Twitch_precompiled.h
# Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h
# Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h
2021-07-16 15:42:37 -07:00
38261d0800
Shorten copyright headers by splitting into 2 lines ( #2213 )
...
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines
Signed-off-by: Steve Pham <spham@amazon.com >
2021-07-16 15:25:48 -07:00
8dada07959
Gems/ImGui
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-07-13 15:24:52 -07:00
1b530195fc
Clarify ImGui activation in Editor viewport ( #1765 )
...
* Clarify ImGui activation in Editor viewport
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* All working following changes from comments in PR
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* One more change
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* fixes from comments in PR.
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Fixed git merge error
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Added header to ImGuiBus.h
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Fix for Jenkins error
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
* Minor typo fix
Signed-off-by: John Jones-Steele <jjjoness@amazon.com >
2021-07-09 12:03:20 -05:00
dd20a598b2
Add DPI scaling to IMGUI
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:15 -07:00
da529edfb5
Fix ImGui not rendering correctly at resolutions greater than 1080p
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:06 -07:00
b4a2edec6a
Final update copyright headers to reference license files at the repo root ( #1693 )
...
* Final update copyright headers to reference license files at the repo root
Signed-off-by: spham <spham@amazon.com >
* Fix copyright validator unit tests to support the stale O3DE header scenario
Signed-off-by: spham <spham@amazon.com >
2021-06-30 19:51:55 -07:00
7a2a2dc0d7
Updated branding for application names ( #1617 )
2021-06-28 11:35:13 -05:00
70042fcdcd
O3DE Copyright Updates for Linux Foundation ( #1504 )
2021-06-23 10:55:22 -07:00
5f82e5a111
Fix typo. ( #1192 )
2021-06-08 15:15:20 -06:00
36cb0f6d40
SPEC-7178 Removal of precompiled cpp files ( #1171 )
...
* SPEC-7178 Removal of precompiled cpp files
* Missing files...
2021-06-07 15:59:58 -07:00
0dd8fce2b0
Pass on fixing LmbrCentral.Static dependencies
2021-05-27 10:30:11 -07:00
4652d47fb3
Merge remote-tracking branch 'origin/lawsonamzn_prototype_gem_naming_conventions' into ly-as-sdk/LYN-2948-phistere
2021-05-26 00:38:51 -05:00
76fe7f3666
Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere
2021-05-25 23:48:55 -05:00
19adbf2f41
Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES
2021-05-25 15:12:17 -07:00
db0db5c1c0
Proper dependencies to LmbrCentral/LmbrCentral.Editor, mixing those two can cause Editor modules to load non-Editor modules
2021-05-24 18:57:48 -07:00
6fa78218d2
[LYN-3548] Change IMGUI to use list of levels with prefab LoadLevel instead of text box
...
There was an intermittent crash related to garbage in the level name box with prefabs, possibly due to levelName being uninitialized. This change improves the UX by listing out all the possible choices, instead of making people type it in.
2021-05-21 17:32:55 -05:00
c9d5d7fb77
The new gem registration and usage system
...
Merge from mainline (Rebase)
2021-05-20 10:47:03 -07:00
7109cbbc98
Removed non-inclusive terms from comments ( #803 )
2021-05-18 11:43:55 -05:00
440c40e490
Remove (almost) all references to pRenderer ( #651 )
...
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
d7b796fd73
Remove I3DEngine CryCommon Interface ( #567 )
...
Delete:
- I3DEngine
- Missions
- Time of day
- GameEffectsSystem Gem
- ImageProcessing Gem
- SVOGI Gem
- Various other things that don't do anything now that the legacy renderer has been removed.
2021-05-05 09:07:28 -06:00
4c47d7b587
Merged main in
2021-05-04 10:13:50 -05:00
55f2b24302
Legacy Mesh component removal
...
* Removed legacy components
* More legacy render component removal
* Starting removal of legacy mesh component dependencies
* Removed old light components that were allowing Atom test to succeed
* Testing increasing the timeout to see if it lets it pass in Jenkins
* put original timeout back
* reordered components to test if it is component specific or not
* Testing disabiling the test to see if we get a green
* Fixed the removal of the test to sandbox
* Removed Legacy Mesh Component and associated tendrils
* Removed some missed references
* Fixed some issues with unity builds and ambiguous naming
* Addressed review feedback
2021-05-03 17:17:18 -05:00
64d980bc03
Deleted AzFramework::AtomActiveInterface
2021-05-03 15:40:32 -05:00
901428668c
Merging latest origin
2021-04-27 13:03:31 -07:00
8cb1edb7d7
Updates ImGui to release version 1.82, builds out some better initial multiplayer metrics
2021-04-27 11:37:56 -07:00
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
e1ae61ca06
Fix ImGui sometimes not respecting the viewport resolution in-Editor
...
ImguiAtomSystemComponent isn't guaranteed to initialize before ImGuiManager, which caused some issues.
Additionally, because we allow the user to configure ImGui's render resolution, I've refactored the window size override into a new OverrideRenderWindowSize API in ImGuiManager to decouple it from the target render resolution.
2021-04-23 00:26:13 -07:00
dbcb2f9916
Added sys_assert level 3 which will make asserts to crash the application( #208 )
...
Co-authored-by: aljanru <aljanru@amazon.com >
2021-04-22 17:46:37 +01:00
fa7f61cf0d
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
...
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
c2cbd430fe
Integrating up through commit 90f050496
2021-04-07 14:03:29 -07:00
Esteban Papp
Artur K
Steve Pham
michabr
pappeste
Nicholas Van Sickle
jjjoness
Terry Michaels
bosnichd
lumberyard-employee-dm
mbalfour
Nicholas Lawson
Terry Michaels
Aristo7
karlberg
Chris Burel
AMZN-AlexOteiza
qingtao
alexpete