diff options
| -rw-r--r-- | .mailmap | 3 | ||||
| -rw-r--r-- | AUTHORS.md | 9 | ||||
| -rw-r--r-- | DONORS.md | 152 | ||||
| -rw-r--r-- | modules/gdscript/editor/script_templates/EditorScenePostImport/basic_import_script.gd | 4 | ||||
| -rw-r--r-- | modules/mono/editor/script_templates/EditorScenePostImport/basic_import_script.cs | 8 | ||||
| -rw-r--r-- | modules/mono/editor/script_templates/EditorScenePostImport/no_comments.cs | 4 | ||||
| -rw-r--r-- | servers/rendering/renderer_rd/shaders/effects/tonemap.glsl | 9 |
7 files changed, 88 insertions, 101 deletions
@@ -36,6 +36,7 @@ Eveline Jarosz <marqin.pl@gmail.com> <marqin.pl+git@gmail.com> Fabian <supagu@gmail.com> Ferenc Arn <tagcup@yahoo.com> Ferenc Arn <tagcup@yahoo.com> <tagcup@users.noreply.github.com> +FireForge <67974470+fire-forge@users.noreply.github.com> <isaacr.7.2005@gmail.com> foxydevloper <12120644+foxydevloper@users.noreply.github.com> Fredia Huya-Kouadio <fhuyakou@gmail.com> Fredia Huya-Kouadio <fhuyakou@gmail.com> <fhuya@google.com> @@ -56,6 +57,7 @@ Ignacio Etcheverry <ignalfonsore@gmail.com> <neikeq@users.noreply.github.com> Ilaria Cislaghi <cislaghi.ilaria@gmail.com> Ilaria Cislaghi <cislaghi.ilaria@gmail.com> <ilaria.cislaghi@simedis.com> Indah Sylvia <ISylvox@yahoo.com> +iwek <miwanczuk7@gmail.com> J08nY <johny@neuromancer.sk> <jancar.jj@gmail.com> J08nY <johny@neuromancer.sk> <J08nY@users.noreply.github.com> Jake Young <young9003@gmail.com> @@ -143,6 +145,7 @@ Wilhem Barbier <nounoursheureux@openmailbox.org> <schtroumps31@gmail.com> Will Nations <willnationsdev@gmail.com> yg2f <yoann@terminajones.com> Yuri Sizov <yuris@humnom.net> <pycbouh@users.noreply.github.com> +Yuri Sizov <yuris@humnom.net> <yaschik4ilicha@gmail.com> Zae <zaevi@live.com> Zak Stam <zakscomputers@hotmail.com> Zher Huei Lee <lee.zh.92@gmail.com> diff --git a/AUTHORS.md b/AUTHORS.md index 4d52e3d1e0..36be7c4501 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -60,6 +60,7 @@ name is available. Carter Anderson (cart) Chris Bradfield (cbscribe) Clay John (clayjohn) + ConteZero Dana Olson (adolson) Daniel J. Ramirez (djrm) Daniel Rakos (aqnuep) @@ -86,6 +87,7 @@ name is available. Fabio Alessandrelli (Faless) fabriceci Ferenc Arn (tagcup) + FireForge (fire-forge) follower foxydevloper François Belair (Razoric480) @@ -109,6 +111,7 @@ name is available. Ian Bishop (ianb96) Ibrahn Sahir (ibrahn) Ignacio Etcheverry (neikeq) + Igor Kordiukiewicz (IgorKordiukiewicz) Ilaria Cislaghi (QbieShay) Indah Sylvia (ISylvox) J08nY @@ -150,6 +153,7 @@ name is available. Mariano Javier Suligoy (MarianoGnu) Mario Schlack (hurikhan) Marios Staikopoulos (marstaik) + Mark Riedesel (klowner) Markus Sauermann (Sauermann) Martin Capitanio (capnm) Martin Liška (marxin) @@ -163,6 +167,7 @@ name is available. merumelu Meru Patel (Janglee123) Michael Alexsander (YeldhamDev) + Michał Iwańczuk (iwek7) MichiRecRoom (LikeLakers2) Morris "Tabor" Arroad (mortarroad) mrezai @@ -182,6 +187,7 @@ name is available. Paul Batty (Paulb23) Paul Joannon (paulloz) Paul Trojahn (ptrojahn) + Paweł Fertyk (pfertyk) Pawel Kowal (pkowal1982) Pawel Lampe (Scony) Pedro J. Estébanez (RandomShaper) @@ -212,6 +218,7 @@ name is available. Shiqing (kawa-yoiko) Silc 'Tokage' Renew (TokageItLab) Simon Wenner (swenner) + smix8 Stijn Hinlopen (hinlopen) Swarnim Arun (minraws) TC (floppyhammer) @@ -234,7 +241,7 @@ name is available. Xavier Cho (mysticfall) yg2f (SuperUserNameMan) Yuri Rubinsky (Chaosus) - Yuri Sizov (pycbouh) + Yuri Sizov (YuriSizov) Zae Chao (zaevi) Zak Stam (zaksnet) Zher Huei Lee (leezh) @@ -26,7 +26,6 @@ generous deed immortalized in the next stable release of Godot Engine. ## Bronze sponsors - Ben Nolan Brandon Lamb Bri Daniel Kaplan @@ -36,6 +35,7 @@ generous deed immortalized in the next stable release of Godot Engine. Kitcat490 Kyle Szklenski Maxim Karsten + Nik Rudenko Moonwards <https://www.moonwards.com> TrampolineTales <https://trampolinetales.com> @@ -46,6 +46,7 @@ generous deed immortalized in the next stable release of Godot Engine. Andrew Bowen Andrew Dunai anti666 + Chris Bolton Christian Baune Christopher Montesano Christopher Shifflett @@ -53,15 +54,10 @@ generous deed immortalized in the next stable release of Godot Engine. Darrin Massena David Mydlarz Digital Grows - Dov Zimring Edward Flick Florian Neumann - Gamechuck GameDev.net Hein-Pieter van Braam - Jasper Brooks - Jeffery Chiu - John G Gentzel Jonah Stich Justin Arnold Justo Delgado Baudí @@ -105,10 +101,9 @@ generous deed immortalized in the next stable release of Godot Engine. David Snopek Ed Morley First Last - Florian Rämisch Hunter Jones Jacobus Dens - Jakub Grzesik + Jasper Brooks Javier Roman Joan Fons Jonathan Wright @@ -131,6 +126,7 @@ generous deed immortalized in the next stable release of Godot Engine. Sarksus Sean Sergey + Sergio Airaldi Sofox Stephan Kessler Stephen Molyneaux @@ -150,7 +146,6 @@ generous deed immortalized in the next stable release of Godot Engine. Alexander J Maynard Alex Khayrullin alice gambrell - Amar Šahinović Andrew Cunningham Andrew Farr Andriy @@ -158,8 +153,12 @@ generous deed immortalized in the next stable release of Godot Engine. Antoni Batchelli Arch Henderson III Arthur S. Muszynski + BasicIncomePlz + BoomHorseHat + BrizzleBrip c64cosmin Cameron Connolly + Charles Gray Charlie Whitfield Chase Taranto Chris Petrich @@ -171,20 +170,15 @@ generous deed immortalized in the next stable release of Godot Engine. CzechBlueBear D DagobertDick - dan didenko - Daniel Daniel Hernández Alcojor Daniel Tebbutt Darrian Little - Daylon + David Thomason + Daylon J Williams Dennis Belfrage - Dev To be curious - Dima Fedotov + Dev To Be curious Dimitri Nüscheler - Dmitriy Khudorozhkov Donn Eddy - Douglas Hammond - EerieExpanse Eric Brand Eugenio Hugo Salgüero Jáñez EXUREI @@ -192,13 +186,12 @@ generous deed immortalized in the next stable release of Godot Engine. flesk foxydevloper Fransiska - Freeman Gabrielius Vaiškūnas Gary Hulst - gavlig Geoffroy Warin - GGGames.org + George Venizelos gisora + GlassBrick GrayDwarf Guilherme Felipe de C. G. da Silva Harry Tumber @@ -208,6 +201,7 @@ generous deed immortalized in the next stable release of Godot Engine. Hu Hund Hunter Barabas HurrieCrane + Jaap Marsman Jamal Bencharki James Couzens Jan Sælid @@ -219,6 +213,7 @@ generous deed immortalized in the next stable release of Godot Engine. Jesús Chicharro Joel Fivat Johnathan Kupferer + John Stinson Josef Stumpfegger Jose Malheiro Jose Manuel Muñoz Perez @@ -227,23 +222,21 @@ generous deed immortalized in the next stable release of Godot Engine. Joshua Lesperance Juan Velandia Judd - Julián Absatz Julian Todd Juraj Móza JUSTIN CARROLL Kelteseth + Kevan + Khora kickmaniac kinfox - Kos Lakshaya Goel Laszlo Kiss leetNightshade Leo Fidel R Liban Liam Smyth LoparPanda - LordZaruflex Luca Vazzano - Luke MadScientistCarl Marcus Dobler Marcus Richter @@ -254,7 +247,6 @@ generous deed immortalized in the next stable release of Godot Engine. Martin Soucek matt Matt Greene - Matthew Hall Max Kryschi medecau Michael Dürwald @@ -271,11 +263,13 @@ generous deed immortalized in the next stable release of Godot Engine. Paul Hocker Paul Von Zimmerman Pavel Kotlyar + Pedro Pete Goodwin Peter Richmond Petr Malac PhaineOfCatz Rafał Michno + RAMupgrade Raymond Harris Reilt Rene Tailleur @@ -283,7 +277,6 @@ generous deed immortalized in the next stable release of Godot Engine. Rickard Hermanson Rob Robert McDermott - Robert Willes Rob McInroy Rocknight Studios RodZilla @@ -293,6 +286,7 @@ generous deed immortalized in the next stable release of Godot Engine. Russ Ryan Breaker Ryan Heath + Ryan Miller Ryan Scott Samuel Hummerstone Samuel Judd @@ -307,17 +301,15 @@ generous deed immortalized in the next stable release of Godot Engine. Song Junwoo spacechase0 Stephan Hennion - Stephen Brown Steven Landow Stoned Xander - Super Izzo - Sven F. - Thomas Bjarnelöf + Teslatech Thomas Kurz - Timothy van der Valk + Tim Suess Tobias Bocanegra Tobias Raggl Todd Smith + Tom Glenn Tom Wor Torbulous toto bibi @@ -331,7 +323,6 @@ generous deed immortalized in the next stable release of Godot Engine. xzibiting Yifan Lai Yuancheng Zhang - Артём Равбецкий ## Silver donors @@ -344,12 +335,14 @@ generous deed immortalized in the next stable release of Godot Engine. Adam McCurdy Adam N Webber Adam Smeltzer - Adam Szymański Adisibio + Adriano Orioli Adrien de Pierres Agustinus Arya Aidan O'Flannagain Aki Mimoto + Akio Yamazaki + Alaksandr Suša Alan Beauchamp Albert Gyulgazyan Alberto Salazar Muñoz @@ -362,9 +355,9 @@ generous deed immortalized in the next stable release of Godot Engine. Alex Chan Alex Clavelle alex raeside - Alex (Well Done Games) Allan Davis Allen Schade + Amar Šahinović Andre Altmueller Andre Stackhouse Andrew Groot @@ -377,13 +370,15 @@ generous deed immortalized in the next stable release of Godot Engine. Antti Vesanen Arch Toasty Arda Erol - Arseniy M Arthur Brainville Arturo Rosales Ashley Claymore Aubrey Falconer Auré Franky aurelien condomines + Austin Finlinson + Austin Miller + Azar Gurbanov AzulCrescent b110110 Balázs Batári @@ -398,14 +393,10 @@ generous deed immortalized in the next stable release of Godot Engine. bitbrain Bjarne Voigtländer Black Block - Blair Allen Blunderjack - Bobby CC Wong Brad Harms Bram - Brandon - Brian Klein - Brodie Fairhall + Brian Ford Bronson Zgeb Burney Waring Caleb Gartner @@ -418,24 +409,26 @@ generous deed immortalized in the next stable release of Godot Engine. Cassidy James Chad Steadman Checkpoint Charlie - ChrBohm Chris Jagusch Chris Langford + Chris Ridenour Christian Mauduit Christian Winter Christoffer Dahlblom Christophe Gagnier Christopher Chin Christoph Woinke - Codecat + ClicheChloe Cody Parker Conall O Conner Lane Corchari Corey W Craig Post + CT + Cullen Canejo Dakota Watkins - Daniel Cheney + Danielle Cheney Daren Scot Wilson Dave Walker David Baker @@ -444,7 +437,6 @@ generous deed immortalized in the next stable release of Godot Engine. David Maziarka David Rapisarda Devin Carraway - Diego Pereira Dimitri Roche Dmytro Korchynskyi Dominik Wetzel @@ -459,8 +451,10 @@ generous deed immortalized in the next stable release of Godot Engine. Edward Herbert Edward Swartz Egon Elbre + eiki kanou Elgenzay Elias Nykrem + Elijah Anderson Emerson MX Ephemeral Eric Stokes @@ -477,15 +471,14 @@ generous deed immortalized in the next stable release of Godot Engine. Felix Bohmann Fer DC Filip Lundby - Francisco Garcia Florez Frank - freakazoid FrostMarble Game Endeavor Garett Bass Gary Thomas gebba George Marques + Gon Shibayama Green Fox Greg Lincoln Greg Olson @@ -496,18 +489,15 @@ generous deed immortalized in the next stable release of Godot Engine. Guldoman Guo Hongci gurehamu - Hal A Haplo Hayden Foley Heribert Hirth - Hinken Ian Richard Kunert Ian Williams - Idilio Alfaro IndustrialRobot - Ivan Nikolaev + Inki Crow iveks - izzy neuhaus + izzy kestrel Jackson Harmer Jacob D Jaguar @@ -523,7 +513,6 @@ generous deed immortalized in the next stable release of Godot Engine. Jamie Massey Janis Skuja Jan Vetulani - Japortie JARKKO PARVIAINEN Jason Bolton Jason Evans @@ -536,10 +525,8 @@ generous deed immortalized in the next stable release of Godot Engine. Jim Engstrand Joe Hurdle Joe Klemmer - Joel Höglund John Anders Stav John Bruce - John Gabriel Jonas Jonas Arndt Jonas Bernemann @@ -550,7 +537,6 @@ generous deed immortalized in the next stable release of Godot Engine. Jonathan Ellis Jonathan G Jonathan Turner - Jon Bonazza Jon Sully Jordan West Jordy Goodridge @@ -562,22 +548,19 @@ generous deed immortalized in the next stable release of Godot Engine. Josh Taylor Joshua Heidrich Joshua Segall - jromkjrom Juanfran Juan Maggi Juan Uys Jueast Julian le Roux Julian Murgia - June Little Justin Hamilton - Justin Oaksford Justin Spedding KaDokta Karol Wojtasiuk (Drakonter) Katsuomi Kobayashi Keedong Park - keeganstoybox + Keegan Scott Keinan Powers Keith Bradner Kenji Kawabata @@ -585,43 +568,43 @@ generous deed immortalized in the next stable release of Godot Engine. Kent Jofur Kerotasma Ketafuki - Kiri Jolly + killaQueen Kodera Software Kolandrious Kquona - Krishna Nadoor Kristian Nygaard Jensen - KR McGinley - Kronarq KsyTek Games kycho Kyle Burnett Kyle Jacobs - Kyuppin La diagonale du poulpe Lasse le Dous Laurent CHEA Laurent Dethoor Laxman Pradhan Leland Vakarian + Lemin LEMMiNO + Leonardo Baumle Leonardo Dimano + Levi Lindsey Linus Lind Lundgren Logan Apple Ludovic DELVAL Luigi Renna Luis Gaemperle + Luis M Luke Kasz - LunaticInAHat Major Haul Malcolm Marco Lardelli + Marcos Heitor Carvalho + Markie Music Mark Jad Mark Malone Markus Martin Markus Michael Egger Markus Strompen - Martin FIbik Martin Holas Martin Linklater Martin Liška @@ -629,33 +612,34 @@ generous deed immortalized in the next stable release of Godot Engine. Martin Zabinski Matt Edwards Matthew Booe - Matt Sylvia Maverick - Max Fiedler Maxime Blade Maxime Santerre Maxwell + McStuffings + meinkush Melissa Mears Merlyn Morgan-Graham Metal Demon 2000 mhilbrunner Michael - Michael Bruce-Lockhart Michael Haney Michael Morrison - Michael Toporkov Michał Skwarek Mikael Nordenberg + Mikail Freitas Mikayla Mike Birkhead Mike Copley - Mitchell + Miss Mitchell J. Wagner + Mitchell White MJacred ModularMind Molinghu Molly Jameson MoltenGears + Moowool moulefrite MrAZIE Mrjemandem @@ -673,46 +657,46 @@ generous deed immortalized in the next stable release of Godot Engine. Niclas Eriksen Nicolas Goll-Perrier Nicolas Rosset + Nicolò Brigadoi Calamari Nils Nordmark Nima Farid Noel Billig Noesis - oceoh Okatima Oleg Reva Oliver Ambrose oscar1000108 Oscar Domingo + Panagiotis Xynos Pascal Patrick Indermühle Patrickm Patrick Nafarrete Patrick Wuttke - Paul E Hansen Paul Gieske Paweł Kowal Paweł Łyczkowski Peter Höglund - Philip Cohoe Philip Ludington (MrPhil) + Philip Woods Pierre Caye - pingudroid + Pixel Archipel pj Point08 Preethi Vaidyanathan PsycHead + Puntigames pwab - RabidTunes RackBar Dingum Rafa Laguna Raffaele Aramo Ragnar Pettersson Rainer Amler - Rami Hanano Rammeow - RAMupgrade + Recep Karademir red1939 Remi Rampin + Remtaine Reneator René Habermann Riccardo Marini @@ -733,20 +717,18 @@ generous deed immortalized in the next stable release of Godot Engine. Roy Scayged Ryan Groom Rykk - Sam Caulfield Sam Edson Sammy Fischer Sangeeth Pavithran schroedinger's possum Scott Longley - Sean Wall + Sean Dee Sebastian Michailidis SeongWan Kim Sessamekesh SeungJong k Shaidak Shane - Shane Abraham Shane Sicienski Shane Spoor Silver1063 @@ -764,6 +746,7 @@ generous deed immortalized in the next stable release of Godot Engine. Soheib El-Harrache Solene Waked Sophie Winter + Squidgy Squirrel Stéphane Roussel Stephen Rice @@ -791,7 +774,6 @@ generous deed immortalized in the next stable release of Godot Engine. Tim Gleason Tim Klein Timothy B. MacDonald - tinyBigGAMES LLC Title Plinsut TMoney Toadile @@ -804,11 +786,12 @@ generous deed immortalized in the next stable release of Godot Engine. Travis O'Brien Trent Skinner tril zerobyte - Troy Bonneau Tryggve Sollid Turgut Temucin + tweedle Tycho Tyler Stafos + Ukko K. UltyX Uther v01tech @@ -825,15 +808,12 @@ generous deed immortalized in the next stable release of Godot Engine. William Bodin William Edwards William F Siqueira - William Hogben Woonki Moon Wyatt Goodin - xenomat yakcyll Yan Shi Yegor Smirnov Zach H. - Zak Stephens Zher Huei Lee 蕭惟允 貴宏 小松 diff --git a/modules/gdscript/editor/script_templates/EditorScenePostImport/basic_import_script.gd b/modules/gdscript/editor/script_templates/EditorScenePostImport/basic_import_script.gd index b4b2305b8c..556afe994b 100644 --- a/modules/gdscript/editor/script_templates/EditorScenePostImport/basic_import_script.gd +++ b/modules/gdscript/editor/script_templates/EditorScenePostImport/basic_import_script.gd @@ -5,7 +5,5 @@ extends EditorScenePostImport # Called by the editor when a scene has this script set as the import script in the import tab. func _post_import(scene: Node) -> Object: - # Modify the contents of the scene upon import. For example, setting up LODs: -# (scene.get_node(^"HighPolyMesh") as MeshInstance3D).draw_distance_end = 5.0 -# (scene.get_node(^"LowPolyMesh") as MeshInstance3D).draw_distance_begin = 5.0 + # Modify the contents of the scene upon import. return scene # Return the modified root node when you're done. diff --git a/modules/mono/editor/script_templates/EditorScenePostImport/basic_import_script.cs b/modules/mono/editor/script_templates/EditorScenePostImport/basic_import_script.cs index 0690205d01..9e1b7ef580 100644 --- a/modules/mono/editor/script_templates/EditorScenePostImport/basic_import_script.cs +++ b/modules/mono/editor/script_templates/EditorScenePostImport/basic_import_script.cs @@ -7,12 +7,10 @@ using System; [Tool] public partial class _CLASS_ : _BASE_ { - public override Object _PostImport(Node scene) + public override Godot.Object _PostImport(Node scene) { - // Modify the contents of the scene upon import. For example, setting up LODs: -// scene.GetNode<MeshInstance3D>("HighPolyMesh").DrawDistanceEnd = 5.0 -// scene.GetNode<MeshInstance3D>("LowPolyMesh").DrawDistanceBegin = 5.0 - return scene // Return the modified root node when you're done. + // Modify the contents of the scene upon import. + return scene; // Return the modified root node when you're done. } } #endif diff --git a/modules/mono/editor/script_templates/EditorScenePostImport/no_comments.cs b/modules/mono/editor/script_templates/EditorScenePostImport/no_comments.cs index 4e2d9b7088..bf2c9434e4 100644 --- a/modules/mono/editor/script_templates/EditorScenePostImport/no_comments.cs +++ b/modules/mono/editor/script_templates/EditorScenePostImport/no_comments.cs @@ -7,9 +7,9 @@ using System; [Tool] public partial class _CLASS_ : _BASE_ { - public override Object _PostImport(Node scene) + public override Godot.Object _PostImport(Node scene) { - return scene + return scene; } } #endif diff --git a/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl b/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl index a8ccdea60b..62a7b0e7d7 100644 --- a/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl +++ b/servers/rendering/renderer_rd/shaders/effects/tonemap.glsl @@ -448,6 +448,11 @@ void main() { // Early Tonemap & SRGB Conversion #ifndef SUBPASS + if (params.use_fxaa) { + // FXAA must be performed before glow to preserve the "bleed" effect of glow. + color.rgb = do_fxaa(color.rgb, exposure, uv_interp); + } + if (params.use_glow && params.glow_mode == GLOW_MODE_MIX) { vec3 glow = gather_glow(source_glow, uv_interp) * params.luminance_multiplier; if (params.glow_map_strength > 0.001) { @@ -455,10 +460,6 @@ void main() { } color.rgb = mix(color.rgb, glow, params.glow_intensity); } - - if (params.use_fxaa) { - color.rgb = do_fxaa(color.rgb, exposure, uv_interp); - } #endif if (params.use_debanding) { |