Merge branch 'master' into port-field

2025-02-08 19:36:26 -05:00
parent af0f521a35 b96191f6d6
commit f8ff370dbe
2681 changed files with 151338 additions and 45271 deletions
@@ -1,2 +1,3 @@
-mschxœE��
-ƒ0„¯¦þÀ`{Ž>T¦Aµ–*Œ½ûÀõg°@øÂå.�Æ  =o‚n)ÕãvìŽ£	ìÅA¯lºMü,ý“ÏSâã&ÓÊÞNìÌs¸/‘ÃjO1!Êq`ûK¢ñû,&�[ÀÿR Œ¤(O€®»6EÖ	*?»Ê».¡šëº>hRSÉ–-êTQBTP5PýAÙù–Ø(¢
+mschxœE�Á
+ƒ0DÇ$FA(úù¢ÒÃª‹
+1Jb)ý÷R›J÷ò–™a–…B- -=žm©c n÷MX-y³‘c5Ñl¡v{Tí;ûÚ…û‰ÜÜ“5ƒŸÅeô´MóÎfóÚm}²7nØÄº‘ÑDs1a}øž\ñŸ"CäMžTË$œQ$¡H‘”�žŽÐñ!q¼�ãøDGüÊJä²Œ"ã¼!ó␍™oÈ”¬"ª2µ1‘0[
@@ -1 +0,0 @@
-mschxœ%ŠQƒ0C]RÐÄ>v>9Ê"µˆ¶S(HÜ~)X±_dƒƒÏKŒa•YëDÝ¹(¼¸äS®¢øü²i©‘§¯ÆmÃ;VIÓ^e0â–s-@␍ÝuV™É½�Úƒx›z¸?Œk¤
@@ -1,2 +0,0 @@
-mschxœ5�Ë
-!E¯Ïy-J·ý‡ù(q¤£Gú÷�„ââä&'›„Î.<Zl.Çž®Vª{lG¸|�ŸK4ÌíúÙðü{»/ùßR±ÅÒ~•^=ÝùäÐ“kÑïG�ç	àzRPm!&ÆÌX+ ÉÓ†4©¨²¼H}E“y$9’À˜’¢XQÜÔü‰æd8ZQŠ¡†acf,Œê˜ã"
@@ -1,2 +0,0 @@
-mschxœ5�AÂ E¿JkêÊStã��˜I
-4”šx{¡ðòÿ¼¸vÐÑÂ½pq‘�°—”Ý›^˜Ú}æpŠ€ÆÄ…Â¼§#{Âã¯Ï>Å}SÆm‹tWØÏKæuÅXGÅq¤àY¬z\P?E½:�ÅYŽ␍ªÍÎ¤ÅÔ¢h)�(¦%UDK½”½(¶.©%Ð#èV0F¨N#Ô
@@ -1,3 +0,0 @@
-mschxœ%ŽknÃ „ÇØIü¨äV9×È␍ú;¢xS!a@€“úîMÝ%F¬¾Ñ>fz�Æ©™p¾~:“¯¥}ŽëõbU$%MÈÆ;à␍ãCeŠ’~rT:ûˆ^/6›»*ú#y’A9²’Õ7Ï§à#É)%ŒÚ++5¹Ímáê˜Œ5Ú;™f²ì‹18Zf•�–S4Öb0™f™ü5áô¥2wèƒðÎO„÷ VëÕ$ÙçN+Ÿ1(åíuÞ
-àŒýU¢ü
-‡mIŠR«uÃ¢�80ŽGF‹úÄ©2Ñˆ–U…º€›;FÝÖÛßöÜ~·'§ÇbØ3xb`´ÕË_ ÛÝ¾¼+Ëÿ©•UÊ
@@ -0,0 +1,2 @@
+mschxœËA
+€ Fá_‹Ú´m7ðDÑÂraRÑ ë—¾õ÷ ¡ŒÑÞŒÍR␍Ñ“Øâ™rz¹PLŽ±8®W	ù	)˜Äž,z?ÖîLs¦�?PhÍÀp;
@@ -0,0 +1,2 @@
+mschxœ%ÊA
+€ @Á§Em;€èDÑÂê#‚i¨Ñõ£šõ Ñ␍m´‡0ZS|tAL¹²SÓ-™a—²eVŸ"Ð»J(èyQ_œþŠWùÖ
@@ -0,0 +1,4 @@
+mschxœM�anÂ0…MK[HÚ"Ä9rŠcÚ�<Ô-4(MaÜ~ÏñŸ)RŸíú{vB':Ô´�ý�iðç¼ú^ñ'å+Ù/ç4Ýóg"jƒÿä°PõþaÉ~¿dwIStxúÌÉñoNpˆ‰ŽK>¹»Ÿ98DW&û¯DÇ<e?OëÍ�ãüà�Ý•gN^Æu¾pú
+ñé®0§S|pÂ´»{Šß\ÆØe…µËñÉ‰š‡_C&;e¾¹%®éÌXú�h#gƒxKT!îˆj[ªEª!Ûˆ4*Jé¬iG¨‡-�’�ið.�ŽÉvT‰ã@åO¥Ò	Ð
+Þâ`É
+Þ*Þ¢¥�‹Uá:á*”ÁwŠ£�jÉ€w,/ÅN‹ø+³~¯6{o”7:Þèx£ã�no”7…¯Èê-¬ÚXµéÕ¦×5zµéÕ¦×5z½Å Ü ·õ#èª…”-FÅGÅG}„QñƒâÁ÷tDçF-b@tõ½ÔO¼
@@ -0,0 +1,4 @@
+mschxœ-‹Ñ
+@0F�␍)”GðžH.Æþ¤fÓ¬äíQúÎÕé|hMîÍ.4³IIâÝû`…ÚÊ¹ÄíH[ð@éÌ,îD�“¢ýËÁ™¸
+Ý.‰Ãwû␍(ÈÞ½h²
+ígû
@@ -0,0 +1,4 @@
+mschxśMQË’Ó0śÄ/ŮÎ“ĺqŕ’Ŕ7Žś(Ž¨âHqĐÚZÇ‹"Ąd;a?…oŕ«ř¸pŰbMŹ”ĄHĘę‘Ô3ęžˇm"ŠŤ<(zů^š¦3íî�lvďdŰ*·{;š/€×T6ŞŻ]w:k�(ŐňZéž–ź~}űţęŁrÇQŰĎ/(éĄ>YZ{ëşńPťĄÖ´jťMSÝČz°îŽ¶˝ŐŇUGi”®µŠâĆZGëÎś”TSőŕ(E"ă
+éĘÝh{®Z9(µó)b4ÚJ\RĽ—ť¦ô �Jëk×5Şţ×g$şJ}ś—AĹŃžq`l�z·Ł©˝µôňrÖ×rŕ`sPő^š®–şj\;Ą}‚�†®,ăü¤ŞŁł·Ę—.ű¦Ş� ˛Ô†FW+tî␍>š‘˙E!J¤DsÂ_F–>śGWĚ™15¤‡ `ź#qÎ˙*
+@LCBQH=« ®C%`N~ňKś5ČZbň
+�‰xzŔQÂ7Óýô)ĚŮ4M›izřAkls˘␍ đOpzÉ¶bÖ»őRé	«!şB%áYO!x†ĄDĎŮ¸oÁ‘OH9¸Ę�(Y¶&D0!‚	ńż‰¶™H¦?ĐŹVL÷8ÝNżŮ…§zĺĹ�ÄĹA‚ď±©Üş(ř¦ćˇ©yhj~ięś5<¬¸ŚűÁŇYŕ,€źtĆWřńaşÁuÉţ˙ÁâźÂ
@@ -0,0 +1 @@
+mschxœMŽÍNÃ0„'‰›æ¯^�»Ÿq0‰‹,9vd»”¼{ ¬»*KÞ�ogV‹'´„S³†¸XÐO:ŽÁ,Éx ¶êCÛˆòí}@oUÔANÁX‹—d’ræ:ËÑ»/½ú€“7VêïÔ˜Hžo*‘ýDc␍¹eœµ¥Î£WVŽÚ¥`.×O�Þ$=Ëè¯a$¡L�—{tE·ø-s~¢Aôtª\”ÓtÇƒ�ÔÑ–çEÖ«éÿ2à(ò+¨¯¸%¡�+úî¼B	¨†d©©o4,�Yæ<ÐdS#ößýgß€}£nCU¶ÄÐ‘³Zúhc."«#«cV=é"Ã†aÃ¹–s-Ã–s«Žsçz†=çÎ␍Î�X�²ú18[Ó
@@ -0,0 +1,2 @@
+mschxœŒKÃ CÍ¯E=
+‹ž§Ê‚�B%␍D½~ya?Ù2œ�á <y¤�sü¾±ìÔ#çsäVÜJØ¨tèÏê°”Ð‰ýÎ¹,ýâD~´±@+�ý*I“¾·‹#á%×>Q%£ñ|Ô”’lÐÊˆYÜµ”Í4␍õÀ€$˜
@@ -0,0 +1,5 @@
+mschxś␍ŚK
+Ă0CĺOŇ–ĐEâMŻşpśÁ�Ně0včő;ń$!„	ł�Żń <däMJúľ±ěÔ“”s”VĚ7â»~&<u2U’8š`é—d
+ŁýHCt„Ţ.I„Wo%ś±u™°pě$a—Â¬ż“
+Î(üÖÂŔhyłN˝ó
+óŇ&Ń
@@ -0,0 +1 @@
+mschxś5PŃŽ„ @ôáľÄ/şÜ�Ë’,‰ŠAÝËýýµt5!C§Ó™"FŚÝ6Ż	î�ĄĆĆg:bÍű™ËŔ-ó#-ô÷ŹĂ×ľĄkťĎ§gÍËËöNĄbŚeßSť~g˘o/WËu&jć3ÓQ®yNt`Đ> `ů®™TźŞőŚTťôş»j=Ëë>rĹw“A`€Öč%˛IĎQV*Ĺ˝6ĐË€—Ď�fĄ'Ć0Đ6LZ^Âs0™3ée®™y1b$=Hz�Ř Ę ĘAž2đo°–6´†‰ <©ţ/_&‘
@@ -0,0 +1,2 @@
+mschxœ=‘ë²“0… å(=¾à³8þà@t¢jöôÉ�qjqmÂq(|Ù—µ’�â|˜ºQã¼˜ñjõ¨æÛ5è¥wæêÍ<8ÙîUÛñç/5òÿ]õkç½v÷Övî›†²Ý¢];8c-š[ÇR«ß¼ëz?;(ãõØ.óêz�¬Ÿ§a5jY)mý|Ó/Þøn2ëØ²üKß©º\¥ÒNó �]šÞÝç¯v5C;š7ª”5?%¢ôš#ø¾Ný~øË‘ £ïÌÄ~à¡A!á"Ž‰üð6À_•ræ$åªF”2U#>çœyò’‹ÃIÄR. `2'Ê¼D´=¶çö)¿ÏíùØ¬eÛ“ï×Åö›[¤â]Ðâ„D�#C&ÓÝ4”HJVx˜ˆÒHj²ÓŽLZr>;XUD"%(BgÁ$QJ”'™X\åÈïµZæS2ÇÎx¯ª` B“zo:M—½©
+¾Uðp$wI%àÌ“G2ïñ¨Þ¹ A#× Èò€" PHþŸLo´
@@ -0,0 +1,2 @@
+mschxś-PKNĂ0}ů§NˇBp€.Xâ-'`É‰%báĆ&
+ríČqZzÎŔá8*3Ie93~óŢ›™`ŤM†Ü©˝ÁÝłrşwÝöEéíăöIuť	h´ŰĐ±÷@iŐÎŘWożß?Ż&“őďkÔ“ł^i\wÁONËŐFNŘU4AšŻfŐNEBN¸˝UAĘ+)ëŞÖ;=őbđGR9Ż␍šťUc”:ôÖ˘±Ë”$Ó¸ő?9˙if˙fśČJF6@ÓGł—ŁźBkhü{şH�„Nž\´ŐW@FˇrŞ_1-E˛Đ8–4#ś8!+¦l‘!«łóĘó™ôé,¦ËÄŚ‰9ň¬čM>5…Şŕž)á‚“‚É‚śDÍěŠŮÔ”Ń„ĘË T®/Ťć%�QÎĺe82©Ů3Ą X'.{RaĹî5űŠe]Á«đÎéJţ4¨gsŽ%]XA
@@ -0,0 +1,2 @@
+mschxś-P;RĂ0}ţĹŽ  g\Qˇ†‚@IÁ%CˇXÂcF‘<˛ś�ŁpÇ	�°kedkßî{űŃb�‹ą•;Ť›giŐ`űöEŞöˇ}’}Ż}űčvŁěB{ŹFé©óĂg¬ŚÜj3áâí÷űçîUűq6î}�j¶ĆIĄ=.{ďf«Äĺ;ÄŐAí…ţ
+~‰ ™fßkÜ�Ôeç¬š‡€r+éŽ¨G&„uJŁŮ9ˇü`'ŁTTÄé	ZmpíöÚ“hŻĹčÝ§Žm† wbrłď4␍~K?R ˇ“'g‡ŢíČČ4R$QŔ°Ś0'¸fmŠ(Čl89CVe§?¬N'°„3hł /c}A†„%ŞS‘)î–’ f�3]S<gŻ`/Ąş·Š^ą’˝„@ŽŘęÜ|yŇ’Ćt�÷IÉ,W1˝>?žř5ó]K—:î ^v@›�ëixA␍;Á?·1Y„
@@ -0,0 +1,2 @@
+mschxœ%ÐÝrƒ àãJÔ˜fúÜõm:½@³uÌ d“æí»¸^øÁ¸ËYÄÊÕ.„f‹d—É! ½Ñ6†ùg¿¨œÈmÈ¿\^6R0ôƒ£çâm™è_p9N1ìñupv‹æfçÐïë�Â¯ó/3ñ)¸Æ9ÚuÞ3úõIo®ÿôO
+\ý$óþNGD=ØÈ¡o\7ïl0»’3¼šíi1›ßÃH<ëŽ§H¯\(…Fè„E†•5›s„\(…Fèîä†YÉdÈÃ␍¥¥/Jh�%Ziè Óî,»:çº#VI¬’X%±JbUŠ‡BÈ®¬˜*Ý¨†æi˜F¾u÷Õ8¥IJ¨„ZÐÂIh„Vè�i^óUZhQ¤ºžWÙ?â�J-
@@ -6,8 +6,10 @@ uniform lowp float OriginalIntensity;
 varying vec2 v_texCoords;

 void main(){
-	vec4 original = texture2D(u_texture0, v_texCoords) * OriginalIntensity;
-	vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity; 	
-    original = original *  (vec4(1.0) - bloom);	 	
- 	gl_FragColor =  original + bloom; 	
+    vec4 original = texture2D(u_texture0, v_texCoords) * OriginalIntensity;
+    vec4 bloom = texture2D(u_texture1, v_texCoords) * BloomIntensity;
+    original = original *  (vec4(1.0) - bloom);
+    vec4 combined =  original + bloom;
+    float mx = min(max(combined.r, max(combined.g, combined.b)), 1.0);
+    gl_FragColor = vec4(combined.rgb / max(mx, 0.0001), mx);
 }
@@ -10,9 +10,9 @@ const float close = 0.3162162162;
 const float far = 0.0702702703;

 void main(){
-   gl_FragColor = far * texture2D(u_texture, v_texCoords0) 
+    gl_FragColor = far * texture2D(u_texture, v_texCoords0)
 				+ close * texture2D(u_texture, v_texCoords1)
-				+ center * texture2D(u_texture, v_texCoords2) 
+				+ center * texture2D(u_texture, v_texCoords2)
 				+ close * texture2D(u_texture, v_texCoords3)
-				+ far * texture2D(u_texture, v_texCoords4); 
+				+ far * texture2D(u_texture, v_texCoords4);
 }	
@@ -1,9 +0,0 @@
-uniform lowp sampler2D u_texture0;
-uniform lowp vec2 threshold;
-varying vec2 v_texCoords;
-
-void main(){
-	vec4 tex = texture2D(u_texture0, v_texCoords);
-	vec3 colors = (tex.rgb - threshold.r)  * threshold.g * tex.a;
- 	gl_FragColor = vec4(colors, tex.a);
-}
@@ -5,6 +5,7 @@ Timmeey86
 Epowerj
 Baltazár Radics
 Dexapnow
+Somka
 Milinai
 키에르
 skybldev
@@ -27,8 +28,9 @@ William So
 beito
 BeefEX
 Lorex
-老滑稽
+老滑稽/酪桦姬
 Spico The Spirit Guy
+RTOmega
 TunacanGamer
 kemalinanc13
 Zachary
@@ -39,6 +41,7 @@ Carter Gale
 Jan Polák
 JustYanns
 BasedUser
+Rex Aliis
 BLucky-gh
 DinoWattz
 Jae
@@ -91,7 +94,7 @@ DeltaNedas
 GioIacca9
 SnakkiZXZ
 sk7725
-The Slaylord
+Slotterleet
 ThePlayerA
 YellOw139
 NgLamVN
@@ -104,12 +107,69 @@ jalastram (freesound.org)
 newlocknew (freesound.org)
 dsmolenaers (freesound.org)
 Headphaze (freesound.org)
+Michel Baradari (opengameart.org)
+Michael Klier (opengameart.org)
+Neoqueto (Darktech LDR Font)
 Nikolass
 VolasYouKnow
 Quick-Korx
-Ángel Rodríguez Aguilera
+Angel-24
 Catchears
 younggam
 simba-fs
 RedRadiation
 Marko Zajc
+PCX-LK (CPX MC)
+Phinner
+BTA_Susideur
+nilq
+AsgerHB
+AzCraft
+foo
+Skat
+WilloIzCitron
+SAMBUYYA
+genNAowl
+JniTrRny
+TranquillyUnpleasant
+Darkness6030
+hortiSquash
+King-BR
+citrusMarmelade
+Evolveye
+Jerzy Paciorkiewicz
+YozoZChomutova
+Qendolin
+Goobrr
+xem8k5小恶魔
+BlueWolf
+[Error_27]
+code-explorer786
+Alex25820
+KayAyeAre
+SMOLKEYS
+1stvaliduser(SUS)
+GlennFolker
+BlackDeluxeCat
+zenonet
+AyuKo-o
+JojoFR1
+Xasmedy
+xStaBUx
+WayZer
+SITUVNgcd
+Gabriel "red" Fondato
+CoCo Snow
+summoner
+OpalSoPL
+apollovy
+BalaM314
+Redstonneur1256
+ApsZoldat
+Mythril
+hexagon-recursion
+JasonP01
+BlueTheCube
+sasha0552
+1ue999
+6-BennyLi-9
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`mschxœ%ŠQƒ0C]RÐÄ>v>9Ê"µˆ¶S(HÜ~)X±_dƒƒÏKŒa•YëDÝ¹(¼¸äS®¢øü²i©‘§¯ÆmÃ;VIÓ^e0â–s-@␍ÝuV™É½�Úƒx›z¸?Œk¤`
				`@@ -0,0 +1 @@`
				mschxœMŽÍNÃ0„'‰›æ¯^�»Ÿq0‰‹,9vd»”¼{ ¬»KÞ�ogV‹'´„S³†¸XÐO:ŽÁ,Éx ¶êCÛˆòí}@oUÔANÁX‹—d’ræ:ËÑ»/½ú€“7VêïÔ˜Hžo‘ýDc␍¹eœµ¥Î£WVŽÚ¥`.×O�Þ$=Ëè¯a$¡L�—{tE·ø-s~¢Aôtª\”ÓtÇƒ�ÔÑ–çEÖ«éÿ2à(ò+¨¯¸%¡�+úî¼B ¨†d©©o4,�Yæ<ÐdS#ößýgß€}£nCU¶ÄÐ‘³Zúhc."«#«cV=é"Ã†aÃ¹–s-Ã–s«Žsçz†=çÎ␍Î�X�²ú18[Ó
				`@@ -0,0 +1 @@`
				mschxś5PŃŽ„ @ôáľÄ/şÜ�Ë’,‰ŠAÝËýýµt5!C§Ó™"FŚÝ6Ż î�ĄĆĆg:bÍű™ËŔ-ó#-ô÷ŹĂ×ľĄkťĎ§gÍËËöNĄbŚeßSť~g˘o/WËu&jć3ÓQ®yNt`Đ> `ů®™TźŞőŚTťôş»j=Ëë>rĹw“A`€Öč%˛IĎQV*Ĺ˝6ĐË€—Ď�fĄ'Ć0Đ6LZ^Âs0™3ée®™y1b$=Hz�Ř Ę ĘAž2đo°–6´†‰ <©ţ/_&‘