aab4b4a126
Merge pull request #737 from aws-lumberyard-dev/Atom/mriegger/ATOM-15529
...
Making shadow res of 1024 and bicubic pcf the default
2021-05-18 09:13:49 -07:00
275fbc714d
Merge branch 'aws-lumberyard:main' into cherry-pick_fix_ATOM14976_to_main
2021-05-17 10:32:06 -05:00
05fec17ebd
Remove hardcoded paths to Atom gems in registration.py and clean up gem.json files
2021-05-14 10:35:50 -07:00
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
183790bf79
materials need properties updated to match changes with standardpbr materialType
2021-05-13 16:41:32 -05:00
49084d250f
updating material files
2021-05-13 16:40:51 -05:00
42d47ca5fc
New geometry and texture replacement for the Standford Lucy assets.
2021-05-13 16:28:48 -05:00
124ca1618a
Making shadow res of 1024 and bicubic pcf the default
2021-05-12 20:51:56 -07:00
655d71e0dd
update compatibility of atom components with NonUniformScaleService
2021-05-12 22:16:14 +01:00
7342e62680
Hiding "Open Material" when material asset is assigned
2021-05-11 19:33:46 -07:00
ff9d8f7a87
Merge pull request #660 from aws-lumberyard-dev/Atom/guthadam/ATOM-15486
...
ATOM-15486 Material Editor: Implement layout and user settings
2021-05-11 13:09:39 -05:00
7957d3f8b6
Merge branch 'main' into pruiksma/ATOM-15515
2021-05-10 19:45:09 -05:00
d7c72a249c
Merge pull request #395 from aws-lumberyard-dev/Atom/mriegger/PLS
...
Atom/mriegger/pls
2021-05-10 17:13:39 -07:00
e37b3989be
ATOM-15515 Fixing nullptr reference in OnShapeChanged() when visibility is turned back on for shapeless punctual light types.
2021-05-10 15:31:33 -05:00
1dda6dabe4
Added support for expanding/collapsing material inspector groups by name
...
Saving/restoring material inspector group expansion state
2021-05-08 00:57:16 -05:00
9de3071e21
Merge branch 'main' into Atom/guthadam/ATOM-15486
2021-05-07 20:20:17 -05:00
e9165ed911
Added save state keys to most of the RPEs in the material editor and component to save expand/collapse state
...
Saving main window fancy docking state so all of the dock widgets save/restore visibly and positioning
Added window decoration wrapper inside material editor main window for saving/restoring window position, size, state
Added object names to several QT widgets so that their state could be captured and restored
2021-05-07 20:16:05 -05:00
1df2fe1d48
Merging latest origin
2021-05-07 16:28:11 -07:00
4d56debe0f
Merge pull request #632 from aws-lumberyard-dev/Atom/mriegger/heatmap
...
Atom/mriegger/heatmap
2021-05-07 09:43:53 -07:00
8afb35cb10
Merge pull request #633 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15063
...
[ATOM-15063] Toggling visibility on a reflection probe does not disable rendering
2021-05-06 20:54:56 -07:00
4cf9af6c06
Released probe handle when deactivating the controller
2021-05-06 19:47:35 -07:00
c21b4a577d
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-06 19:40:09 -07:00
a2ce67a0e7
remove tabs2
2021-05-06 18:10:15 -07:00
e3cca11ed3
Fix for heatmap not disabling
2021-05-06 18:01:28 -07:00
751d13dd7b
Merge remote-tracking branch 'origin' into MultiplayerComponents
2021-05-05 20:07:49 -07:00
26ab8c8a25
merging from main
2021-05-05 19:07:04 +01:00
c58089d35a
Merge branch 'main' into Atom/mriegger/PLS
2021-05-04 15:57:20 -07:00
6890cf907d
Merge pull request #537 from aws-lumberyard-dev/Atom/dmcdiar/LYN-3256
...
[LYN-3256] Atom: Baking Reflection Probe crashes the Editor when Prefabs are enabled
2021-05-04 14:05:11 -07:00
39a356f823
Merge pull request #536 from aws-lumberyard-dev/Atom/guthadam/ATOM-15451
...
ATOM-15451 always bring material editor into foreground when launching
2021-05-04 14:20:38 -05:00
e9a8fdda72
Merge pull request #512 from aws-lumberyard-dev/AtomDebugDisplayFixes
...
Atom debug display fixes to work in GameMode
2021-05-04 11:35:42 -05:00
6b1f0c53a5
Injecting --activateWindow every time new process sends command line
...
Updated comments
2021-05-04 10:30:27 -05:00
e63aa4f704
Merge branch 'main' into Atom/dmcdiar/LYN-3256
2021-05-04 01:25:09 -07:00
64f42ba1cb
Removed the asset callback from the EditorReflectionProbeComponent, since the component may have been destroyed and recreated between the bake and the asset load.
...
Replaced with an OnTick handler that polls the ReflectionProbeFeatureProcessor to determine when the asset is ready.
2021-05-04 01:24:14 -07:00
80f692118b
ATOM-15451 always bring material editor and foreground when launching
...
Bus, command line option, and handler to activate material editor window
Made sure that material editor action in Ly tools menu is not checked/checkable
Ly editor pushes command line option to use the same RHI
https://jira.agscollab.com/browse/LYN-2610
https://jira.agscollab.com/browse/ATOM-15451
https://jira.agscollab.com/browse/ATOM-13742
2021-05-04 01:27:12 -05:00
d0a561fa01
merging latest origin
2021-05-03 21:27:27 -07:00
822368ef01
Changes to get visibility system working again in-game
2021-05-03 16:26:11 -07:00
55f2b24302
Legacy Mesh component removal
...
* Removed legacy components
* More legacy render component removal
* Starting removal of legacy mesh component dependencies
* Removed old light components that were allowing Atom test to succeed
* Testing increasing the timeout to see if it lets it pass in Jenkins
* put original timeout back
* reordered components to test if it is component specific or not
* Testing disabiling the test to see if we get a green
* Fixed the removal of the test to sandbox
* Removed Legacy Mesh Component and associated tendrils
* Removed some missed references
* Fixed some issues with unity builds and ambiguous naming
* Addressed review feedback
2021-05-03 17:17:18 -05:00
eb25e0bd33
Merge pull request #504 from aws-lumberyard-dev/Atom/guthadam/ATOM-15439
...
ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools
2021-05-03 15:32:28 -05:00
18b94601ed
Merge remote-tracking branch 'upstream/main' into AtomDebugDisplayFixes
2021-05-03 15:07:38 -05:00
d115c89043
Fixes for using the DebugDisplayRequestBus in game mode
2021-05-03 11:48:48 -05:00
9d0f9e9e3a
ATOM-14065 fix problems with material editor details group property descriptions
...
Moved the code that automatically appended a script variable name to a property description out of the dynamic property class and into the material property conversion utility functions.
Added proper descriptions for the material type and parent material placeholder properties
https://jira.agscollab.com/browse/ATOM-14065
2021-05-03 00:13:45 -05:00
fae33e9235
ATOM-15439 Implement basic local socket and server for IPC in material editor and other tools
...
This replaces grid hub usage in the material editor. It allows material editor and other tools to intercommunicate on the local host. This will allow enforcing that there is only one instance of the material editor running. Opening a second instance will forward command line options to the first instance running a local server.
https://jira.agscollab.com/browse/ATOM-15439
https://jira.agscollab.com/browse/ATOM-13742
2021-05-02 17:08:21 -05:00
dd3f032480
Merge pull request #488 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-14933
...
[ATOM-14933] Reflection probes do not show mesh reflections if the entity's transform is scaled up
2021-04-30 16:33:15 -07:00
78efa810e0
Fixed debug draw scale
2021-04-30 12:54:15 -07:00
cff730b4b8
Merge branch 'main' into Atom/mriegger/PLS
2021-04-30 11:46:08 -07:00
738883a9b0
Kens feedback
2021-04-30 11:43:32 -07:00
0e8e33dedf
Merge branch 'main' into Atom/dmcdiar/ATOM-14933
2021-04-30 00:36:13 -07:00
ce367b4383
Fixing missing asset crashing Editor
2021-04-29 21:57:34 -07:00
ef79dfb359
Added scale handling to the ReflectionProbe
2021-04-29 13:10:07 -07:00
7f423f16a1
Merge pull request #412 from aws-lumberyard-dev/pruiksma/ATOM-15380
...
[ATOM-15380] Cherry picking changes from 1.0 - cfdb70978868aa5d0040d3b79994a26e9f82ca39
2021-04-29 12:58:47 -05:00
mrieggeramzn
Jonny Galloway
amzn-sj
AMZN-mnaumov
mriegger
greerdv
mnaumov
Guthrie Adams
pruiksma
guthadam
karlberg
dmcdiarmid-ly
dmcdiar
Michael Riegger
rgba16f
Terry Michaels