Commit Graph

1477 Commits (ca4156e1c005b69d49b83dac1565412e822444a2)

Author SHA1 Message Date
Benjamin Jillich ea42ef78b8
[LYN-4938] Prism: Paths in Engine settings page do not use consistent slashes (#1721)
* Corrected focus for form line edit widgets.
* Consistent slash usage for folder browse edit widgets.

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
5 years ago
Alex Peterson f492949626
Removed mention of sample project from welcome screen (#1664) 5 years ago
Tom Hulton-Harrop f2242f1ed5
Merge pull request #1684 from aws-lumberyard-dev/hultonha_LYN-4304_viewport_ui_gamemode
Cherry-pick hiding viewport ui change from development to stabilization
5 years ago
amzn-mike af45aa299e Merge branch 'stabilization/2106' into Helios_LYN-4880-IncorrectBoneNodes 5 years ago
greerdv 0069e9aea6
Merge pull request #1719 from aws-lumberyard-dev/raycast-script-fixes
Raycast script fixes
5 years ago
amzn-sean a02ecefab9
short term fix for editor/game mode/launcher tick times consistency (#1720)
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com>
5 years ago
greerdv 05a2ce4fe1 update based on PR feedback
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 88615f462c merge from stabilization/2106
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
greerdv 899350b5c7 bring across lua raycast improvements from 1.x
Signed-off-by: greerdv <greerdv@amazon.com>
5 years ago
hultonha e1de075789 Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode 5 years ago
chcurran 2281330a7c merge latest
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Steve Pham b4a2edec6a
Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

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

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
5 years ago
srikappa c61e69d794 Add correct prefix for param tag
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
srikappa cd3fad20b4 Disable support to destroy game entities through behavior context when prefabs are enabled
Signed-off-by: srikappa <srikappa@amazon.com>
5 years ago
Esteban Papp 4d6f3aefd2
fix wrong path (#1697)
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
chcurran 0136c92467 PR white space feedback, better Lua print error message, fix ACM static variable culling
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
Danilo Aimini 7030f663f5
LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672)
* Replace old teal color with correct palette colors from the O3DE branding.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
5 years ago
Terry Michaels 85a648049b
Added tooltips to the viewport title buttons (#1691)
* Added tooltips to the viewport title dialog buttons

Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
rgba16f 1f9917f5b7
Fix editor orbit camera (#1683)
* Add a way for the EditorViewportWidget to inform the legacy orbit camera of the calculated orbit distance.

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
5 years ago
Steve Pham 827855f01c
Removal last CryTek references
- 'Crytek application' is now 'O3DE application' in ISystem.h
- 'CryTek' is now 'O3DE' in ProjectDefines.h (comment)
- 'Crytek Legacy' is now 'O3DE Legacy' in LocalizedStringManager.cpp
- 'Crytek extended data' references are now 'O3DE extended data'

Signed-off-by: spham <spham@amazon.com>
5 years ago
amzn-mike 0a241d8fd0 Bump version
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
chcurran 5b7b989733 use more constexpr in ScriptCanvasAttributes.h, remove superfluous string use in SC user data serialization
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
amzn-mike d2d8e8bc3e unsigned to unsigned int
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
hasareej 8408f6b815 PR feedback changes 2.0
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hasareej 32687cbcb2 PR feedback changes
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode
Signed-off-by: hultonha <hultonha@amazon.co.uk>
5 years ago
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 5 years ago
Steve Pham 03c8110d02
Replaced remaining CryTek copyright notices
- Replaced 'CryTek' with 'Contributors to the Open 3D Engine Project' in ConsoleHelpGen.cpp (#1667)
- Removed remaining 'Crytek Engine Source File.. Copyright (C), Crytek Studios' in various Editor source files
- Replaced 'modifications by CryTek' and 'modifications by Amazon' with 'Modified from original'
5 years ago
Benjamin Jillich 3a5b8808a0
[LYN-4879] Incorrect colour UI issue on Gem Configure (#1678)
* Aligned the column headers to the elements
* Moved the styling of the gem column header labels to the qss
* Fixed the scrollbar for the gem list view

Signed-off-by: Benjamin Jillich <jillich@amazon.com>
5 years ago
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes
Signed-off-by: pereslav <pereslav@amazon.com>
5 years ago
chcurran 9d9205d067 SC user nodeables now use __index method does not report error on (allowable) nil table entries LYN-3664
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
5 years ago
nvsickle 528279af32 Fix Viewport camera position failing to update when "Find in viewport" is activated
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
Esteban Papp d6caff7842 Some sandbox references I was missing
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Terry Michaels ffc05872cc
Updated Helpers Icon per UX (#1658)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 1696680240 git mv Code\Sandbox\Plugins Code/Editor/Plugins
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp e34e36cb35 git mv Code\Sandbox\Editor Code/Editor
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
Esteban Papp 9f0bbf3b74
SPEC-7531 Change Code/CryEngine to Code/Legacy (#1634)
* git mv Code\CryEngine Code\Legacy
* redirecting CMakeLists.txt
* fixing uic warning
* Some more CryEngine mentions
* validation scripts

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
5 years ago
amzn-mike 598c890cbc Fix nodes being incorrectly treated as bones
Some nodes have aiBones created by AssImp even though they aren't bones.  Filter these out by looking through the node graph and only considering

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
5 years ago
Nicholas Van Sickle f570925c0d
Merge pull request #1637 from aws-lumberyard-dev/nvsickle/FixRapidCameraSwitch
Fix switching cameras rapidly in the Editor accidentally copying camera positions
5 years ago
Terry Michaels 149863c527
Removed Amazon as Company for QSettings (#1649)
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
nvsickle 26c123dd56 Switch Python camera API to use Atom directly
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
jackalbe a9227e1962
{LYN-4456} FileIO hooks for LegacyTestAdapter (#1635)
* Could not reproduce the unit test fail for the m_app->BeforeRun() failure,
* so I am adding file IO hooks to listen for errors during the fixture setup

Tests: failed to repro the issue
Signed-off-by: Jackson <23512001+jackalbe@users.noreply.github.com>
5 years ago
Terry Michaels 8fe33c9afc
Removed references to Lumberyard (#1645)
Signed-off-by: Terry Michaels <miterenc@amazon.com>
5 years ago
Danilo Aimini a76a7291b5
Replace Asset Processor system tray icon with a more readable one. (#1639)
Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
5 years ago
Danilo Aimini b1f54a2090
Replace the splash screen and about us image with a temporary gradient until the official one has been finalized. (#1642)
Signed-off-by: daimini <82231674+AMZN-daimini@users.noreply.github.com>
5 years ago
amzn-phist 75e7472cda
Fixes audio crash and issues w/ audio playback (#1633)
This was caused by the main thread audio update not being called all the
time, especially Editor Game mode.

The crash was due to main thread containers not being processed and
emptied of their requests.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
5 years ago
Aaron Ruiz Mora f01587c159
Editor launcher missed to set 'sv_isDedicated' to false like the launchers (#1643)
Signed-off-by: moraaar <moraaar@amazon.com>
5 years ago
AMZN-nggieber a5e66505a0
Fix issue moving and renaming projects at the same time (#1620) 5 years ago
SJ 9dc961ec35
[iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens. (#1625)
* [iOS] Fix incorrect window size being used when rendering on newer iPhones with bigger screens.

Signed-off-by: amzn-sj <srikkant@amazon.com>
5 years ago
AMZN-Phil a67ce87102
Merge pull request #1612 from aws-lumberyard-dev/LYN-4768
Fix gem name and author bounding rects and make headings readable
5 years ago
nvsickle 4874a48c18 Fix switching cameras rapidly in the Editor accidentally copying camera positions
Signed-off-by: nvsickle <nvsickle@amazon.com>
5 years ago
sharmajs-amzn deadf448c9
Fix for module file path (#1598) 5 years ago
Terry Michaels 7a2a2dc0d7
Updated branding for application names (#1617) 5 years ago
jackalbe 580bd11715
{LYN-4372} fix for Python exit crash (#1600)
There is a crash when sys.exit() was being called since embedded Python
should not have control of the application lifetime. The Py_InspectFlag
puts the Python VM into 'inspection mode' which prevents the app
shutdown when any sys.exit() is invoked.

Notes:
* skips 'regset' extra command line in PythonBindingsExample
* added methods for handling PythonBindingsExample errors

Test: added Application_SystemExit_Blocked and
fixed up Application_Run_Fails now is Application_Run_Works
5 years ago
greerdv f453967388 fix header ordering issue 5 years ago
pconroy 196abb4af7 Fix gem name and author bounding rects and make headings readable 5 years ago
AMZN-mnaumov 83d142d7dc
Merge pull request #1609 from aws-lumberyard-dev/Atom/mnaumov/cherryPick1571
Cherry-picking thumbnail performance improvements
5 years ago
Yuriy Toporovskyy 2dd8d03654 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 5 years ago
Terry Michaels 681945c185
Make camera speed combo box automatically select all on focus in (#1601) 5 years ago
amzn-hdoke 4a3f4f6f14
[AWS][Attribution] Consent dialog is generated on first launch (#1593)
* Adding AWSAttribution Consent panel

* Remove commented code

* Create AWSCoreAttributionConsentDialog class. Move hard coded strings to static const variables

* Remove #pragma from cpp
5 years ago
amzn-mgwynn ce955715a8
Merge pull request #1543 from aws-lumberyard-dev/native-ui-changes
More specific component error messaging and modes for native UI to prevent blocking dialog in some applications
5 years ago
mgwynn 6721485946 Added parameter names to virtual function definitions for intellisense 5 years ago
AMZN-nggieber ba0f1ad758
Updated Project Manager O3DE Logos with Rotated Squares Version (#1595) 5 years ago
Terry Michaels 21ebff5709
Updated help search and all docs.o3de.org links to o3de.org (#1594) 5 years ago
mgwynn c5dca9e232 removed a call used for testing with different flags active 5 years ago
mgwynn a9ef02d29a Renaming nativeUI mode setting for all platforms 5 years ago
mgwynn 692c993bdb Incorporating review comments. Adding nativeUI setting for launchers. 5 years ago
AMZN-Phil ce4bd9ffbe
Merge pull request #1546 from aws-lumberyard-dev/LYN-4435
Show mouse cursor as busy when copying project
5 years ago
Danilo Aimini 9b6ef150ff
LYN-2480 | Minor fixes to the Prefab system (#1581)
Remove warning when entities that aren't registered to instances get passed to the Prefab Undo Cache (just ignore them to avoid noise in the console).
Also avoid marking templates dirty when they are added.
5 years ago
AMZN-Phil 514edf049f
Merge pull request #1545 from aws-lumberyard-dev/LYN-4443
Show mouse cursor as busy when deleting project
5 years ago
AMZN-Phil 16c4fbfe10
Merge pull request #1576 from aws-lumberyard-dev/LYN-4566
Hide cart popup in project manager when going back to previous page
5 years ago
Terry Michaels b80f0782ef
Removed old code referencing removed classes (#1587) 5 years ago
Benjamin Jillich bf0816fb69
[LYN-4574] [LYN-4603] [LYN-4669] Saving motions and actors to json-based .assetinfo files in the Animation Editor fails (#1509)
* Fixes saving motions from within the Animation Editor
* Fixes saving actors from within the Animation Editor
* The motion event chunk of the .motion file format now also stores the event data as json (rather than XML) reducing motion file sizes (Example: 60KB motion went down to 49KB, containing only 4 motion events from 2 tracks).
* Fully backward compatible
* New motion meta data rule stores the event data directly rather than command strings or objects. This is the way that aligns with the Json paradigm and as side-effect bypasses the optionals that we use for the commands which fixes the issue.

* [LYN-4574] Adding new motion event meta data rule that stores the event data directly rather than via commands to align with the Json paradigm
* [LYN-4574] Preparing motion, event table and event track for Json serialization
* [LYN-4574] New chunk to store motion event data in Json format (fully backward compatible to XML)
* [LYN-4669] Json: Empty AZStd::vector<AZStd::shared_ptr<T>> serializes into 1x element with nullptr as data
* [LYN-4603] EMotion FX: Cannot save actors with physics or simulated object setup in Json format
5 years ago
michabr 03138f4936
Fix for cursor not being displayed when asked to display (#1574) 5 years ago
lumberyard-employee-dm 8530e783ca
Setting the build timeout for the ProjectBuilder CMake commands to -1 (#1583)
This prevents Project build step from timing out

Moving the project build directory to be under the <project-path>/build/ folder to prevent two issues
1. The AssetProcessor from scanning that folder for assets.
   [Bb]uild is part of the excluded folders
2. To prevent git from seeing modified files in the build directory as
   the default .gitignore file ignores [Bb]uild
5 years ago
Terry Michaels 7105fb1f5d
Removed Thumbnail Demo define and related logic (#1573) 5 years ago
pconroy 875cd0c858 Hide cart popup when going back to previous page 5 years ago
Danilo Aimini 43b43c3a05
Add Project name to Editor Window title (#1565) 5 years ago
Esteban Papp 1a5a8bd0ea
LYN-4657 OSX: Building AutomatedTesting project fails 5 years ago
Danilo Aimini b2046900fb
Bug fix for inability to change actor transform properties | #1468
Actor motion extraction applies at all times, sending transform change events to the Qt widget and overwriting any editing the user is doing. (LY-124903)
5 years ago
Terry Michaels 273b2c30b7
Updated About dialog to point to the correct EULA page and updated text 5 years ago
sconel 2a1a523091
Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash
Fix issue where new projects would crash when exiting game mode
5 years ago
Yuriy Toporovskyy 4d99eeafd2 Merge remote-tracking branch 'upstream/stabilization/2106' into DontClobberUserEditingInVectorInput 5 years ago
SergeyAMZN ba80c102b5
Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes
SPEC-7469 Fixed EditorServerInfo packet serialization
5 years ago
Yuriy Toporovskyy c27b417761 Address pr feedback
- Use AZ warning macros instead of #pragma warning
- std::numeric_limits->AZStd::numeric_limits
- IsClose->IsCloseMag
- AZ_Warning->AZ_Assert
5 years ago
jackalbe 143b8f1131
{SPEC-7465} Fix DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds (#1535)
* Fix for DeleteCachedAssets_AssetsReprocessed fails on Debug Nightly Builds
* added -ap_disableAssetTreeView=true to disable the Qt tree view for the asset tab to get the parts that want to be tested finish
* only shows up on Debug

Tests:
=== test session starts ===
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_AllPlatforms::test_AllSupportedPlatforms_FastScanWorks_FasterThanFullScan[windows-AutomatedTesting] PASSED [ 50%]
AutomatedTesting/Gem/PythonTests/assetpipeline/asset_processor_tests/asset_processor_batch_tests_2.py::TestsAssetProcessorBatch_Windows::test_WindowsPlatforms_RunAPBatchAndConnectGui_RunsWithoutEditor[windows-AutomatedTesting] PASSED [100%]
--- generated xml file: F:\amazon\o3de\build\vs2019\Testing\Pytest\AssetPipelineTests.Batch_2_Sandbox.xml ---
=== 2 passed, 4 deselected in 18.32s ===
5 years ago
Tom Hulton-Harrop 1dfb41b6f8
Merge pull request #1512 from aws-lumberyard-dev/hultonha_LYN-4389_imgui-viewport-ui
Change to move Viewport UI elements to no longer overlap with ImGui menu
5 years ago
pconroy 5b277cc061 Show mouse cursor as busy when copying project 5 years ago
pconroy b9b55c3eed Show mouse cursor as busy when deleting project 5 years ago
amzn-mike 63dd82aed3
Merge pull request #1498 from aws-lumberyard-dev/Helios_LYN-3723-FixPBRNormalMapImport
[LYN-3723] Fix Stingray PBR normal map import
5 years ago
amzn-mike 8e98f7bb28
Merge pull request #1505 from aws-lumberyard-dev/Helios_LYN-4742-AssImpRootTransformFix
[LYN 4742] AssImp Root Transform Fix
5 years ago
mgwynn fb3940fa31 More specific component error messaging and modes for native UI to prevent blocking dialog in some applications 5 years ago
Danilo Aimini 07243c3eee
LYN-4783 | Replace Component Help URLs with O3DE help URLs - Fix debug build (#1537) 5 years ago
AMZN-nggieber 10dcae90a4
Replaced editor logo with new project manager logo for Project Manager (#1531) 5 years ago
sconel ad181205f8 Add extra space to error message for better formatting 5 years ago
sconel f91e640741 Fix issue where new projects would crash when entering game mode 5 years ago
amzn-mike 03a6d1e0f5 Merge branch 'stabilization/2106' into Helios_LYN-4742-AssImpRootTransformFix 5 years ago
amzn-mike 0e8a2ca110 Merge branch 'stabilization/2106' into Helios_LYN-3723-FixPBRNormalMapImport 5 years ago
amzn-mike 3d0093307f
Merge pull request #1490 from aws-lumberyard-dev/Helios_AssImpAnimationOnAllBones
[AssImp] Add placeholder animations for all bones
5 years ago