Commit Graph

4529 Commits

Author SHA1 Message Date
jackalbe fe88ae12b0 {LYN-3365} GraphObjectProxy is now hidden from Script Canvas (#478)
* GraphObjectProxy is now hidden from Script Canvas
* the IGraphObject has been added to the BC

Jira: https://jira.agscollab.com/browse/LYN-3365
Tests: manual testing the node type is not in the SC editor
2021-05-03 10:02:04 -05:00
AMZN-koppersr 5eeeaf4346 Fixed several release build compile errors. 2021-05-01 13:26:54 -07:00
AMZN-nggieber 7a2f698bbc Create the Project Manager project (#320)
* Created the Project Manager project with a barebone styled window and rough sketch of first screen

* Renamed to Project Manager, ect.

* Corrected string name for projectmanager and added comments on getting engine path

* Changed output name for Project Manager to lowercase o3de

* Added header guards
2021-04-30 17:11:40 -07:00
SJ bb6f5239f3 Fix monolithic builds
Merge pull request #494 from aws-lumberyard-dev/monolithic_build_fix
2021-04-30 16:24:58 -07:00
AMZN-mnaumov bdd276d209 Merge pull request #467 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15426
[ATOM-15426] Fixing missing asset crashing Editor
2021-04-30 16:03:33 -07:00
Zaladane a5d4eb5d44 Asset Bundler GUI (#427)
The AssetBundler is a new ToolsApplication that allows users to work through the entire Asset Bundling process without ever touching a command line.

* Integrating github/AssetBundler through commit 1d65018

* Asset Bundler bug fixes: platform initialization and GUI styling (#5)

* fixed enabled platform initialization

* fixed the cached engine root. This fixed some of my Seeds tab data issues. The default Engine Seed List appeared, and was able to display the contents on screen.

* updated my notes of active bugs

* changed some casing in various include lines to hopefully fix my linux build

* another include fix for linux

* AssetBundler GUI is now compiling on Mac

* removed some things off of my todo list because the mac build fix actually fixed the visuals! everything's the right color again

* removed the word Lumberyard from the bundler

* Asset bundler bug fixes - Bundles, Gems, and Tests (#9)

* Fixed the Bundle loading and generation problem. Turned out to be a FileWatcher issue.

* turns out gem loading wasn't broken, there were just no existing SeedListFiles for any of the gems loaded by the AutomatedTesting project. I added a default SeedListFile for the PrimitiveAssets Gem.

* fixed some failing AssetBundler Gem tests

* Misunderstood the need to have default seed lists for asset-only gems. removing the previously created seed list file

* Asset bundler bug fixes: Seeds Tab display issues and _dependencies.xml loading (#10)

* Fixed the Project Source column in the Seeds tab

* The AssetBundler will no longer attempt to copy a template version of the ProjectName_dependencies.xml file into your active project. However, it will throw an error if you do not have one. A follow-up ticket has been cut to address this issue.

* updated the AssetBundler icon. This one matches the current style guides

* PR feedback: pass a const ref instead of a value

* PR feedback: safer conversion from a string_view to a QString

Co-authored-by: alexpete <alexpete@amazon.com>
2021-04-30 15:42:10 -07:00
amzn-sj 73d53576ce Fix monolithic builds 2021-04-30 14:55:31 -07:00
mnaumov e7600cef94 PR feedback 2021-04-30 14:24:34 -07:00
bosnichd a7c6638064 Remove CryFont and initialization functions related to the legacy renderer. (#485)
- Remove CryFont and initialization functions related to the legacy renderer.
- Remove some references to Code/Tools/RC from mac CMake scripts.
2021-04-30 15:02:11 -06:00
Chris Galvan 3466fdae41 Merge branch 'main' into cgalvan/RemoveLensFlareEditor 2021-04-30 15:06:01 -05:00
Terry Michaels 2fc130d4ab Removed legacy render components (#421)
Removed legacy render components
2021-04-30 15:05:10 -05:00
Chris Galvan bb180e7b7c [LYN-3457] Removed some additional unused methods per PR feedback. 2021-04-30 15:05:04 -05:00
mnaumov 01bba93f28 PR feedback 2021-04-30 12:52:03 -07:00
Chris Galvan 2a67584bc9 [LYN-3457] Removed the LensFlareEditor. 2021-04-30 13:27:05 -05:00
Mike Balfour 6f503b5225 Merge pull request #473 from aws-lumberyard-dev/mbalfour/cherrypick-lyn-3411
Cherrypick from 1.0 - [LYN-3411] Editor freezes when saving/reloading slice due to deadlock
2021-04-30 13:19:22 -05:00
nvsickle db9df91977 Give MultiViewportControllerInstances a pointer to their parent controller, to allow state management 2021-04-30 10:46:29 -07:00
bosnichd a1319983df Remove the legacy renderer and all associated tools (#476)
Remove the legacy renderer and all associated tools:

- Code/CryEngine/Cry3DEngine/*
- Code/CryEngine/RenderDll/*
- Code/Tools/CryFXC/*
- Code/Tools/HLSLCrossCompiler/*
- Code/Tools/HLSLCrossCompilerMETAL/*
- Code/Tools/RC/*
- Code/Tools/ShaderCacheGen/*
- Tools/CrySCompileServer/*
- Tools/PakGenFromRCList/*
2021-04-30 11:22:33 -06:00
greerdv c8e8c1de66 Merge branch 'main' into non-uniform-scale-ux 2021-04-30 16:37:22 +01:00
Chris Galvan 6ace9ffedb [LYN-1731] Removed temporary bus for checking if the new viewport interaction model is enabled. 2021-04-30 10:24:01 -05:00
cgalvan ca08d78dd6 Merge pull request #441 from aws-lumberyard-dev/cgalvan/OldVIMLogicRemovalSecondPass
[LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled.
2021-04-30 09:55:08 -05:00
mbalfour 2cfb7d536e [LYN-3411] Editor freezes when saving/reloading slice due to deadlock between main thread which is blocked waiting on a loading asset, and the loading thread, which is blocked on a mutex held by the main thread.
The specific mutex is "m_assetMutex" in the AssetManager.  AssetManager::ReloadAssetFromData was holding this lock while calling AssignAssetData, which goes on to call OnAssetReloaded.  This is dangerous, because any arbitrary logic can be executed during that call, including blocking asset loads, which is what happens in this specific deadlock case.  The fix is to move the call to AssignAssetData outside of the mutex lock.  AssignAssetData itself already grabs the assetMutex to protect the parts of its logic that are necessary, and then specifically releases the lock before calling OnAssetReloaded, so this change shouldn't introduce any dangerous threading conditions.

(cherry picked from commit 1581a28339f12d521955edef890acfb678a0df6f)
2021-04-30 09:13:30 -05:00
hultonha fb46d11f6c add missing const 2021-04-30 14:52:14 +01:00
bosnichd 1d4c483e73 Red code legacy renderer (#383)
- Remove some references to gEnv->pRenderer/GetIEditor()->GetRenderer() that is now always null.
- Restore the debug console to existence.
- Stop building the following in preparation for their removal:

Code/CryEngine/Cry3DEngine/*
Code/CryEngine/RenderDll/*
Code/Tools/CryFXC/*
Code/Tools/HLSLCrossCompiler/*
Code/Tools/HLSLCrossCompilerMETAL/*
Code/Tools/RC/*
Code/Tools/ShaderCacheGen/*
Tools/CrySCompileServer/*
2021-04-30 07:31:42 -06:00
jjjoness 544b2a087f Merge branch 'main' into LY-110648 2021-04-30 14:30:06 +01:00
jjjoness 63526655a2 Fixed asset source tree layout in AssetProcessor 2021-04-30 14:27:55 +01:00
jonawals 39ba583ad7 Address PR comments. 2021-04-30 12:58:48 +01:00
Chris Galvan 9da11f9d3b [LYN-3419] Removed now unused viewportSearch from ViewportTitleDlg and all related code. 2021-04-30 06:58:16 -05:00
jonawals 20243549e6 Address PR comments. 2021-04-30 12:51:26 +01:00
greerdv cee4ca8067 WIP adding button to transform component to add non-uniform scale component 2021-04-30 12:37:12 +01:00
hultonha 0a4d62eeed update cvar description 2021-04-30 10:56:40 +01:00
hultonha c61c357541 Merge branch 'main' into hultonha_LYN-2315_camera-phase-2 2021-04-30 10:42:36 +01:00
hultonha f01e64a023 add missing includes 2021-04-30 09:21:21 +01:00
mnaumov ce367b4383 Fixing missing asset crashing Editor 2021-04-29 21:57:34 -07:00
daimini bc3f285601 Refactored IsPrefabInInstanceAncestorHierarchy to use Instance Optional References. Added more information to the error message. 2021-04-29 18:45:42 -07:00
sconel 6e8b1d1000 Update on how we move string values in AddProductDependency 2021-04-29 18:28:07 -07:00
sconel a9de24ef7d Addressed PR feedback on function args and names 2021-04-29 18:09:38 -07:00
srikappa 18c352cdb1 Merge branch 'main' into Prefab/CreatePrefab 2021-04-29 17:05:17 -07:00
daimini 7f971f726d Merge branch 'main' into Prefab/Instantiate/Loop 2021-04-29 17:05:17 -07:00
srikappa d433cd623b Fix undo for nested prefab creation by providing link patches to the undo node 2021-04-29 17:02:44 -07:00
daimini e22398700d Simplified some checks, added early outs. 2021-04-29 16:19:58 -07:00
Chris Galvan 217ba1e816 [LYN-3419] Removed remaining references to checking if the new viewport interaction model is enabled. 2021-04-29 16:45:39 -05:00
sconel 15b1ae4b2d Removed excess whitespace 2021-04-29 14:24:09 -07:00
sconel 7df8a88b0e Merge branch 'main' into Spawnable/ProductDependency 2021-04-29 14:19:43 -07:00
sconel 845b748061 Updated PrefabBuilder to include product dependencies defined in AddProductDependency 2021-04-29 14:15:48 -07:00
Luis Sempé 6fe13be1ff Merge pull request #428 from aws-lumberyard-dev/scripting/fix_lua_clear_cache
Scripting/fix lua clear cache
2021-04-29 12:05:20 -07:00
daimini 8f1499581b Merge branch 'main' into Prefab/Create/IgnoreLevel 2021-04-29 11:20:08 -07:00
Nicholas Van Sickle 3c5c692148 Merge pull request #411 from aws-lumberyard-dev/nvsickle/FixBoxSelect
Fix viewport box selection
2021-04-29 11:19:28 -07:00
daimini 6271aaa77f Exclude level container entity from prefab external reference gathering code 2021-04-29 11:07:15 -07:00
hultonha 7d96fcdf1f updates to fix camera behaviour 2021-04-29 18:39:03 +01:00
luissemp f5a9aaff5b Removed temporary debugging test 2021-04-29 10:12:09 -07:00