Commit Graph

1552 Commits

Author SHA1 Message Date
pappeste 89fc1483fe removing unused var 2021-05-10 14:52:26 -07:00
pappeste 5838436e31 Merge branch 'main' into ly-as-sdk/LYN-2948
# Conflicts:
#	CMakeLists.txt
2021-05-10 14:36:20 -07:00
pappeste 12cea5d029 Fixing headers and interface build dependencies 2021-05-10 13:58:22 -07:00
Vicky 8044760613 ATOM-15446 ImGui assert with Editor debug build (#622)
Disable the assert as short term solution. A proper fix will be addressed in ATOM-15495
2021-05-10 13:33:51 -07:00
jromnoa 33872f9e2c Merge pull request #670 from aws-lumberyard-dev/Atom/jromnoa/SPEC-6574-increase-test-timeout-for-debug-builds
Increase Atom AutomatedTesting tests timeout so that it passes in debug builds.
2021-05-10 13:33:19 -07:00
dmcdiarmid-ly 2406da9b67 Merge pull request #655 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14933
[ATOM-14933] Minor improvement to reflection probe scale handling
2021-05-10 13:09:51 -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
pappeste 33e4098741 Merge branch 'ly-as-sdk/LYN-2948' of https://github.com/aws-lumberyard-dev/o3de into ly-as-sdk/LYN-2948
# Conflicts:
#	cmake/Platform/Common/Install_common.cmake
2021-05-10 12:01:49 -07:00
jromnoa e0e2600b62 increase test timeout so the nightly debug jobs can pass (profile passes without issue) 2021-05-10 11:43:12 -07:00
pappeste ac7024cc06 Making install to be completely a post-processing step. We need this so all dependencies are declared and ready when we generate the target files 2021-05-10 11:19:35 -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
Nicholas Lawson 0b2835102e Fixes "RC.EXE is DEPRECATED" kinds of messages (#653) 2021-05-10 09:58:53 -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
zsolleci 527eae6f5d Merge pull request #555 from aws-lumberyard-dev/LY-123620
adding T92562988 and updating ImportPathHelper
2021-05-10 10:18:36 -05: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
zsolleci 962371979e Merge branch 'main' into LY-123620 2021-05-10 09:16:17 -05: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
anugshya 727bedf18d Merge pull request #599 from aws-lumberyard-dev/anugshya_T92569006
[ScriptCanvas_Automation]_ScriptEvents_ReturnSetTypeSuccessfully
2021-05-10 11:05:31 +05:30
dmcdiarmid-ly ec7d71661e Merge pull request #657 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15356
[ATOM-15356] Reflection probe cubemaps do not have shadows
2021-05-08 22:13:18 -07:00
karlberg 9c23e637a0 Fix for white box test weirdness 2021-05-08 18:24:13 -07:00
Shirang Jia 1162177d61 Create a seprate nightly pipeline to always run clean build. (#649) 2021-05-08 11:32:32 -07:00
karlberg 851323e112 One more test crash fix due to nullptr component application 2021-05-08 10:05:16 -07:00
dmcdiar f240e3576e Checked for the ReflectiveCubeMap view type when updating the shadow Srg data 2021-05-08 02:21:30 -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
phistere 92c74a1aaa Fixing minor spacing, spelling, and print formatting. 2021-05-07 20:06:12 -05:00
phistere bedecebdcc Configures and installs an engine.json generated from a template. Fixes HEADERONLY targets for install. Fixes locating .ico resource file. Fix infinite loop in CMake configure on new projects. 2021-05-07 20:05:05 -05:00
dmcdiar 071ecb7db7 Merge branch 'main' into Atom/dmcdiar/ATOM-14933 2021-05-07 17:12:27 -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
pappeste 2625e983b8 fixing errors that had wrong condition 2021-05-07 13:22:54 -07:00
pappeste 7441685508 changing how we refer to this path 2021-05-07 13:22:22 -07:00
mbalfour 2eb494f7c1 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 13:21:54 -07:00
jromnoa 918ec71091 Merge pull request #623 from aws-lumberyard-dev/jromnoa_atom_renderer_test_fix
LYN-3466: Fix for AutomatedTesting::AtomRenderer_HydraTests_Main
2021-05-07 13:11:25 -07:00
jackalbe faf93a93f4 {LYN-3645} Fix up EPB search paths for Editor Scripts (#645)
* {LYN-3645} Fix up EPB search paths for Editor Scripts

* Changes the path to a raw string to properly escape Windows paths that use backslashes

Jira: https://jira.agscollab.com/browse/LYN-3645
Tests: The PythonVMLoads_SysPathExtendedToGemScripts_EditorPythonBindingsValidaitonFound now works

* the correct location of the 'r'
2021-05-07 14:38:18 -05:00
greerdv bbfb136dc5 Merge pull request #579 from aws-lumberyard-dev/non-uniform-scale-ux
Non uniform scale ux
2021-05-07 20:27:13 +01: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
AMZN-mnaumov 1743d9631b Merge pull request #634 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14850
[ATOM-14850] Re-adding 'Create Material' to folder context menu
2021-05-07 12:04:44 -07:00
greerdv 9f5987d431 Merge branch 'main' into non-uniform-scale-ux 2021-05-07 19:55:26 +01:00