carlitosan
|
52460189aa
|
Merge pull request #3964 from aws-lumberyard-dev/carlitosan/development
Upgrades and stability fixes for version explorer
|
4 years ago |
Esteban Papp
|
f414cd3966
|
More fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
2a810c4845
|
fix backup file action in version explorer
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
5c0bbe7ac1
|
add SC cvar settings cache
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
4ed7feae5d
|
Keep editor alive when not in focus
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
c8ed6d287c
|
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
|
4 years ago |
|
chcurran
|
f4dbeb6538
|
Fix list of manual inspection graphs
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
e69a5bc092
|
fix progress bar for upgrades
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
3822f92882
|
fix manual inpsection window
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
b5a32e1c4c
|
remove temporay files in all cases
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
f277cf59dc
|
multi threaded fix for upgrader
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
205c09e200
|
Better upgrade tool messaging and continuity on failure; fix for serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
3b119b6f32
|
hot fix for json event input serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
16ed1e1882
|
More status reporting, fixed widget row index tracking for upgrader tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
f5485fa675
|
merge lastest; add extra data to scan result
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
782c6748ae
|
Merge branch 'development' of https://github.com/o3de/o3de into carlitosan/development
|
4 years ago |
|
chcurran
|
862df096db
|
Add file information to Version; improve Method deserialization warnings; add SC unit test content to builders
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
9688832adc
|
Initial fixes for graph update tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
Chris Galvan
|
d590a91fe7
|
Implemented helper method of QFileDialog::getSaveFileName to prevent user from saving files with invalid names.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
|
4 years ago |
|
Esteban Papp
|
ae4cfc3bd3
|
Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Code/Framework/AzCore/AzCore/Math/Guid.h
# cmake/Platform/Common/MSVC/Configurations_msvc.cmake
|
4 years ago |
|
Esteban Papp
|
b9daf7f7c3
|
Enabling several warnings on MSVC that are not enabled by default and are good to have
|
4 years ago |
|
Esteban Papp
|
058f6e0f22
|
PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
b8aab28759
|
Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
# Conflicts:
# Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp
|
4 years ago |
|
Esteban Papp
|
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
|
4 years ago |
|
carlitosan
|
803bff70e4
|
Merge pull request #3438 from aws-lumberyard-dev/carlitosan/development
Bug fixes for SC editor asset scan in version explorer widget
|
4 years ago |
Luis Sempé
|
63cad40db2
|
Merge pull request #3435 from aws-lumberyard-dev/scripting/slottypeselectorwidget
Improved layout and behavior of the SlotTypeSelector widget
|
4 years ago |
|
chcurran
|
be9ad98b24
|
remove commented out debugging artifacts
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
214700a73e
|
Finish repair for scanning for upgrade tool
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
lsemp3d
|
4545e2fb33
|
Improved layout and behavior of the SlotTypeSelector widget
Signed-off-by: lsemp3d <58790905+lsemp3d@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
26f6a714c8
|
initial fix for version scan
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
d91dbe3d92
|
Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
5361cf3b26
|
Merge branch 'development' into cmake/win_fix_wnew
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
794c22c02e
|
merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
2e228d94f0
|
push/pop mismatch
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
323d642e65
|
Gems/ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
1ad182105b
|
fix memory leak and possible nullptr read
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
3522f622f3
|
more castings
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
chcurran
|
aaa847a569
|
Remove empty User Functions and Script Event sections
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
b33a4db332
|
Merge branch 'development' into cmake/SPEC-2513_w4267
|
4 years ago |
|
chcurran
|
893a80a54e
|
Fix variables names in the property window
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
4 years ago |
pappeste
|
e3344bdf8d
|
ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
4 years ago |
|
Esteban Papp
|
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
|
5 years ago |
Steve Pham
|
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>
|
5 years ago |
|
Esteban Papp
|
ffb235e458
|
ScriptCanvas
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
|
5 years ago |
|
chcurran
|
0a910a31aa
|
The Great ScriptCanvas Purge, Part V
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
5 years ago |
|
chcurran
|
360236b89e
|
The Great ScriptCanvas Purge, Part IV
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
5 years ago |
|
chcurran
|
fa7accf2dc
|
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
|
5 years ago |
|
chcurran
|
fea83b0b51
|
The Great ScriptCanvas Purge, Part II
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
5 years ago |
|
chcurran
|
59ff74f559
|
The Great ScriptCanvas Purge. Part I.
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
5 years ago |
|
chcurran
|
2281330a7c
|
merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
|
5 years ago |