birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,627 Commits 3 Branches 3 Tags
9a0ea2c4c5cdec19bedec4e527275c7196ea5d94
Commit Graph

727 Commits

Author SHA1 Message Date
moraaar 9a0ea2c4c5 Fixed NvCloth assets, NvCloth automated test scripts, ModelAsset cloning and UI reverse overrides menu crash (#3851) 
- Fixed cloth asset, which stopped working due to Updated skeleton logic: #2957 which changes how fbx graph nodes are collected (affecting its names, which is used by cloth modifier).
- Fixed cloth test suite active call to base's run_test function. It stopped working when its signature was changed here: 182d410#diff-3f5d93b0a76c838893693f19f2eacfe3e67040d445d6463c5c425ef5075cb409
- Renamed nvcloth TestSuite_Active.py to TestSuite_Main.py to be consistent with the other test folders.
- Fixed ModelAsset creator clone function. It was missing to copy the material slots, ultimately causing Material Component to show 0 material slots.
- Fixed crash where the revert overrides menu was not created when checking changes for selected component and selected entities.

Signed-off-by: moraaar moraaar@amazon.com
 2021-09-02 09:35:12 +01:00
AMZN-Igarri 2d45a6b4cb [Experimental] Asset Picker Flatten View (#3589) 
* Adding Asset Browser Table View to AssetPicker

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

* Adding connections

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

* Adding CVar to hide/show path column

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

* Added Feedback from codereview

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

* Changed m_showColumn name to m_ShownColumns

Signed-off-by: igarri <igarri@amazon.com>
 2021-09-01 09:39:44 +01:00
Nicholas Van Sickle dd3bdcd3f4 Fix some Qt warnings (#3731) 
-Fix a missing QPainter::restore call
-Remove 0px font sizes from our qss, which was just getting ignored by Qt and triggering a warning

Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-08-31 11:08:11 -07:00
sharmajs-amzn 0d728a7677 Added new index on SourceDependency Table (#3648) 
Signed-off-by: sharmajs-amzn <82233357+sharmajs-amzn@users.noreply.github.com>
 2021-08-31 09:22:09 -05:00
AMZN-Igarri 79c98fe6a3 [Fix] Editor Crash in Debug Mode (#3647) 
* Fixed Crash AssetBrowserTableView

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

* Fixed comments

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

* fixed lamda capture

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

* Capturing object in lambda

Signed-off-by: igarri <igarri@amazon.com>
 2021-08-31 13:29:17 +01:00
Chris Galvan 3a9268c955 Merge pull request #3685 from aws-lumberyard-dev/cgalvan/UpdateProjectConfiguratorReferences 
Updated remaining Project Configurator references to Project Manager and consolidated JsonUtils API usage.
 2021-08-30 15:59:25 -05:00
Steve Pham 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
Chris Galvan 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>
 2021-08-30 14:10:30 -05:00
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>
 2021-08-27 11:24:05 -05:00
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
 2021-08-25 15:40:41 -07:00
Esteban Papp b9daf7f7c3 Enabling several warnings on MSVC that are not enabled by default and are good to have 2021-08-25 15:38:09 -07:00
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
 2021-08-25 11:47:19 -07:00
Jeremy Ong e091450e80 Merge pull request #3394 from aws-lumberyard-dev/Budgets 
Add budget registration/tracking system and prepare driller redcode
 2021-08-25 09:03:25 -06:00
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>
 2021-08-25 09:28:41 +01:00
Chris Burel 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>
 2021-08-24 14:10:59 -07:00
Jeremy Ong 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
Jeremy Ong 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
Jeremy Ong 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
Esteban Papp d91dbe3d92 Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 11:49:35 -07:00
Esteban Papp 5361cf3b26 Merge branch 'development' into cmake/win_fix_wnew 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-24 11:49:07 -07:00
Esteban Papp 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
Esteban Papp 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
Mikhail Naumov 6c1ae1e618 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-24 09:45:01 -07:00
hultonha 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>
 2021-08-24 16:25:08 +01:00
Mikhail Naumov 90912759f7 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-4539 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-23 17:08:00 -07:00
Esteban Papp 31addc43dc Windows and Linux compiling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 14:02:45 -07:00
Mike Balfour 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>
 2021-08-23 15:41:57 -05:00
Esteban Papp 6bdef50444 Code/Framework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-23 13:00:45 -07:00
Mikhail Naumov 875918deda Allowing prebas with missing components to load, and clarifying error message 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-23 12:59:13 -07:00
Esteban Papp 2e228d94f0 push/pop mismatch 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 18:39:40 -07:00
Esteban Papp 257557c692 Code/Framework/AzToolsFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:56:42 -07:00
Esteban Papp 588d702e43 Code/Framework/AzToolsFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 17:53:31 -07:00
Esteban Papp 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
Esteban Papp 9245a31196 more fixes for Code 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 14:48:42 -07:00
Chris Galvan c1f236a70b Merge pull request #3337 from aws-lumberyard-dev/cgalvan/ComponentSearchIncludeCategory 
Include the category name when performing search in the component palette.
 2021-08-19 16:34:43 -05:00
Chris Galvan 24a8308711 Include the category name when performing search in the component palette. 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-08-19 13:44:12 -05:00
Esteban Papp d0238a5977 More fixes after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-19 09:37:45 -07:00
Esteban Papp 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
Jeremy Ong fdc464c6fd Merge pull request #3272 from aws-lumberyard-dev/PIX 
Profiler spring cleaning
 2021-08-19 08:48:23 -06:00
hultonha 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>
 2021-08-19 09:06:24 +01:00
Jeremy Ong 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
Esteban Papp 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
Mikhail Naumov 2c4e5c5630 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/LYN-3904 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-18 12:11:54 -07:00
Mikhail Naumov 8589bb99de cleaned up comments 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-18 12:01:07 -07:00
chiyenteng 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>
 2021-08-18 10:55:45 -07:00
Mikhail Naumov db91bdbf51 Improvements to Entity Outliner context menu 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-17 18:30:46 -07:00
Mikhail Naumov fca71f9455 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-17 14:14:56 -07:00
Esteban Papp 0c6a838c6f fix warnigns after merge 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-17 13:22:52 -07:00
Esteban Papp 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
Mikhail Naumov 0d0a09b252 Merge branch 'development' of https://github.com/aws-lumberyard-dev/o3de into mnaumov/2372_signOffFix 
Signed-off-by: Mikhail Naumov <mnaumov@amazon.com>
 2021-08-17 11:11:27 -07:00