3a9268c955
Merge pull request #3685 from aws-lumberyard-dev/cgalvan/UpdateProjectConfiguratorReferences
...
Updated remaining Project Configurator references to Project Manager and consolidated JsonUtils API usage.
4 years ago
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>
4 years ago
194205c453
Replaced AzFramework::FileFunc JSON utils API calls with AzCore::JsonUtils APIs that appear to have been duplicated. Also fixed up improper Project Configurator -> Project Manager comment replacements.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
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
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
b9daf7f7c3
Enabling several warnings on MSVC that are not enabled by default and are good to have
4 years ago
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
e091450e80
Merge pull request #3394 from aws-lumberyard-dev/Budgets
...
Add budget registration/tracking system and prepare driller redcode
4 years ago
7fbfda0371
Fix mouse capture behavior for Editor Viewport ( #3417 )
...
* first pass of fixes for cursor capture and context menu
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* restore previous behavior of HandleMouseMoveEvent
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* tidy-up from previous cursor/input changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add missing casts
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small updates to support tests
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* additional tests and some tidy-up
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* small updates before publishing PR (comment/naming updates)
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* add missing parameter to MouseInteractionEvent constructor
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
86770deefa
Add linux equivalents for all the places that enumerate platforms ( #3325 )
...
* Add linux equivalents for all the places that enumerate platforms
Signed-off-by: Chris Burel <burelc@amazon.com>
* Fix the AssetFileInfoListComparisonTest fixture to not hardcode the PC platform
Signed-off-by: Chris Burel <burelc@amazon.com>
4 years ago
c37c0cab08
Refactor budget definitions as named functions instead of template specializations
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
5e04c3737f
Add preliminary budget tracking system and remove driller integration
...
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
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>
4 years ago
d91dbe3d92
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
5361cf3b26
Merge branch 'development' into cmake/win_fix_wnew
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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
4 years ago
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
4 years ago
6c1ae1e618
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
8c573979a9
Updates to camera tests to support different delta times and some further tidy-up ( #3324 )
...
* updates to camera tests to support different delta times and some further tidy-up
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* support variable delta time in mouse move test
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
90912759f7
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
31addc43dc
Windows and Linux compiling
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
97a053a540
Initial stub terrain gem ( #3368 )
...
This is the initial Terrain Gem. In this PR, it doesn't do anything, but it contains all of the initial code, icons, and build scripts for the gem to compile and build successfully. The follow-up PR will contain the first round of functioning code.
Also, with the creation of the gem, the TerrainSurfaceDataSystemComponent is getting relocated from the SurfaceData Gem to the Terrain Gem. This should have no impact, as that component has provided no active functionality in o3de. (It will start working again with the initial terrain system code in the next PR)
This also adds a couple of null guards to prefab code to prevent AP crashes, and fixed an incorrect service dependency in the VegetationSystemComponent that was exposed by moving the TerrainSurfaceDataSystemComponent.
Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
4 years ago
6bdef50444
Code/Framework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
875918deda
Allowing prebas with missing components to load, and clarifying error message
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
2e228d94f0
push/pop mismatch
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
257557c692
Code/Framework/AzToolsFramework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
588d702e43
Code/Framework/AzToolsFramework
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
b96b99363c
Merge branch 'development' into cmake/linux_fix_warn_unused
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
9245a31196
more fixes for Code
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
c1f236a70b
Merge pull request #3337 from aws-lumberyard-dev/cgalvan/ComponentSearchIncludeCategory
...
Include the category name when performing search in the component palette.
4 years ago
24a8308711
Include the category name when performing search in the component palette.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
d0238a5977
More fixes after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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
4 years ago
fdc464c6fd
Merge pull request #3272 from aws-lumberyard-dev/PIX
...
Profiler spring cleaning
4 years ago
80e08dd947
Fix issue with mouse input for viewport camera ( #3210 )
...
* fix for drift accumulating in the viewport camera
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* fix typo and update how events are stored
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* respond to PR feedback and fix linux and windows build issues
Signed-off-by: hultonha <hultonha@amazon.co.uk>
* fix failing unit tests in camera input
Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
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>
4 years ago
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
4 years ago
2c4e5c5630
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-3904
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
8589bb99de
cleaned up comments
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
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>
4 years ago
db91bdbf51
Improvements to Entity Outliner context menu
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
fca71f9455
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
0c6a838c6f
fix warnigns after merge
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
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
4 years ago
0d0a09b252
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
a20428d393
Fixing non unity build
...
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
4 years ago
6303b82976
Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2679
4 years ago
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>
4 years ago
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
4 years ago
b8787739e1
more fixes after rebase
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Chris Galvan
Steve Pham
Esteban Papp
Jeremy Ong
hultonha
Chris Burel
Jeremy Ong
Mikhail Naumov
Mike Balfour
chiyenteng
Guthrie Adams