birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,082 Commits 3 Branches 3 Tags
d4e4ebc2a7b065f4768f6131b4b7a712b85d323b
Commit Graph

1467 Commits

Author SHA1 Message Date
chcurran 2281330a7c merge latest 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-06-30 20:42:41 -07:00
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>
 2021-06-30 19:51:55 -07:00
srikappa c61e69d794 Add correct prefix for param tag 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-06-30 17:16:13 -07:00
srikappa cd3fad20b4 Disable support to destroy game entities through behavior context when prefabs are enabled 
Signed-off-by: srikappa <srikappa@amazon.com>
 2021-06-30 17:16:10 -07:00
Esteban Papp 4d6f3aefd2 fix wrong path (#1697) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-06-30 17:02:54 -07:00
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>
 2021-06-30 16:55:26 -07:00
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>
 2021-06-30 15:20:42 -07:00
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>
 2021-06-30 16:47:59 -05:00
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>
 2021-06-30 15:23:47 -05:00
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>
 2021-06-30 12:48:16 -07:00
amzn-mike 0a241d8fd0 Bump version 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-06-30 13:45:51 -05:00
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>
 2021-06-30 11:44:25 -07:00
amzn-mike d2d8e8bc3e unsigned to unsigned int 
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-06-30 13:35:27 -05: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
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
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
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
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
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
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
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
AMZN-mnaumov 83d142d7dc Merge pull request #1609 from aws-lumberyard-dev/Atom/mnaumov/cherryPick1571 
Cherry-picking thumbnail performance improvements
 2021-06-25 19:18:10 -07:00
Yuriy Toporovskyy 2dd8d03654 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 2021-06-25 17:24:32 -07:00
Terry Michaels 681945c185 Make camera speed combo box automatically select all on focus in (#1601) 2021-06-25 19:21:11 -05:00