1586c00fc8
[LYN-4929] Correct gems not showing as enabled for a template ( #1722 )
...
* When there are multiple project templates present, we re-gather the gems when changing the selected the project template.
* In case the user enabled or disabled any gem and they select a new project template, we show a warning dialog where users can either cancel the operation or proceed to the new project template. The warning dialog will only appear in case the enabled gems actually differ from the currently used template's default.
* New helper function to select the used project template.
* Storing the currently used project template index and only update the template details and emitting the changed event in case the user has actually chosen another template. This avoids emitting signals in case the user clicks on the already selected template.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-07-01 18:53:17 +02:00
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 >
2021-07-01 18:44:28 +02:00
f492949626
Removed mention of sample project from welcome screen ( #1664 )
2021-07-01 09:09:56 -07:00
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
2021-07-01 16:55:31 +01:00
aff4859251
short term fix for editor/game mode/launcher tick times consistency ( #1720 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-01 16:19:40 +01:00
af45aa299e
Merge branch 'stabilization/2106' into Helios_LYN-4880-IncorrectBoneNodes
2021-07-01 10:18:57 -05:00
0069e9aea6
Merge pull request #1719 from aws-lumberyard-dev/raycast-script-fixes
...
Raycast script fixes
2021-07-01 16:13:49 +01:00
d7b516b518
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit
2021-07-01 10:08:04 -05:00
c98e9df75e
enable the new camera system by default in the editor ( #1717 )
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-07-01 15:04:51 +01:00
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 >
2021-07-01 14:47:51 +01:00
05a2ce4fe1
update based on PR feedback
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-01 13:35:57 +01:00
88615f462c
merge from stabilization/2106
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-01 11:30:16 +01:00
899350b5c7
bring across lua raycast improvements from 1.x
...
Signed-off-by: greerdv <greerdv@amazon.com >
2021-07-01 11:24:10 +01:00
e1de075789
Merge remote-tracking branch 'upstream/stabilization/2106' into hultonha_LYN-4304_viewport_ui_gamemode
2021-07-01 09:58:55 +01:00
2281330a7c
merge latest
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-06-30 20:42:41 -07:00
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
c61e69d794
Add correct prefix for param tag
...
Signed-off-by: srikappa <srikappa@amazon.com >
2021-06-30 17:16:13 -07:00
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
4d6f3aefd2
fix wrong path ( #1697 )
...
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com >
2021-06-30 17:02:54 -07:00
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
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
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
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
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
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
0a241d8fd0
Bump version
...
Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com >
2021-06-30 13:45:51 -05:00
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
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
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
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
8408f6b815
PR feedback changes 2.0
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-06-30 18:02:44 +01:00
32687cbcb2
PR feedback changes
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-06-30 18:01:52 +01:00
df0fede8d2
Hiding the 2 Clusters during Gameplay mode
...
Signed-off-by: hultonha <hultonha@amazon.co.uk >
2021-06-30 18:00:52 +01:00
5fa495380c
Merge branch 'stabilization/2106' into redcode/SPEC-7563
2021-06-30 09:20:08 -07:00
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
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
1100e20e26
Merged ctrl+g fixes from MultiplayerEditorFixes
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-06-30 13:20:07 +01:00
7bb4e0562b
Update AssetBrowserTreeView.cpp
...
Signed-off-by: sphrose <82213493+sphrose@users.noreply.github.com >
2021-06-30 09:06:16 +01:00
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
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
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
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
9814e9dc6c
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 16:31:06 -07:00
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
ffc05872cc
Updated Helpers Icon per UX ( #1658 )
...
Signed-off-by: Terry Michaels <miterenc@amazon.com >
2021-06-29 17:37:34 -05:00
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
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
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
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
f905b71844
Adding missing o3de copyright headers
...
Signed-off-by: Gene Walters <genewalt@amazon.com >
2021-06-29 13:48:45 -07:00
Benjamin Jillich
Alex Peterson
Tom Hulton-Harrop
amzn-sean
amzn-mike
greerdv
Chris Galvan
greerdv
hultonha
chcurran
Steve Pham
srikappa
Esteban Papp
Danilo Aimini
Terry Michaels
rgba16f
Gene Walters
hasareej
pereslav
sphrose
nvsickle
alexmontAmazon
Gene Walters