Commit Graph

6567 Commits (4e699138b8033b63843d6814d819786c2fd05e86)
 

Author SHA1 Message Date
Chris Galvan bec568c8bd Added context menu on game folder status bar item to open project path in file explorer.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
puvvadar aab06f687f Change PacketDispatchResult Pending to Skipped
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Esteban Papp 0750dd59ca
Linux/Clang fix warn-unused and related
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
SergeyAMZN ebe35eeed6
Merge pull request #3587 from aws-lumberyard-dev/MPWeaponSQ2
LYN-5558 Fixed Blast assets loading in the Launcher
4 years ago
santorac ccd648c600 Removed unnecessary print statements
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 822a8f31f1 Merge remote-tracking branch 'upstream/development' into Atom/santorac/MoreShaderHotReloadFixes 4 years ago
Esteban Papp 906ace3d03 Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
bosnichd 040b75c02c
Fix PAL.cmake logic, thanks to lumberyard-employee-dm! (#3516)
* Fix PAL.cmake logic, thanks to lumberyard-employee-dm!

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

* Lowercase the platform name to address review feedback.

Signed-off-by: bosnichd <bosnichd@amazon.com>
4 years ago
pereslav 865d877d8e LYN-5558 Fixed Blast assets loading in the Launcher
Signed-off-by: pereslav <pereslav@amazon.com>
4 years ago
hultonha d5ee6fb36f
Expose camera settings to the Editor UI (#3442)
* expose camera settings to the ui

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

* improve naming of visibility functions, remove duplication

Signed-off-by: hultonha <hultonha@amazon.co.uk>
4 years ago
santorac 7aa24fd58f Fixed shader variant hot reload which was failing due to mismatched timestamps. The ShaderAsset was using microseconds and the ShaderVariantAsset was using system ticks. Since ticks will always be higher than microseconds, stale variants were not prevented from being used.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Jeremy Ong 8485f20bf2
Merge pull request #3566 from aws-lumberyard-dev/FixWhiteBoxCompileError
Add missing AzToolsFramework budget declaration
4 years ago
Jeremy Ong b49b5a7c54 Add missing AzToolsFramework budget declaration
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Chris Galvan 486157f89b
Merge pull request #3428 from aws-lumberyard-dev/cgalvan/FixedTrackViewNodeCrash
Fixed memory stomping leading to Track View nodes with invalid labels and crash.
4 years ago
puvvadar ae9dd275b4 Correct default value issue with PacketDispatchResult
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Esteban Papp e5e271f45a One more fix
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong 8d2383e408
Merge pull request #3493 from aws-lumberyard-dev/windowsdecls
Move undefs of problematic Windows defines to PlatformIncl_Windows.h
4 years ago
amzn-phist db1a89a492
Fix level creation on Linux (#3488)
* Fix level creation on Linux

Creating a new level on linux would fail due to backslashes being used in mkdir.
Fixed the slashes to use the AZ_CORRECT_FILESYSTEM_SEPARATOR.

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

* Removed extra line that wasn't needed

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.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 fded2bafad More PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Jeremy Ong 032366f9c9 Move undefs of problematic Windows defines to PlatformIncl_Windows.h
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
Jeremy Ong d53026f186
Merge pull request #3490 from aws-lumberyard-dev/gitignorechange
Add CMakeUserPresets.json file to gitignore
4 years ago
Esteban Papp f20d17398c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/Objects/TrackGizmo.cpp
4 years ago
Chris Galvan 4b672a0a32 Fixed merge conflict.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
jckand-amzn c30642d855 Renaming test files for standardization and setting optimized tests to run alongside existing
Signed-off-by: jckand-amzn <jckand@amazon.com>
4 years ago
Esteban Papp 058f6e0f22 PR comments/fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Artur K 45b2336dce
Legacy cleanup (#3383)
* WIP - small legacy cleanup

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* More cleanups + build fixes

Use AZstd instead of std types in a few places.
Remove m_nameTable.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Legacy code cleanups

Remove unused methods using legacy functionality

* EditorViewportWidget::AdjustObjectPosition
* DisplayContext - remove `renderer` pointer
* DisplayContext - log errors when functions using `renderer` are called
* CTrackGizmo::DrawAxis - log errors when function uses `renderer`.
* Legacy CCamera - remove Project, Unproject and CalcScreenBounds
* Remove all unused methods from Cry_GeoDistance.h/Cry_GeoIntersect.h
* Remove Lineseg_Triangle from Cry_GeoOverlap.h
* IEntityRenderState.h - remove unused types
* SMeshColor remove Lerp method and associated constructor.
* IMaterial.h - remove unused types and a few methods
* IRenderMesh.h - remove a few unused methods and use int8 instead of
byte
* IRender.h - remove almost all of the contents
* IShader.h - remove unused types and a few methods
* IStatObj.h - remove unused types and a few methods
* SSystemGlobalEnvironment - remove `renderer` pointer
* IRenderGraph - remove 2 unused methods
* physinterface.h - remove almost all of the contents
* CXmlUtils no longer inherits ISystemEventListener
* CXmlNode no longer has custom new/delete
* Remove IRenderer from some test mocks.

Removed files:
* CryName.h
* Cry_MatrixDiag.h
* Cry_XOptimise.h
* HeapAllocator.h
* IRendererMock.h
* PoolAllocator.h

Things to consider:
* Remove GetMemoryUsage & friends.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Apply review suggestions

IMovieSystem.h - remove unused includes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Move unreachable code to `#if 0` block

This is hopefully temporary measure until the original functionality is
re-implemented

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix bad merge I messed up.

Fix bad merge I messed up, by re-removing FrameProfiler.h from crycommon_files.cmake (this was removed in an earlier commit this morning: https://github.com/o3de/o3de/pull/3394).

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

* Update Code/Framework/AzCore/AzCore/std/string/string_view.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* implement review suggestion

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* following review, using LYSHINE_ATOM_TODO to guard

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Remove commented out include

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* EditorViewportWidget.cpp: Convert commented out code to  guarded one

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: bosnichd <bosnichd@amazon.com>
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Chris Galvan d211771253 Updating PR to change lower API to return AZStd::string instead of const char* for safety.
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
4 years ago
Chris Galvan c3b6725118
Merge pull request #3461 from aws-lumberyard-dev/daimini/ui-editor-fix
Fix UI Editor crashing on initialization when restoring from layout.
4 years ago
Jeremy Ong 4a05d6f7ec Add CMakeUserPresets.json file to gitignore
Signed-off-by: Jeremy Ong <jcong@amazon.com>
4 years ago
amzn-phist 9f6434fc68
Fix an issue with project-centric ninja builds [Linux] (#3429)
* Fix an issue with project-centric ninja builds

Normalizes relative paths when adding engine.json as a cmake configure dependency.
It should match the dependency added later which uses absolute path.

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

* Fix typo

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
4 years ago
Esteban Papp b1246dcc08
CMakeLists.txt frrom templates are not being installed (#3456)
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
Chris Galvan b4687fa72f
Merge pull request #3418 from aws-lumberyard-dev/jckand/EditorAutomationOptimization
Editor automation optimizations with TestAutomationBase/parallelization
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
Esteban Papp e2acd66c46 Fixes Guid formatting
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm b53182fdb6
Fixed invalid variable access in register.py (#3433)
* Fixed invalid variable access in register.py

The register_restricted_path and register_template_path methods did not specify the parameter for project path

Updated register_o3de_object_path function to pass in absolute paths to the engine or project in order to make relative paths to the registered o3de object to it.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Fixed register_*_path resolve calls in register.py

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
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 6bd5cd7bde Fix release build warning error
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
4 years ago
Danilo Aimini d270031e59 Set allocator to the UI Editor HierarchyWidget to prevent initialization error when restoring layout
Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
4 years ago
puvvadar ebbe4b99a4 Add const to some funcs and fix a comment
Signed-off-by: puvvadar <puvvadar@amazon.com>
4 years ago
Chris Galvan d64c034fee Merge branch 'development' of https://github.com/o3de/o3de into cgalvan/FixedTrackViewNodeCrash 4 years ago
jckand-amzn a3868068d5 Merge branch 'development' of https://github.com/o3de/o3de into jckand/EditorAutomationOptimization 4 years ago
Jeremy Ong e091450e80
Merge pull request #3394 from aws-lumberyard-dev/Budgets
Add budget registration/tracking system and prepare driller redcode
4 years ago
hultonha 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
Jeremy Ong c3e83387db Address additional PR feedback
Signed-off-by: Jeremy Ong <jcong@amazon.com>
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