76d959dccf
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 14:49:23 -07:00
30f8c75613
Merge pull request #1908 from aws-lumberyard-dev/cgalvan/FixLegacyCryIcons
...
Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
2021-07-07 16:39:46 -05:00
80bdd4e17b
Clang compile fixes ( #1876 )
...
* Fix compile error from -Wwritable-strings
Signed-off-by: Chris Burel <burelc@amazon.com >
* Fix flags used to build MaskedOcclusionCulling with clang
Signed-off-by: Chris Burel <burelc@amazon.com >
* Fix class that has a final destructor, but the class itself was not final
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-07-07 14:34:45 -07:00
af8e6afc6a
Update README LFS instructions ( #1925 )
...
Signed-off-by: AMZN-alexpete <26804013+AMZN-alexpete@users.noreply.github.com >
2021-07-07 14:31:45 -07:00
274669a1b4
Fixed Vegetation Debugger to work with Atom rendering and AZ::Console. ( #1924 )
...
The previous implementation used Cry rendering and CVars and had been left in a commented-out state. These changes restore it back to full functionality.
Signed-off-by: mbalfour <mbalfour@amazon.com >
2021-07-07 16:05:38 -05:00
24d21cadae
Merge pull request #1475 from aws-lumberyard-dev/nvsickle/ViewportInfoDpiScaling
...
Make IMGUI & viewport info scale with DPI
2021-07-07 15:55:46 -05:00
dae2ddaec2
fix for [LYN-4828], message box style changes ( #1911 )
...
* fix for [LYN-4828], message box style changes
Signed-off-by: Alex Montgomery <alexmont@amazon.com >
* now with missing .qss file! Friends don't let friends git add -u
Signed-off-by: Alex Montgomery <alexmont@amazon.com >
2021-07-07 13:49:55 -07:00
2dce2eee2d
The Great ScriptCanvas Purge, Part X
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-07 13:43:31 -07:00
4c12e9c5ab
Refactoring the LTC quad and polygon lights ( #1881 )
...
* Refactoring the LTC quad and polygon lights to clip the light to the normal hemisphere before applying the LTC matrix. This prevents specular light leaking from behind the surface. Diffuse and specular contribution are now calculated at the same time to avoid clipping the polygon twice. Added a cheaper diffuse integration function that's accurate enough for diffuse. Also added a commented out alternate specular integration for platforms with poor acos() accuracy.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* PR review feedback - typo and some saturate() protection
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
* Making branch more explicit from review feedback.
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-07 16:37:49 -04:00
14cab097c7
Fix DPI change callback not being wired up correctly.
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 13:19:51 -07:00
ca4156e1c0
Fixed template.json file name replacements.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-07 14:02:46 -05:00
dee591921e
Fix exception bubble-up
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:25 -07:00
3549e5b946
More fussing with logs
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:24 -07:00
3ee15f1912
Try to get some actual log output out of this
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:22 -07:00
0b3dab1cf8
Use DPI scaling for viewport info padding
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:20 -07:00
2fefa80937
Use AZ::DynamicModuleHandle
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:18 -07:00
21dbe8b48f
Address review feedback
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:16 -07:00
dd20a598b2
Add DPI scaling to IMGUI
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:15 -07:00
0c97888d0f
Revert accidental change
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:13 -07:00
9e4d6a1d85
Scale the viewport debug info overlay by the DPI scale factor
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:11 -07:00
b328cdf11d
Make the launcher's lack of DPI awareness on Windows explicit
...
This will enable per-screen DPI awareness to be turned on later
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:10 -07:00
6b76eceb1f
Add GetDpiScaleFactor to native window API
...
-This includes implementations of the API for the Editor and Windows, all other platforms will have a 1.0 scale for now
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:08 -07:00
da529edfb5
Fix ImGui not rendering correctly at resolutions greater than 1080p
...
Signed-off-by: nvsickle <nvsickle@amazon.com >
2021-07-07 11:51:06 -07:00
7aaf265926
The Great ScriptCanvas Purge, Part IX
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-07 11:48:54 -07:00
26d8a62074
Merge pull request #1914 from aws-lumberyard-dev/cgalvan/FixLuaEditorSettings
...
Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
2021-07-07 13:41:25 -05:00
02922806a5
Updated gem.json for all top-level Gems. ( #1715 ) ( #1917 )
...
* Updated gem.json for all top-level Gems. All the top level gems now have identical gem.json formats based on the DefautlGem template gem.json. Two additional fields have been added, a type: field and a requirements: field. These fields are for display in Project Mananger. All gem.json files have a default requirements: value of None. Devs are responsible for providing requirements. Gem descriptions and tags have been signed off by developers.
Signed-off-by: Cronin <mikecro@amazon.com >
* Fixed minor formatting issues with RADTelemetry gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to QtForPython gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the Twitch gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to AWSCore gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the AtomTressFX gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the AudioEngineWwise gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CertificateManager gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in summary of CrashReporting gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the CustomAssetExample gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitespace in editorPythonBindings gem summary
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ScriptedEntityTweener gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the Gestures gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Removing extra whitetspace in the summary of the GameStateSamples gem
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Adding newline to the end of the ExpressionEvaluation gem.json
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the ProjectManager PythonBindings.cpp code to reference the
newer fields in the gem.json files
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updating the Gem and Project templates gem.json files to include the
"type" and the "requirements" field.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Updated the default "requirments" field value to be empty string instead
of "None"
This works better with the ProjectManager GemInfoFromPath function.
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Correcting "summary" field name
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
* Added the requirements text to the AudioEngineWwise Gem
This gem requires downloading the Wwise 3rdParty library from AudioKinetic's website
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
Co-authored-by: Mike Cronin <58789750+micronAMZN@users.noreply.github.com >
2021-07-07 13:29:33 -05:00
b9f70412c4
Moving flaky test test_WindowsAndMac_ComparisonOperations_Success to sandbox test suite ( #1750 )
...
Signed-off-by: sharmajs <sharmajs@amazon.com >
2021-07-07 11:16:14 -07:00
27577a2e49
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-07 10:45:38 -07:00
29652994d8
The Great ScriptCanvas Purge, Part VIII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-07 10:45:16 -07:00
91656ded9f
Ensured EditContext is created for the legacy tools framework application (Lua) so that settings are able to be displayed
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-07 11:58:41 -05:00
635473e5cf
[LYN-4990] Fixed legacy launcher/mac/ios icons and removed some remaining unused Editor icons.
...
Signed-off-by: Chris Galvan <chgalvan@amazon.com >
2021-07-07 11:29:18 -05:00
da26231a65
Merge pull request #1882 from aws-lumberyard-dev/pruiksma/fix_punctual_light_unhiding_transform
...
Fixing simple light types appearing back at 0,0,0 after hiding/unhiding.
2021-07-07 09:13:51 -07:00
2ab2503337
Revert "[MeshOptimizer] Determine the original vertex index based on the position ( #1562 )" ( #1902 )
...
This reverts commit ef1f95f1d0jillich@amazon.com >
2021-07-07 14:28:53 +02:00
23c0440371
tick system while in track view batch render. ( #1899 )
...
As the batch render will disable Editor idle processing which handles the tick.
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-07 12:39:01 +01:00
e9ceee9b32
Merge pull request #1879 from aws-lumberyard-dev/MultiplayerPlayerPrefabBug_LYN-4989
...
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem…
2021-07-07 10:31:45 +01:00
ef1f95f1d0
[MeshOptimizer] Determine the original vertex index based on the position ( #1562 )
...
* Determine the original vertex index based on the position
The Assimp library does not expose the FBX control point indices. This
change causes vertices that are close enough in their position to be
considered as coming from the same control point. This allows the mesh
optimizer to consider vertices with the same control point index (or
"original vertex index" as it is called in the code) for deduplication.
Signed-off-by: Chris Burel <burelc@amazon.com >
* Use a filter view instead of reimplementing a filter view
Signed-off-by: Chris Burel <burelc@amazon.com >
* Don't attempt to weld similar vertices if there's blendshapes
Signed-off-by: Chris Burel <burelc@amazon.com >
* Add test for the mesh optimizer's ability to weld nearby vertices
Signed-off-by: Chris Burel <burelc@amazon.com >
* Add logging call to show mesh optimizer effect on vertex count
Signed-off-by: Chris Burel <burelc@amazon.com >
* Use a bunch of temporaries in order to make `position` `const`
Signed-off-by: Chris Burel <burelc@amazon.com >
2021-07-07 11:21:09 +02:00
75933ff7fd
The Great ScriptCanvas Purge, Part VII
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 21:03:31 -07:00
93e91f9c23
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-06 19:29:57 -07:00
65ad412f3e
The Great ScriptCanvas Purge, Part VI
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 19:27:58 -07:00
8592e4fbbe
Added if checks in the get_project* and get_engine* function to protect against None being returned from get_project_json_data and get_engine_json_data respectively ( #1880 )
...
Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com >
2021-07-06 20:42:09 -05:00
aca8a730a6
Fixing simple light types appearing back at 0,0,0 after hiding/unhiding.
...
Signed-off-by: Ken Pruiksma <pruiksma@amazon.com >
2021-07-06 19:42:12 -05:00
4a42c32a4b
LYN-4989 Fixed player spawnable index. Build fix for ScriptCanvas gem when Profiling is on
...
Signed-off-by: pereslav <pereslav@amazon.com >
2021-07-07 00:12:30 +01:00
0a910a31aa
The Great ScriptCanvas Purge, Part V
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 15:05:37 -07:00
360236b89e
The Great ScriptCanvas Purge, Part IV
...
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com >
2021-07-06 13:13:16 -07:00
71c6b3e506
Refresh cached transforms before saving. ( #1858 )
...
If the prefab template saves default values for a cached transform, but *shouldn't* have default values, it will get patch application errors at runtime due to missing cached transform fields.
Signed-off-by: mbalfour <mbalfour@amazon.com >
2021-07-06 14:17:21 -05:00
5fdb33b1d7
o3de stabilization/2106 - update licenses ( #1661 )
...
Not to be committed before 7/6/2021
Signed-off-by: lawsonamzn <70027408+lawsonamzn@users.noreply.github.com >
2021-07-06 08:05:11 -07:00
fa7accf2dc
Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into carlitosan/thecleansing
2021-07-06 07:27:29 -07:00
827805ed83
fix C12712452 - re-link script canvas to correct entities ( #1855 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-06 12:28:24 +01:00
636ff587c3
Shape casts correctly report positions of colliders that intersect or in contact of the initial pose ( #1848 )
...
Signed-off-by: amzn-sean <75276488+amzn-sean@users.noreply.github.com >
2021-07-05 18:06:20 +01:00
049469463e
[LYN-4439] Added tags to gem item delegate ( #1853 )
...
* Added new helper function to draw the feature tags below the summary for each gem item.
* In case no feature tags belong to a gem, the available space will be used by the summary.
Signed-off-by: Benjamin Jillich <jillich@amazon.com >
2021-07-05 18:34:41 +02:00
chcurran
Chris Galvan
Chris Burel
Alex Peterson
Mike Balfour
Terry Michaels
alexmontAmazon
Ken Pruiksma
nvsickle
lumberyard-employee-dm
sharmajs-amzn
Jon B
Benjamin Jillich
amzn-sean
SergeyAMZN
pereslav
Nicholas Lawson