birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,885 Commits 3 Branches 3 Tags
55bca4658fd7b5fed59e889aa260f22471d4f708
Commit Graph

905 Commits

Author SHA1 Message Date
Steve Pham e6573766c2 Fixes for release builds for unused variable warnings (#4000) 
Signed-off-by: Steve Pham <spham@amazon.com>
 2021-09-08 21:13:36 -07:00
srikappa-amzn b87b807de9 Fixed an unused variable error in linux build 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-08 16:07:22 -07:00
srikappa-amzn 92986c7012 Merge branch 'development' into Prefab/SaveAllPrefabs 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-08 14:11:50 -07:00
Esteban Papp d58bda5bbf WIP 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-08 13:43:30 -07:00
srikappa-amzn c7fbdb0ace Make level name appear in bold and update save all prefabs settings registry key 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-08 11:49:33 -07:00
Esteban Papp 860b28c10b more fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-08 08:48:32 -07:00
hultonha 052ff90c9d Preparatory work to allow for more viewport integration tests (#3961) 
* preparatory work to allow for more viewport integration tests

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

* minor grammatical fix

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

* fix for missed bus call update

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-08 09:36:04 +01:00
srikappa-amzn 0f1e117904 Reverted a small local change that got pushed by mistake 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-07 14:32:13 -07:00
srikappa-amzn d0b7ffab67 Changed parameter names to reflect the recursive nature of functions and some more changes 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-07 14:27:00 -07:00
Esteban Papp aad2c214a4 Merge branch 'development' into cmake/warn_virtual 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-07 08:26:37 -07:00
moraaar f551e69b2b PythonProxyNotificationHandler::OnEventGenericHook acquires the Python GIL before executing (#3904) 
- Protected python execution of OnEventGenericHook by trying to lock the GIL and show a descriptive error when it was not possible to lock.
- Improved mechanism to lock python mutex and GIL in PhytonSystemComponent. Acquiring/releasing GIL once per thread.
- Added unit test to verify errors are fired when trying to execute OnEventGenericHook from another thread (as it should not able to acquire the GIL).
- Improved python threading tests to actually using python buses.

Signed-off-by: moraaar moraaar@amazon.com
 2021-09-07 15:35:04 +01:00
hultonha a374ea29f2 Expose setting to adjust angular manipulator circle bound (#3932) 
* add debug drawing for angular manipulator bounds

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

* remove editor viewport settings from RenderViewport

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

* add setting for angular manipulator circle bound

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

* update minimum value allowed for some camera settings

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

* updates following review feedback, some small tidy-up

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

* update comment

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 14:22:57 +01:00
hultonha 6cc9a33845 Add a new implementation for cone/ray intersect to simplify code and fix issue with current implementation (#3902) 
* add a new implementation for cone/ray intersect to simplify and fix existing issue

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

* move new ray/cone intersection function to AzToolsFramework - repond to PR comments

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

* updates following PR feedback

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

* add additional comment to give more context to the intersection function

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

* update google test expect usage

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-06 11:36:17 +01:00
Esteban Papp 2f71b28b97 Fixes AzToolsFramework 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-09-03 15:08:43 -07:00
srikappa-amzn f6ce3678fa Used actual types instead of auto and some more minor changes 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-03 12:34:32 -07:00
chiyenteng f7d4d80e5b Add prefab reparenting python auto tests (#3653) 
* Add prefab reparenting python auto tests

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

* modify prefab python auto test framework

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

* remove extra spaces

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

* delete unused files

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

* delete unused files

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

* fix nits

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

* Refactor prefab python tests

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

* Fix nits

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

* Modify comments

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

* Fix nits and add comments for Prefab.py

Signed-off-by: chiyteng <chiyteng@amazon.com>
 2021-09-03 14:06:22 -05:00
hultonha 5851031d2e Expose the ability to control manipulator line bounds (#3890) 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-09-03 10:14:03 +01:00
srikappa-amzn 8331b8dd8a Fix a compile error by changing to const instead of constexpr 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-03 01:34:32 -07:00
srikappa-amzn fbf92e9775 Merge branch 'development' into Prefab/SaveAllPrefabs 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 23:40:54 -07:00
srikappa-amzn 5a8998add1 Added function comments and nullptr checks 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 23:35:28 -07:00
srikappa-amzn 7e75559200 Removed unused Qt classes and do some more code clean up 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 17:26:32 -07:00
srikappa-amzn f6acf4321d Did a major refactor of ui to be less dependent on levels 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-09-02 15:37:29 -07:00
Artur K 567c0ae24d Modernization + AZStd::function compare fix. (#3680) 
* Modernization + small fix.

Modernize ( `bool`/`override`/other) code in AzCore, AzFramework, AzQtComponents, AzToolsFramework, etc.
Replaced a `bind` or two, use `using` in a few places as well.

Fix nullptr comparison of AZStd::function.

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

* Apply review-based changes

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>
 2021-09-02 14:55:09 -05:00
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
srikappa-amzn 89a415d50c Removed az::u8 from Prefab save preference Enum 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-08-24 19:56:29 -07:00
srikappa-amzn a13fb3c13a Added some comments and some minor fixes 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-08-24 19:21:06 -07:00
srikappa-amzn 1ca67cad80 Moved PrefabSavePreference settings registry code from PrefabEditorEntityOwnershipInterface to PrefabLoaderInterface 
Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-08-24 18:34:51 -07:00
srikappa-amzn 79dd041d02 Add helper methods to create and execute save level dialogs 
Changes in this commit :
- Added AreDirtyTemplatesPresent() method to PrefabSystemComponentInterface
- Added ConstructSaveLevelDialog() helper method to create the save level dialog
- Added ExecuteSavePrefabsDialog() helper method to create and execute the save prefabs dialog

Signed-off-by: srikappa-amzn <srikappa@amazon.com>
 2021-08-24 17:23:06 -07: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