birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,276 Commits 3 Branches 3 Tags
fc2053fad9dbfdff14607fbc98aaa6baea5686ec
Commit Graph

2021 Commits

Author SHA1 Message Date
Gene Walters bafcdfe037 Merge pull request #1655 from aws-lumberyard-dev/genewalt/gitflow_210628 
Merging Stabilization/2106 into Development
 2021-06-30 11:07:30 -07:00
Tom Hulton-Harrop 8d35f31fa6 API documentation pass for CameraInput types (#1681) 
* add api comments for new camera system

Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:16:35 +01:00
hasareej 8408f6b815 PR feedback changes 2.0 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:02:44 +01:00
hasareej 32687cbcb2 PR feedback changes 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:01:52 +01:00
hasareej df0fede8d2 Hiding the 2 Clusters during Gameplay mode 
Signed-off-by: hultonha <hultonha@amazon.co.uk>
 2021-06-30 18:00:52 +01:00
Esteban Papp 5fa495380c Merge branch 'stabilization/2106' into redcode/SPEC-7563 2021-06-30 09:20:08 -07:00
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'
 2021-06-30 08:27:43 -07:00
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>
 2021-06-30 17:12:01 +02:00
pereslav 1100e20e26 Merged ctrl+g fixes from MultiplayerEditorFixes 
Signed-off-by: pereslav <pereslav@amazon.com>
 2021-06-30 13:20:07 +01:00
sphrose 7bb4e0562b Update AssetBrowserTreeView.cpp 
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com>
 2021-06-30 09:06:16 +01:00
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>
 2021-06-29 18:42:32 -07:00
nvsickle 528279af32 Fix Viewport camera position failing to update when "Find in viewport" is activated 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-06-29 18:19:23 -07:00
alexmontAmazon 69f2e06134 rewrite of the filter code to fix [LYN-4156][LYN-4545] (#1640) 
* rewrite of the filter code to fix [LYN-4156][LYN-4545]

Signed-off-by: Alex Montgomery <alexmont@amazon.com>

* improved onRowCountChanged() per comments

Signed-off-by: Alex Montgomery <alexmont@amazon.com>
 2021-06-29 17:31:27 -07:00
Esteban Papp d6caff7842 Some sandbox references I was missing 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 16:54:30 -07:00
Gene Walters 9814e9dc6c Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 16:31:06 -07:00
Gene Walters 6fb2558e44 Merge branch 'upstream/development' into genewalt/gitflow_210628 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 15:40:46 -07:00
Terry Michaels ffc05872cc Updated Helpers Icon per UX (#1658) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 17:37:34 -05:00
Esteban Papp d14229c67e some replacements and fixes that were referring Sandbox/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 13:55:32 -07:00
Esteban Papp 1696680240 git mv Code\Sandbox\Plugins Code/Editor/Plugins 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 13:55:31 -07:00
Esteban Papp e34e36cb35 git mv Code\Sandbox\Editor Code/Editor 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-29 13:55:28 -07:00
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>
 2021-06-29 13:51:24 -07:00
Gene Walters f905b71844 Adding missing o3de copyright headers 
Signed-off-by: Gene Walters <genewalt@amazon.com>
 2021-06-29 13:48:45 -07:00
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>
 2021-06-29 15:14:33 -05:00
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
 2021-06-29 12:37:04 -07:00
Terry Michaels 149863c527 Removed Amazon as Company for QSettings (#1649) 
* Removed Amazon as Company for QSettings

Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 14:00:11 -05:00
John c145a9a74a Add missing files from addressing PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 19:46:21 +01:00
nvsickle 26c123dd56 Switch Python camera API to use Atom directly 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-06-29 11:41:10 -07:00
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>
 2021-06-29 11:59:51 -05:00
IgnacioMartinezGarrido b87e3eb1d6 LYN-4863: Item data not copied on drag-n-drop if column is hidden in Asset Browser Tree View. (#1616) 
* Fixed: Item returning null in drag and drop when column is hidden

* Added explanation about why this approach is needed

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:51 +01:00
John fd1bb483c0 Address PR comments 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:38 +01:00
John 478ffeeac6 Remove PythonCoverage runtime component 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:35 +01:00
John 0e0f266fdd Provisional implementation of PythonCoverage gem 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:33 +01:00
Yuriy Toporovskyy 41a5a5b4f4 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:26 +01:00
Vincent Liu 4c65fecb57 Merge 'gameliftfeature' branch into 'development' branch (#1534) 
Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:15 +01:00
John Jones-Steele 497a93014b Entity Outliner - Sort Order options don't show current selection 
Also fixes the menus that have checkmark and icon

Signed-off-by: John <jonawals@amazon.com>
 2021-06-29 17:43:13 +01:00
Terry Michaels 8fe33c9afc Removed references to Lumberyard (#1645) 
Signed-off-by: Terry Michaels <miterenc@amazon.com>
 2021-06-29 11:06:15 -05:00
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>
 2021-06-29 08:55:03 -07:00
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>
 2021-06-29 08:54:40 -07:00
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>
 2021-06-29 10:54:27 -05:00
Aaron Ruiz Mora f01587c159 Editor launcher missed to set 'sv_isDedicated' to false like the launchers (#1643) 
Signed-off-by: moraaar <moraaar@amazon.com>
 2021-06-29 16:10:26 +01:00
AMZN-nggieber a5e66505a0 Fix issue moving and renaming projects at the same time (#1620) 2021-06-28 19:58:00 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
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>
 2021-06-28 17:53:43 -07:00
AMZN-Phil a67ce87102 Merge pull request #1612 from aws-lumberyard-dev/LYN-4768 
Fix gem name and author bounding rects and make headings readable
 2021-06-28 17:28:25 -07:00
nvsickle 4874a48c18 Fix switching cameras rapidly in the Editor accidentally copying camera positions 
Signed-off-by: nvsickle <nvsickle@amazon.com>
 2021-06-28 15:54:35 -07:00
sharmajs-amzn deadf448c9 Fix for module file path (#1598) 2021-06-28 09:45:05 -07:00
Terry Michaels 7a2a2dc0d7 Updated branding for application names (#1617) 2021-06-28 11:35:13 -05:00
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
 2021-06-28 10:28:49 -05:00
greerdv f453967388 fix header ordering issue 2021-06-26 18:29:38 +01:00
pconroy 196abb4af7 Fix gem name and author bounding rects and make headings readable 2021-06-25 20:53:41 -07:00