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
02d88bc8da
Merge pull request #676 from aws-lumberyard-dev/pruiksma/ATOM-15515
...
ATOM-15515 Fixing nullptr reference in OnShapeChanged() in light delegates.
2021-05-11 11:02:52 -05:00
27d6e5b848
formatting tidy up
2021-05-11 11:41:33 +01:00
619f71cc19
fixing some bugs with debug draw not taking entity scale into account
2021-05-11 11:39:14 +01:00
793af49457
Merge branch 'main' into debug_draw_transform
2021-05-11 09:50:51 +01:00
8ddfcabae7
Removed unneeded comments ( #673 )
2021-05-10 22:02:30 -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
fb6c6e2468
Merge branch 'main' into debug_draw_transform
2021-05-10 22:02:27 +01:00
45055ab3cc
applying debug draw transform stack to DrawLines and DrawTriangles
2021-05-10 22:01:41 +01: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
43b474a4b2
O3de updates restricted download ( #229 )
...
* fix project centric set current
* Adding newline to project.json template
* Adding newline to engine.json
* Changed register -this-engine to be data driven
* adding build server support
* fix log dir
* fix add remove
* fix template creation for restricted
* fix typos and descriptions
* Add newline to the end of template.json
* Adding newline to the end of assets_scan_folders.seteg
* current_project in global project that creates/edits the .o3de/Registry/bootstrap.setreg
* fix the build server flags
* fix the o3de manifest server portion
* disable project manager tests for now. Its changed too much and lytestools is not working at the moment. I will get back to this later.
* fix the Mac build config
* disable project_test, this is the project manager. It has changed too much for these tests to work at the moment. I'll get back to them
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-05-10 12:03:36 -07:00
bdaa7eb3c1
Merge pull request #544 from aws-lumberyard-dev/MultiplayerComponents
...
Multiplayer components, visibility fixes for gameplay runtime and localprediction player controller component.
2021-05-10 10:23:15 -07:00
8706733be3
Merge branch 'main' into Atom/guthadam/ATOM-15486
2021-05-10 11:29:15 -05:00
440c40e490
Remove (almost) all references to pRenderer ( #651 )
...
Remove all references to pRenderer, except from the DebugDraw and LyShine Gems that are still being updated.
2021-05-10 10:05:15 -06: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
0c7be7ceff
Reenable NvCloth atom automated tests in AutomatedTesting project
...
- Added NvCloth gem to AutomatedTesting project.
- Fixed cloth test levels using atom components.
- Updated and enabled cloth tests. They are marked as xfail for now until they properly work with atom null renderer.
- Fixed crash when runnnig editor with null renderer on a level with Actor component.
- Improved chicken asset and slice used in NvCloth gem.
2021-05-07 11:31:34 +01: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
066a1eddf5
Moved null check before setting the status to "initializing". Otherwise, if the first call to InitFont() is with a null render scene, the status will get stuck in initializing forever and fonts will never render. This does NOT fix the text being drawn in the wrong location, that's a separate bug.
2021-05-06 13:42:52 -05: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
790657f8c0
Merge pull request #526 from aws-lumberyard-dev/Atom/olexl/ATOM-15349
...
Deleted AzFramework::AtomActiveInterface
2021-05-04 13:44:04 -04: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
4c47d7b587
Merged main in
2021-05-04 10:13:50 -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
03c219bd2d
Removed unused code
2021-05-03 21:31:06 -05: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
64d980bc03
Deleted AzFramework::AtomActiveInterface
2021-05-03 15:40:32 -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
1a712857d9
Delete a mistakenly commited .orig file
2021-05-03 15:22:04 -05:00
b100260633
Merge pull request #505 from aws-lumberyard-dev/Atom/guthadam/ATOM-14065
...
ATOM-14065 fix problems with material editor details group property descriptions
2021-05-03 15:12:55 -05:00
18b94601ed
Merge remote-tracking branch 'upstream/main' into AtomDebugDisplayFixes
2021-05-03 15:07:38 -05:00
83e0691243
Added some comments to clarify the role of the default instance
2021-05-03 14:58:15 -05:00
2e4545d289
Fix iOS Crash
2021-05-03 10:01:20 -07:00
Guthrie Adams
Ken Pruiksma
greerdv
Terry Michaels
mrieggeramzn
Colin Byrne
kberg-amzn
guthadam
bosnichd
karlberg
Aaron Ruiz Mora
dmcdiarmid-ly
dmcdiar
mriegger
mbalfour
Michael Riegger
Olex Lozitskiy
rgba16f
amzn-sj