Commit Graph

564 Commits

Author SHA1 Message Date
sconel 4e54df49db Merge pull request #438 from aws-lumberyard-dev/Spawnable/ProductDependency
AddProductDependency to handle inter-product dependencies in PrefabProcessors
2021-05-11 15:19:01 -07:00
Mike Balfour 12ce70030c Merge pull request #701 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
Move ThumbnailerNullComponent into AzToolsFramework so that it can be used by other tools
2021-05-11 16:26:56 -05:00
mbalfour 899d4c438d Move ThumbnailerNullComponent into AzToolsFramework so that it can be used by other tools that need it.
SerializeContextTools will soon rely on this.
2021-05-11 14:25:25 -05:00
Terry Michaels 4a5d773034 Removed environment and debug mode buttons 2021-05-11 12:55:00 -05:00
Nicholas Lawson 1cbcfa75e8 Fixes a crash on mac in the SourceFileRelocatorTest (#688)
Note that this test should crash on windows too
but its a read-beyond-the-edge-of-array memory issue
which could be intermittent.
2021-05-11 10:40:31 -07:00
Mike Balfour 9ccddab552 Merge pull request #694 from aws-lumberyard-dev/mbalfour/slice-prefab-converter
Fix up incorrect autoDelete use and handling.
2021-05-11 12:02:28 -05:00
sconel c2a9ab18e4 Merge branch 'main' into Spawnable/ProductDependency 2021-05-11 09:59:50 -07:00
Alex Peterson 26d886792d Initial Python bindings pass for ProjectManager
Adds dependency on pybind and interface to call o3de.py functions from c++
2021-05-11 09:48:11 -07:00
sconel 2e32b2ee57 Merge pull request #671 from aws-lumberyard-dev/Prefabs/AssetPreload
Asset Preload fix for json serialization and prefab game mode
2021-05-11 09:35:06 -07:00
bosnichd 3defbce31b Remove legacy serialization and QPropertyTree (#684)
Remove:
- CryCommon/CryExtension/*
- CryCommon/Serialization/*
- Sandbox/Plugins/EditorCommon/QPropertyTree/*
- All related CryCommon interfaces
- All CrySystem implementations
- Various related Editor classes
2021-05-11 09:31:02 -06:00
mbalfour 704443ac89 Fix up incorrect autoDelete use and handling.
Several UI property handlers were incorrectly using the autoDelete feature by calling UnregisterPropertyType and deleting the pointer themselves, which caused double-delete crashes on application shutdown.  PropertyManagerComponent now gracefully handles that condition but also explicitly asserts explaining how the code should be changed, and the "known offenders" have been fixed up to use autoDelete correctly.
2021-05-11 10:25:03 -05:00
Tom Hulton-Harrop b185a94519 Remove all references to old CGrid system (#672)
* add overload to ActionManager to support capturing an AZStd::function

* move snapping settings to new settings registry

* remove unneeded reference in ViewportSettings

* move viewport setting function implementations to .cpp file

* add more sensible default values for snapping

* fix variable name for angle snapping

* remove const from function prototype value parameters

* add import/export api for free functions

* change from std::bind to a lambda

* remove redundant const for constexpr string_view

* add AZStd alias for std::abs

* restore grid and angle snapping

* add overload to ActionManager to support capturing an AZStd::function

* remove old legacy CGrid code

* fix build after merge

* review feedback changes - remove 1.0f multiplies
2021-05-11 14:09:09 +01:00
Tom Hulton-Harrop b5e5a3bfee More camera fixes for the new CameraInput system (#667)
* use new ViewportContext interface to set camera transform on load

* WIP fixes for camera viewport handler callbacks

* disable synchonization with old camera when new camera system is enabled

* further updates to camera-input

* ensure event is signalled when camera transform is set

* updates to ModernViewportCameraController

* fix for right click menu appearing with camera

* updates following review feedback

* convert std:: usage to AZStd::
2021-05-11 13:38:09 +01:00
Benjamin Jillich d49135659f [LYN-2520] Added link and tag widgets (#663) 2021-05-11 12:19:56 +02:00
Danilo Aimini d61c93a7b6 Merge pull request #431 from aws-lumberyard-dev/Prefab/Create/IgnoreLevel
LYN-3211 | Create Prefab can be triggered on the Level Container, generating an invalid level hierarchy
2021-05-10 23:09:51 -07:00
Terry Michaels 8ddfcabae7 Removed unneeded comments (#673) 2021-05-10 22:02:30 -05:00
sconel 286a1aafa9 Clang build fix 2021-05-10 19:11:51 -07:00
sconel 5cff7994bf Small update to AssetJsonSerializer result assignment 2021-05-10 19:00:24 -07:00
sconel 12fb07c3e3 Fix for failing AssetJsonSerializer conformity tests 2021-05-10 18:56:29 -07:00
sconel 36911723c2 Addressed PR feedback 2021-05-10 18:17:39 -07:00
sconel 93974dd1c5 Seperated queue load and blocking load calls so queue loads aren't interrupted. Added comment about asset dispatch events 2021-05-10 14:22:48 -07:00
sconel f7ea02afdc Fix for NetworkingProcessor using CreateSpawnable without ReferencedAssets arg 2021-05-10 13:21:13 -07:00
sconel 9255e4c191 Added non const getter to SerializedAssetTracker 2021-05-10 13:05:29 -07:00
sconel 17ccf90480 Updated function header comment 2021-05-10 12:59:16 -07:00
sconel 4c0fdf78bc Added error messaging, cleaned up LoadReferencedAssets 2021-05-10 12:56:54 -07:00
sconel 2e9ae76596 Removed print statement, adding in new files that were missed 2021-05-10 12:11:53 -07:00
Colin Byrne 43b474a4b2 O3de updates restricted download (#229)
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
2021-05-10 12:03:36 -07:00
sconel b04bfc459f Asset Preload fix for json serialization and prefab game mode 2021-05-10 11:46:58 -07:00
Tom Hulton-Harrop b2523217c3 Update snapping settings to be stored in the Settings Registry (#646)
* add overload to ActionManager to support capturing an AZStd::function

* move snapping settings to new settings registry

* remove unneeded reference in ViewportSettings

* move viewport setting function implementations to .cpp file

* add more sensible default values for snapping

* fix variable name for angle snapping

* remove const from function prototype value parameters

* add import/export api for free functions

* change from std::bind to a lambda

* remove redundant const for constexpr string_view

* add AZStd alias for std::abs
2021-05-10 18:40:32 +01:00
kberg-amzn bdaa7eb3c1 Merge pull request #544 from aws-lumberyard-dev/MultiplayerComponents
Multiplayer components, visibility fixes for gameplay runtime and localprediction player controller component.
2021-05-10 10:23:15 -07:00
bosnichd 440c40e490 Remove (almost) all references to pRenderer (#651)
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06:00
jjjoness 4a2e6a77b5 Merge pull request #661 from aws-lumberyard-dev/LY-87641
Checked all Search boxes and made them compliant with UX specs.
2021-05-10 16:40:26 +01:00
bosnichd 400fb14e7e Fix for level export. (#656)
Reproduced the issue where a newly exported level would not display anything when loaded in the editor, verified this change fixes it. Note that this is all related to the legacy level system, not the new prefab level system.
2021-05-10 08:37:59 -06:00
jjjoness 9a113c083d Checked all Search boxes and made them compliant with UX specs. 2021-05-10 11:46:16 +01:00
Benjamin Jillich d03f946609 [LYN-2515] Project Manager Gem List (#642)
* [LYN-2515] Project Manager Gem List Base

* Added gem model based on a standard item model
* Added list view using the gem model
* Added item delegate for a gem according to the UX design
* Removed th gem catalog ui file and replaced it with code
* Moved the gem catalog files into a sub folder
* Added drawing the Added/Get button and the platform icons
2021-05-10 11:32:13 +02:00
karlberg 9c23e637a0 Fix for white box test weirdness 2021-05-08 18:24:13 -07:00
karlberg 851323e112 One more test crash fix due to nullptr component application 2021-05-08 10:05:16 -07:00
karlberg 6b9ecc69c9 two more unit test touchpoints where core systems may not be initialized 2021-05-07 20:45:35 -07:00
karlberg eb7a8b386a Fixes for unit tests where component application might be null 2021-05-07 20:40:23 -07:00
karlberg 86fe8bf8aa Two more touchpoints that were causing ambiguous symbol errors 2021-05-07 19:19:36 -07:00
Danilo Aimini 656a8443bc Merge pull request #382 from aws-lumberyard-dev/Prefab/Instantiate/Loop
LYN-3245 | Detect circular dependencies on Instantiate Prefab and cancel operation
2021-05-07 18:43:01 -07:00
daimini e24827efb3 Fix direct editing of a reference 2021-05-07 17:08:35 -07:00
karlberg ae8a49c4ef fix bad merge 2021-05-07 16:51:53 -07:00
daimini 4662290d92 Switching IsPrefabInInstanceAncestorHierarchy to use const refs 2021-05-07 16:50:41 -07:00
daimini 47001dc0c3 Merge main 2021-05-07 16:42:51 -07:00
karlberg 1df2fe1d48 Merging latest origin 2021-05-07 16:28:11 -07:00
karlberg 80f6dcd258 Build fixes for android 2021-05-07 16:20:00 -07:00
Mike Balfour 4c453bf4b6 Merge pull request #648 from aws-lumberyard-dev/mbalfour/legacy-level-load-fix
Changed the level loading code to always set the default mission name.
2021-05-07 16:01:57 -05:00
Nicholas Van Sickle b026b6818b Merge pull request #483 from aws-lumberyard-dev/nvsickle/ViewportControllerAPI
Give MultiViewportControllerInstances a pointer to their parent
2021-05-07 13:53:50 -07:00
mbalfour 5ecd1a583f Changed the level loading code to always set the default mission name now. the mission system recently got redcoded, so nothing else was setting this name. 2021-05-07 14:23:01 -05:00