igarri
1c2b8f9111
Adding AZ_CVAR for the new feature
2021-05-18 13:33:21 +01:00
igarri
61ac423ebd
Deleted unused files
2021-05-17 16:04:43 +01:00
igarri
10ca002ced
Checkbox to select view
2021-05-17 14:25:43 +01:00
igarri
b9c9811d35
Fixing qobject_cast to the StringFilter
2021-05-17 14:06:01 +01:00
igarri
d5591e52ff
Merge branch 'main' into LYN-1767-AB
2021-05-14 13:12:29 +01:00
igarri
cff9fea535
Switching views with filters
2021-05-14 13:09:14 +01:00
AMZN-mnaumov
d0daab4fe0
Merge pull request #710 from aws-lumberyard-dev/Atom/mnaumov/LYN-3529
...
[LYN-3529] Hiding "Open Material Editor" when material asset is assigned
2021-05-13 17:15:03 -07:00
jackalbe
7d91a4c08e
{LYN-3787} Fix for infinite loop in the scene builder's import phase ( #747 )
...
* This simple fix pops any node that can not be registered using it name and unique ID
* Any scene file (i.e FBX) with the three or more nodes with the same name and parent will sort of work
* After the 2nd child node with the same name and parent will be dropped on export
Tests: added the new AutomatedTesting/Assets/BadAssets/three_same_named_nodes.fbx to regress test this
2021-05-13 17:50:02 -05:00
AMZN-tpeng
c2dc3dad32
Merge pull request #629 from aws-lumberyard-dev/ATOM/tonypeng/ATOM-15266-2
...
ATOM-15266 [RHI][Vulkan][Android] Use warning on fragment pool error …
2021-05-13 15:38:38 -07:00
Guthrie Adams
ab81bd0e7e
Merge pull request #726 from aws-lumberyard-dev/Atom/guthadam/ATOM-15223
...
ATOM-15223 updating material assignment ID to be portable to other models
2021-05-13 17:21:07 -05:00
Mike Balfour
0ae123eae6
Fix AssetContainer behavior with immediate load errors
...
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing. This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 16:08:47 -05:00
mbalfour
7866178f3e
Fix AssetContainer behavior with immediate load errors
...
The AssetContainer was getting "stuck" in the case that it tried to load a missing asset that was already registered with the AssetManager as missing. This fixes the bug, as well as adding a unit test for the specific condition.
2021-05-13 14:10:45 -05:00
AMZN-nggieber
7ecd1b1761
Rearchitecture Project Manager Screens Workflow and Create Project Settings Ctrl
...
* Renamed UX screen files and classes to include screen in the name
* Changed screens to emit a screen change request a controller can connect to
* Made ScreensCtrl that owns and manages screens and their changing and history
* Made Project Settings Control managing back and next buttons
* Add Project Setting Model and moved New Project Settings Ui into Screen file
* Goto previous screen always works
* Removed unnecessary QObject namespace from connect calls
* Merged ProjectSettingsModel into ProjectInfo
2021-05-13 10:47:49 -07:00
michabr
67a1e4dc4f
Merge pull request #711 from aws-lumberyard-dev/michabr/lyshine_viewport_fixes
...
UI Editor Viewport fixes
2021-05-13 10:25:44 -07:00
michabr
9cde3d60e9
Merge pull request #712 from aws-lumberyard-dev/michabr/lyshine_merge
...
LyShine/UI Editor fixes for Atom
2021-05-13 10:21:01 -07:00
bosnichd
3d84902b24
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used). ( #741 )
...
Remove CryCommonTools (moving the three remaining files into Editor/Util which is the only place they're used).
2021-05-13 11:10:44 -06:00
zsolleci
55ec82be8f
Merge pull request #613 from aws-lumberyard-dev/SPEC-6690
...
Spec 6690
2021-05-13 11:37:25 -05:00
jjjoness
5940f2ebbe
Merge pull request #739 from aws-lumberyard-dev/LYN-1099
...
LYN-1099 DEV TASK - Play Controls
2021-05-13 17:35:17 +01:00
Peng
49d2d92c2d
Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2
2021-05-13 08:39:43 -07:00
Tom Hulton-Harrop
795aa114e6
Improve selection in the viewport ( #720 )
...
* improve selection in the viewport
* remove debug code
* updates following review feedback
- update API comments from /// to //! from
- add [[nodiscard]] attribute to member function
- move constructor implementations to .cpp files
* use lambda instead of ternary operator
* fix unit test failure caused by typo
2021-05-13 16:19:53 +01:00
igarri
33240c9f90
Selecting assets from tableview
2021-05-13 16:08:14 +01:00
bosnichd
4aff32e719
More red code ( #732 )
...
Remove:
- Code/CryEngine/CryCommon/Platform
- Some unused Code/CryEngine/CryCommon/Mock files
- Code/Tools/CryXML and almost all of Code/Tools/CryCommonTools
- Code/Tools/TestBed/ResourceCompilerImage
- Tools/DeepBandwidthToExcel
- Various .p4ignore files
2021-05-13 08:55:36 -06:00
kberg-amzn
5225fd2c9f
Merge pull request #727 from aws-lumberyard-dev/MultiplayerComponents
...
Some cleanup to better support backward reconciliation as well as dynamic player spawning on connect
2021-05-13 07:46:21 -07:00
amzn-sean
7f79cc8796
RemoveSimulatedBody automatically updates the requested handle to be invalid once removed. ( #740 )
2021-05-13 15:04:00 +01:00
Hasareej
a13c9e8d53
Hasareej lyn 2301 cluster space ( #717 )
...
ViewportUi widget anchoring & alignment update.
2021-05-13 14:23:31 +01:00
greerdv
2ef0e70fff
Merge pull request #730 from aws-lumberyard-dev/non-uniform-scale-compatibility
...
update compatibility for non-uniform scale service
2021-05-13 13:42:01 +01:00
igarri
d7ca3f273b
croll to top on view when the filter updates
2021-05-13 13:25:03 +01:00
igarri
d6868df735
Expanding TableView Columns
2021-05-13 12:29:16 +01:00
amzn-sean
d690c3fee4
static rigid body and rigid body component use Handles instead of pointers ( #662 )
2021-05-13 11:59:22 +01:00
jjjoness
26b8181cc1
Merge branch 'main' into LYN-1099
2021-05-13 09:18:13 +01:00
guthadam
d85e0500d5
PR feedback
2021-05-13 00:55:29 -05:00
guthadam
488e3b5da5
Merge branch 'main' into Atom/guthadam/ATOM-15223
2021-05-13 00:33:28 -05:00
karlberg
c0d9a3c423
Fix for clang not being lazy about template expansion
2021-05-12 20:55:03 -07:00
karlberg
cb8016bde5
Fix for validator failing on empty files
2021-05-12 20:52:02 -07:00
karlberg
601dd30452
Various build and test fixes
2021-05-12 20:41:53 -07:00
karlberg
eea0660d21
A couple more fixes
2021-05-12 20:26:08 -07:00
karlberg
e772265871
Build fixes for gem reorganization
2021-05-12 20:09:27 -07:00
Peng
5df2601428
Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2
2021-05-12 19:14:09 -07:00
mrieggeramzn
112f0d3448
Merge pull request #731 from aws-lumberyard-dev/Atom/mriegger/ATOM-14271
...
Fix for Decal Feature Processor not using async loading correctly
2021-05-12 18:04:06 -07:00
Peng
408ad06fd2
Merge branch 'main' of https://github.com/aws-lumberyard-dev/o3de into ATOM/tonypeng/ATOM-15266-2
2021-05-12 17:52:06 -07:00
Peng
1fe81c1533
ATOM-15266 added location in the assert message where the descriptor set will be re-created
2021-05-12 17:51:30 -07:00
Amzn-Catdo
8101b60f5d
Merge pull request #689 from aws-lumberyard-dev/Prefab/Automation/Tests
...
Prefab/automation/tests
2021-05-12 17:05:10 -07:00
mnaumov
ef8f9c82a0
Merge from main
2021-05-12 16:37:32 -07:00
catdo
7633ec9a83
removed spacings in CMakeList and removed the tags.txt file in the prefab level
2021-05-12 16:27:51 -07:00
SSpalding
67c3801d73
Log monitor encoding fix ( #729 )
...
Fixed log monitor encoding bug.
2021-05-12 16:15:18 -07:00
karlberg
8bb425709b
unit test fix
2021-05-12 16:04:44 -07:00
karlberg
254ad165c1
A bunch of work to get external multiplayer components to actually work
2021-05-12 16:01:59 -07:00
mriegger
9b1f4c04e6
Removing the old hack code
2021-05-12 14:54:33 -07:00
zsolleci
ef775da89c
merging latest pull
2021-05-12 16:40:52 -05:00
catdo
a19599d96b
Merge branch 'main' into Prefab/Automation/Tests
2021-05-12 14:39:03 -07:00