5f33337fec
Merge main
2021-04-27 11:05:22 -07:00
fdcb19f45a
Reverting some unused code
2021-04-26 17:48:49 -07:00
91f027a05c
PR feedback
2021-04-26 17:42:49 -07:00
61fe298319
Merge pull request #197 from aws-lumberyard-dev/filesEndInNewlines
...
Add newlines to the end of all files
2021-04-23 12:11:40 -07:00
28170ffe41
Add newlines to the end of all files
2021-04-23 09:43:40 -07:00
fb2ca8e02c
Fix Editor crash in test teardown calling set_view_pane_layout
...
If Atom isn't initialized and able to produce a ViewportContext, the Editor would crash. This attempts to make the initialization fail a bit more gracefully and fixes the crash in the cases I've tested.
2021-04-23 00:26:09 -07:00
09a0676b9c
Adding custom title to PropertyAssetCtrl
2021-04-22 16:56:56 -07:00
62d2971103
Merge pull request #227 from aws-lumberyard-dev/Atom/guthadam/ATOM-15221_cherrypick
...
Cherry picking material editor error message box trace reporting from 1.0 to main
2021-04-22 09:41:07 -05:00
215931a1ae
Updating trace recorder to allow limiting the number of messages stored
2021-04-21 19:45:53 -05:00
0e6fea21fc
ATOM-15221 Material Editor: Capturing trace warnings and errors to display in error message boxes
...
https://jira.agscollab.com/browse/ATOM-15221
2021-04-21 19:45:19 -05:00
af00191e82
merge from main
2021-04-21 15:21:03 -07:00
f4a57663fa
Merge pull request #142 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15222
...
[ATOM-15222] Adding "Create New Material" context menu option to folder in Materia…
2021-04-20 11:38:34 -07:00
d1ba2155c5
PR feedback
2021-04-19 15:55:58 -07:00
2cd2550771
Merge pull request #124 from aws-lumberyard-dev/Atom/guthadam/ATOM-5921
...
ATOM-5921 Material Editor: Select newly created materials in the asset browser
2021-04-19 17:53:15 -05:00
34be0cd4b5
Fixing string search
2021-04-19 15:31:45 -07:00
6abf17439a
Adding "Create New Material" context menu option to folder in Material Editor
...
Improving MaterialBrowser filter to show empty folders
2021-04-19 15:22:32 -07:00
3b4e424d38
Merge pull request #126 from aws-lumberyard-dev/Atom/guthadam/ATOM-13950
...
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
2021-04-19 14:46:11 -05:00
dc7cc77be6
Merge pull request #123 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15269
...
[ATOM-15269] disabling source control thumbnails in material editor
2021-04-19 10:57:03 -07:00
8fead27c45
ATOM-13950 Material Editor: Removing auto select option from lighting and model presets
...
Remove option from presets
Updated code to select current default options
Will data drive default options with editor settings or settings registry in upcoming tasks
https://jira.agscollab.com/browse/ATOM-13950
2021-04-18 12:12:32 -05:00
d614b357e5
ATOM-5921 Material Editor: Select newly created materials in the asset browser
...
The code was previously using asset browser notifications to listen for new files being added in order to select newly created materials.
Attempting to change the selection within the notification failed because the new entry still had not been added.
Now the material browser queues and processes the selection on tick.
https://jira.agscollab.com/browse/ATOM-5921
2021-04-16 22:11:01 -05:00
b3cc14dd5c
disabling source control thumbnails in material editor
2021-04-16 18:59:21 -07:00
db9b0f141f
Double click launches Material Editor
2021-04-16 16:13:39 -07:00
c05b83915c
Merge pull request #115 from aws-lumberyard-dev/Atom/guthadam/ATOM-15267
...
[ATOM-15267] Material Editor: Create material dialog respects default standard PBR selection
2021-04-16 17:30:37 -05:00
b8b90c42e2
Merge pull request #52 from aws-lumberyard-dev/Atom/mnaumov/ATOM-15236
...
[ATOM-15236] Fixing camera panning and zooming
2021-04-16 15:10:47 -07:00
854167c68e
Ensure default material selection works when dialog is opened
...
https://jira.agscollab.com/browse/ATOM-15267
2021-04-16 14:53:31 -05:00
c5c7332642
Merge pull request #92 from aws-lumberyard-dev/Atom/mnaumov/ATOM-14101
...
[ATOM-14101] Adding "copy name" and "copy path" to Material Editor
2021-04-16 12:23:03 -07:00
e0b66223e4
Merge branch 'main' into Atom/guthadam/material_dialog_button_and_modality_fixes
2021-04-16 11:25:59 -05:00
d3520ddcf1
Adding "copy name" and "copy path" to Material Editor
2021-04-15 17:59:09 -07:00
2baa0db2de
Standardizing dialog button boxes across material editor and component
...
Making dialogs modal
https://jira.agscollab.com/browse/ATOM-15173
https://jira.agscollab.com/browse/ATOM-15174
2021-04-15 12:38:07 -05:00
fa7f61cf0d
ATOM-13791 Editor: ImGui profiling tools doesn't work correctly due to disabled RenderPipelines
...
- Added pause/resume button to ImGui Profiler to pause/resume profiling
- Added showing pass execution timeline
- Change TimestampResult to include both begin tick and duration tick. Update some function names of TimestampResult.
- Update some functions names in Pass.
- Stop showing accumulated time for ParentPass.
- Fixed a crash issue with ImGuiManager which doesn't have default font.
2021-04-14 22:48:46 -07:00
28ccb5d381
Fixing camera panning and zooming
2021-04-14 12:17:45 -07:00
8469c9ca0a
Integrating github/staging through commit 5f214be
2021-04-13 17:18:57 -07:00
1044dc3da1
Integrating github/staging through commit ab87ed9
2021-04-09 11:27:37 -07:00
36c4e827bd
Integrating latest from github/staging
...
Integrating up through commit 5e1bdae
2021-03-26 14:32:02 -07:00
75dc720198
Integrating latest 47acbe8
2021-03-25 13:57:57 -07:00
a10351f38d
Initial commit
2021-03-08 14:30:57 -08:00
mnaumov
Chris Burel
nvsickle
Guthrie Adams
guthadam
AMZN-mnaumov
qingtao
alexpete