birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,122 Commits 3 Branches 3 Tags
development
Commit Graph

2914 Commits

Author SHA1 Message Date
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
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
Chris Galvan 20775b7745 [LYN-3195] Fixed fancy docking restore state to only touch dock tab containers that it created 
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
 2021-06-30 15:26:27 -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
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
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
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
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
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 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
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
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
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -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
greerdv f453967388 fix header ordering issue 2021-06-26 18:29:38 +01: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
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
 2021-06-25 19:18:03 -04:00
mgwynn 6721485946 Added parameter names to virtual function definitions for intellisense 2021-06-25 17:03:02 -04:00
Terry Michaels 21ebff5709 Updated help search and all docs.o3de.org links to o3de.org (#1594) 2021-06-25 15:23:57 -05:00
mgwynn a9ef02d29a Renaming nativeUI mode setting for all platforms 2021-06-25 15:37:14 -04:00
mgwynn 692c993bdb Incorporating review comments. Adding nativeUI setting for launchers. 2021-06-25 15:34:32 -04:00
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.
 2021-06-25 08:53:25 -07:00
Yuriy Toporovskyy ad2ee47ea3 Avoid a somewhat costly call to ThumbnailerRequestsBus::IsLoading when the information is already manifest 2021-06-25 09:49:13 -04:00
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
 2021-06-25 11:47:09 +02:00
Esteban Papp 1a5a8bd0ea LYN-4657 OSX: Building AutomatedTesting project fails 2021-06-24 15:01:02 -07:00
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)
 2021-06-24 14:02:49 -07:00
sconel 2a1a523091 Merge pull request #1539 from aws-lumberyard-dev/Prefabs/GameModeNewProjectCrash 
Fix issue where new projects would crash when exiting game mode
 2021-06-24 10:50:09 -07:00
Yuriy Toporovskyy 4d99eeafd2 Merge remote-tracking branch 'upstream/stabilization/2106' into DontClobberUserEditingInVectorInput 2021-06-24 12:25:49 -04:00
Vincent Liu 149cb2e2f2 Merge 'gameliftfeature' branch into 'development' branch (#1534) 2021-06-24 09:13:35 -07:00
SergeyAMZN ba80c102b5 Merge pull request #1516 from aws-lumberyard-dev/MultiplayerEditorFixes 
SPEC-7469 Fixed EditorServerInfo packet serialization
 2021-06-24 16:56:52 +01:00