Commit Graph

919 Commits

Author SHA1 Message Date
pappeste f1b688f435 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
#	Code/Tools/ProjectManager/Source/GemCatalog/GemInfo.h
#	Gems/AtomLyIntegration/AtomViewportDisplayInfo/gem.json
#	cmake/LYWrappers.cmake
#	cmake/SettingsRegistry.cmake
#	scripts/o3de/tests/unit_test_current_project.py
2021-05-27 10:29:19 -07:00
Terry Michaels 9b1be43367 Renamed osx_gl to mac and es3 to android for cache folders (#949) 2021-05-26 19:17:17 -05:00
Nicholas Van Sickle d1863c6c5b Restore Editor viewport icon rendering (#879)
This introduces an EditorViewportIconDisplayInterface that will eventually be used to outright remove CIconManager, it provides a simple interface for loading 2D image assets and rendering them on-screen. It also introduces AtomBridge::PerViewportDynamicDraw for getting a dynamic draw instance on a per-viewport basis
2021-05-26 16:36:54 -07:00
Terry Michaels 5ed4454e8b Moved Create New Level logic out from SaveToStream (#967) 2021-05-26 17:52:34 -05:00
cgalvan f1a5160fe7 Merge pull request #963 from aws-lumberyard-dev/cgalvan/FixMacBuildSliceConverter
Fixed extra qualification causing compile error on Mac.
2021-05-26 16:20:02 -05:00
Mike Balfour 6c17c7bfb3 Add new API to convert absolute source paths to relative paths. (#930)
There are already APIs for getting a relative product path from an absolute source path, or getting a relative source path for an *existing* source file, but there were no APIs for getting a relative source path for a *new* source file.  Prefabs will need this ability to be able to correctly generate a relative source path inside the prefab file before the file has been saved.
The logic for relative source paths is a little bit tricky because the paths are relative to the watch folders, and the watch folders can be nested, with different priorities to explain which should take precedence.  The input paths can also include specifiers like "." and "..", which need to be reconciled before creating the final correct relative path.  The included unit tests test all of the tricky edge cases that I was able to identify.
2021-05-26 15:30:21 -05:00
Alex Peterson da24f4ccde Launch editor from Project Manager 2021-05-26 13:17:16 -07:00
srikappa-amzn ef6ac74aa7 Merge pull request #934 from aws-lumberyard-dev/Prefab/RemoveUndoCacheDependency
Remove prefab undo cache dependency on CreatePrefab use case
2021-05-26 13:00:02 -07:00
Chris Galvan b68b9000a3 Fixed extra qualification causing compile error on Mac. 2021-05-26 14:55:38 -05:00
Ken Pruiksma 60f7f971f3 Merge pull request #943 from aws-lumberyard-dev/pruiksma/halton_update
Make it easier to fill your own custom structures with Halton sequences.
2021-05-26 14:20:28 -05:00
AMZN-koppersr 86afd5fc7f Merge pull request #917 from aws-lumberyard-dev/SpawnableIndexQuery
Additional list function added to Spawnables.
2021-05-26 11:44:07 -07:00
srikappa 0ffaa5429b Fixed a linux build error where an implicit conversion to const ref is not supported 2021-05-26 11:31:16 -07:00
pruiksma e903915867 Merge branch 'main' into pruiksma/halton_update 2021-05-26 13:05:50 -05:00
pruiksma 1924937150 Fixes from PR review 2021-05-26 13:05:07 -05:00
srikappa 7d3dcf85f6 Merge branch 'main' into Prefab/RemoveUndoCacheDependency 2021-05-26 10:47:35 -07:00
srikappa 5a41746683 Fixed a comment and added a forward declaration 2021-05-26 10:46:00 -07:00
AMZN-koppersr a82f4440ea Fixed release compile error 2021-05-26 10:24:15 -07:00
lumberyard-employee-dm 9a0b93c9ff Fixed generation of Monolithic builds StaticModules.inl (#947)
* Fixed generation of Monolithic builds StaticModules.inl
A project's gem module RUNTIME_DEPENDENCIES were not visited to
determine any dependent gem modules that needed to load.
Therefore the CreateStaticModules function were missing
CreateModuleClass_* function calls required initialize the gem's AZ::Module
derived class in monolithic builds

* Removed the logic to strip the Gem:: and Project:: prefix from the Server Launcher gem dependencies

When associating gem dependencies with the server target there was CMake logic left over in it to strip the beginning of the target name if it began with "Gem::" or "Project::"
2021-05-26 12:18:26 -05:00
greerdv 53f31a2712 Merge pull request #950 from aws-lumberyard-dev/network-transform-scale
update network code to use uniform scale on Transform
2021-05-26 18:01:49 +01:00
AMZN-koppersr f3212902aa Merge branch 'main' into SpawnableIndexQuery 2021-05-26 09:48:20 -07:00
SJ 8ca3b078a2 Remove bootstrap.cfg and some references to it.
Merge pull request #836 from aws-lumberyard-dev/LYN-2461
2021-05-26 09:32:57 -07:00
Hasareej ca5e629dac Hasareej lyn 2301 cluster space 2 (#843)
Initial Implementation of the ViewportUi Space Cluster
2021-05-26 17:12:30 +01:00
pappeste a421b4cb71 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948
# Conflicts:
#	scripts/o3de.py
2021-05-26 09:06:49 -07:00
greerdv 2fc5b3aadf Merge branch 'main' into network-transform-scale 2021-05-26 16:20:41 +01:00
Benjamin Jillich 05f3144055 [LYN-2522] Gem catalog header widgets (#919)
* Added header widget with the name based filter
* Added column title header together with the the number of currently shown/filtered gems
2021-05-26 16:01:12 +02:00
greerdv 4018bb587c update network code to use uniform scale on Transform 2021-05-26 14:20:22 +01:00
lumberyard-employee-dm 922099050b Simplified the o3de package gem enable/disable logic
The add_gem_project and remove_gem project scripts, now just enables on
a gem name basis instead of a CMake target basis

Updated the ProjectManager code and scripts to account for the
add_gem_project and rmeove_gem_project script changes.
2021-05-26 04:46:16 -05:00
greerdv 1c7d5e5615 Merge branch 'main' into transform-float-scale-continued 2021-05-26 10:27:18 +01:00
lumberyard-employee-dm 59934e6be1 Updating the ProjectManager code and scripts with new layout of the o3de package scripts 2021-05-26 00:23:21 -05:00
lumberyard-employee-dm 76fe7f3666 Merge branch 'main' of https://github.com/aws-lumberyard/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 23:48:55 -05:00
lumberyard-employee-dm 791e044457 Fixed PlatformConfigurationUnitTests.TestFailReadConfigFile_RegularScanfolder test by setting a project path in the AssetProcessorTest fixture 2021-05-25 23:38:03 -05:00
pruiksma d4d533e6a8 Add comment to FillHaltonSequence 2021-05-25 21:39:34 -05:00
pruiksma ab84a43a83 Update to HaltonSequence to make it easier to fill your own custom structures with halton sequences. 2021-05-25 21:34:53 -05:00
pappeste b0527387a1 Merge remote-tracking branch 'origin/ly-as-sdk/LYN-2948-phistere' into ly-as-sdk/LYN-2948 2021-05-25 19:24:14 -07:00
Chris Burel 03ec6465b5 Support deserializing non-reflected enums (#815)
The serialize context allows users to reflect fields that are enums to
a class without reflecting the enum type itself with the EnumBuilder. In
this case, the serialize context stores the mapping of the enum's typeid
to the underlying type's typeid. When asking for the class data for the
enum typeid, the underlying type's class data is returned. This was
throwing off the json serializer, which would then see that the type was
"unsigned int" instead of an enum, and attempt to load the unsigned int
value. The unsigned int deserializer would then complain, because the
incoming typeid was the typeid of the enum, and not equal to the typeid
of unsigned int.

This change adds support for detecting the non-reflected enum, and
loading it properly.
2021-05-25 18:49:06 -07:00
lumberyard-employee-dm 4b75b7bb63 Fixed the AssetBundler unit test by moving the retrieval of the Engine Root Path after the Settings Registry has merged the runtime paths 2021-05-25 20:30:59 -05:00
pappeste df44f782f2 More dependencies fixes 2021-05-25 18:11:48 -07:00
lumberyard-employee-dm 4e362a2a04 Removing the initialization of the "@root@" alias to the EngineRoot since it really represents the Asset Cache Root and any paths within it are lowercased. Moved the ordering to set the @assets@ alias before the @projectplatformcache@ so that the "ArchiveTestFixture.IResourceList_Add_AbsolutePath_RemovesAndReplacesWithAlias" test is able to convert it's absolute path to an alias path that starts with @assets@ 2021-05-25 20:09:13 -05:00
carlitosan 5eb3bcdf55 Merge pull request #932 from aws-lumberyard-dev/carlitosan-beta-fixes
SC support for unordered_set, version upgrade improvements and bug fixes
2021-05-25 17:39:06 -07:00
AMZN-koppersr e4efc467f2 Updated comment for ListEntities in SpawnableEntitiesInterface.
Updated the comment for ListEntities to be more descriptive. This hopefully clears up the confusion about what the index in a spawnable ticket exactly refers to.
2021-05-25 17:38:20 -07:00
Chris Santora 004a3bbb37 Merge pull request #861 from aws-lumberyard-dev/Atom/santorac/RemoveScriptContextWarnings
Removed unnecessary "is not a function" warnings from ScriptContext.

All these warnings are followed by returning false, which call sites can use to report warnings where appropriate. In the case of material lua functors, it is not appropriate to report a warning which is why I'm removing these. The material system uses the "Call" API to potentially call a function that may or may not exist, and it is acceptable for that function to be absent.
2021-05-25 17:10:24 -07:00
Terry Michaels 4dd08ec21f Added a default level prefab concept for newly created levels (#931)
* Started update for prefab based initial asset inclusion

* Newly Created levels now use a template prefab

* Review feedback changes

* Moved to better asset-based queries to generate the full path.

* Removed pesky pragma

* Replaced with const name instead of literal string
2021-05-25 18:15:19 -05:00
Steve Pham 6136bc270e Remove flaky test from AzNetwork instead of using retry
- Remove '--repeat until-pass' from profile test ctest argument
- Moved flaky TCP tests from main googletest suite to sandbox
- Added 'TARGET' to 'ly_add_googletest' to support adding the same module to multiple tests or adding a test that is not named the same as the module
- Fix minor bug in ly_add_googletest
2021-05-25 16:05:40 -07:00
phistere 59254cc9e7 Update Launcher to find the autoexec.cfg in assets
Was looking in the engine root for the autoexec.cfg, changed it to use
the project assets path.
2021-05-25 15:44:50 -07:00
phistere fe29728233 Merge branch 'ly-as-sdk/LYN-2948-phistere' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 17:41:22 -05:00
phistere f12162a1cf Update Launcher to find the autoexec.cfg in assets
Was looking in the engine root for the autoexec.cfg, changed it to use
the project assets path.
2021-05-25 17:40:09 -05:00
lumberyard-employee-dm d3835699ea Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948-phistere 2021-05-25 17:17:55 -05:00
pappeste 19adbf2f41 Removing adding runtime dependencies for gems that are in the BUILD_DEPENDENCIES 2021-05-25 15:12:17 -07:00
greerdv bdf9ac31fb update to use uniform scale calls to Transform 2021-05-25 22:31:41 +01:00
Alex Peterson 82b4b83256 Launch o3de.exe instead of project_manager.py
Launch the o3de project manager application instead of project_manager.py when the editor is started but no project is specified.
2021-05-25 13:15:15 -07:00