From 26b59400e96d02f5c3ac5e407167154f125889e0 Mon Sep 17 00:00:00 2001 From: Andrew Cassidy Date: Tue, 16 Jun 2020 22:42:07 -0700 Subject: [PATCH 1/4] Update README.md --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 36792f5..75593df 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Conformal Decals v0.1.0 [![Build Status](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) +![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png) + Conformal Decals adds a set of decal stickers to KSP, as well as providing a framework for creating your own decals which conform to the surface of the parts they are attached to. ## Dependencies @@ -27,6 +29,6 @@ Art assets and configuration files are licensed CC-BY-SA 4.0, as described in th Plugin code is distributed under the GPL v3, as described in the LICENSE-SOURCE.md file Any bundled mods are distributed under their own license: -- ModuleManager by blowfish and sarbian is distributed under a Creative Commons Sharealike license. More details, including source code, can be found here: https://forum.kerbalspaceprogram.com/index.php?/topic/50533-* +- ModuleManager by blowfish and sarbian is distributed under a Creative Commons Sharealike license. More details, including source code, can be found [here](https://forum.kerbalspaceprogram.com/index.php?/topic/50533-*). - B9PartSwitch by blowfish is distributed under the LGPL v3 license. -- Shabby by taniwha is distributed under the GPL v3 license. \ No newline at end of file +- Shabby by taniwha is distributed under the GPL v3 license. From fae34be3587b2adde9a47e223f923ad6ca585fe2 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Wed, 17 Jun 2020 13:57:36 -0700 Subject: [PATCH 2/4] Multiple fixes --- .../ConformalDecals/Assets/decal-blank.mu | Bin 4889 -> 4892 bytes .../Plugins/ConformalDecals.dll | Bin 37888 -> 37888 bytes Source/ConformalDecals/ConformalDecals.csproj | 2 +- Source/ConformalDecals/ModuleConformalFlag.cs | 1 + 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/GameData/ConformalDecals/Assets/decal-blank.mu b/GameData/ConformalDecals/Assets/decal-blank.mu index 2f33090704b8490ab1803c43bd0d9b10a6dfec68..a2e687d35e2d2daaf991b61445ffd7b5db30ded6 100644 GIT binary patch delta 33 pcmbQKHb-s4TrM7N&*c2Pc#q7Kl+?V<%eZtnCZ7}FntVsd768i!3-ka0 delta 30 lcmbQEHdAfGT&{`zyqni@X>f2g*fRjZ^l8)VCf^sb1puT+3M&8r diff --git a/GameData/ConformalDecals/Plugins/ConformalDecals.dll b/GameData/ConformalDecals/Plugins/ConformalDecals.dll index c4175b166c6d3543b45af9ff3bdfb55d7012a8d3..76e71bad3955ee7487a1894db8134a18ccd0481e 100644 GIT binary patch delta 1963 zcmYk-du&rx90&04x!rmX-NSZkOSepLfYNPU*FB^#V8R?SkjF3>M$9?_o zZHa3waqZ2uDcvKwUyDZa*pTR+r`V|&W5ZLs_W(0v`I;v-iw$S)ScnC4ObMu^R{Uy6 zg>?qdSr4#S{ziYYPRlc=XZunx-e`r`5?*Q1+-|^JD0U^|d`nsI=tD9MVY9;u3x*As z3cHqPF{HtNS6zA<0){Zhd0NjvhZsh*#5~(Y-3DKQREWPipgq-&c}iUJ<=?peC#95&dTIN@%bpo`PJ$VJg8|Qia8<`LLBV){-#! zu#>ccd9_j;R|@eKmN1p#DrM_MRtD>6aY{k)&}+ zm7!JORm!q*{Ja7YBNMlxia(6V7&QuZ+0Uf-ae?G?)bf$=jWsf-!>oD4e?@g0jkkMsxn)J zP^0FHeNyEJj!@gJIFa!TpMdG4>y8C{5*Cum1}@`M5hB%Ot>QDVopir5%%4P(^Z{ag z7EUOIV6p7rv$1Z1oUK(ouMLPQg?Us|YXja265k(?iUu4d<=Fa6bJ0mUkzUT`!u6OO zCd_-47L%YK-mZ-w4geHqvRK1^9t9BKIr45dEb2xo7wy@X5v~ zb40cn?#ZeK!&sGjo-e^#3JYvjEJZ(QL&{J5c`SU~=-80j!4%?zth8|i#ndukItBy~BZ_LF{5*;&#VmHj0Z6nC`UzSG=<>}hIxeoU!^B=2Dp z#wi&E(u66~Wy>ze0$GK#N?~+}>(q?zNkMU)R^#ej-Qa65vrhJlqQlGvyn;WKlAYu8 z##nECy0@bGo^$Tw zoZH%^wRUM+UpN2Pa`!}}Ba@{>4$NUEql^u+oH+p0Mzgj2XgwRoT+t8_$R!xIM_8*mWQy-?SKuAVNzjlb1FkJa-OJH zPezR)Ebv^^?Km`CRbsL8d)nAB}?VYX5)^2`h_w2{iRBf1M61+uain{@^^ zI)g;N_qgsxsZWKhJDtIUol0%km-dJ5!F|#(AurAq%E~r0X?OGt+$3E|d#Gok%5P*n z$qZSzOWLngS7c=EVrW^YDG3_f?vnhu#89?ds;AVDQ)N5Lq{8BQb)E(DC?$2D2BKxO zRK&Y3^?*JQ>y>t3cXA3Jh;~xFP&VEs%}q_=IoLlMvi}`OJmcX*aMEZ7Uz)P{aC}R$ zT61|G?kR= z`VaHpQ+%2a(15;OTwPkPPk(+bf@+Tx9w3eij|wfQtZLZorFn8}Z=q}9x)72&8- zh_|wssR-97dqZT!cpw!NFHNTii!o@daTV{1umn{~A>Jjj5;Riwz-!k^v4XPH^fF$G zfRTwuQNf=>pj@?ry{=2v3Eu z1e@)BJ{K*MR1e;uoaqa(UNOugV*W0~CejB<7Lj$4(wzy@BJ_|h^ebVDV4f_S3G+Us zIV9*u_#(_FIrL*f5z@zwzqJM&Rl31u1#Jus$b3OIbAv5V`c)~6d@)BG;FT+xn0Rtc zXuuv)UdAcjfWMyTEMJWBDMsZt8E1JT+DI3Lmf#E0$c*!RDQ=P)GlG}+GTbFD5aCO3 zO*NWXn{kydM>8qc>A(uyB(xxxrV0Pk*d(whHq|m(%-r6E>1|+4^`h z_K^~fz94VG38GwtR^tk(r(Zr>jj9={QMJ&l!5l;UsP#5qgZZT2?73KjC8YayhtNjS z)#PqV09#1C9;tUoKZ-0Ez-i(o75+f#cI~kS@Q8FuX~0Z17%rb-0QpMBj0s@WESdE} zzQAj7S}BY(;y$gz=cJ&xPp{zG6W!ylI#4M-P-5}K87oWLfbZg$$7h#2YWpq@y&s89 z?_M=v^7XeiHO9>wuGrlpLy2F&X4GingjVr$iEo`N+Si_D=@fgN(WH(X$7h3Q-g?x1 zc;epm@$>hx?DlARM^iB!{OIvP+0a+Z2Tk2RhjM>VB-^7U4#xlK ZaISo75-j4^{|BUqnPLC{ diff --git a/Source/ConformalDecals/ConformalDecals.csproj b/Source/ConformalDecals/ConformalDecals.csproj index 912b4f8..19d5ed4 100644 --- a/Source/ConformalDecals/ConformalDecals.csproj +++ b/Source/ConformalDecals/ConformalDecals.csproj @@ -68,6 +68,6 @@ - sh -e -c "cp -v '$(TargetPath)' '$(SolutionDir)/../Distribution/GameData/ConformalDecals/Plugins'" + sh -e -c "cp -v '$(TargetPath)' '$(SolutionDir)/../GameData/ConformalDecals/Plugins'" diff --git a/Source/ConformalDecals/ModuleConformalFlag.cs b/Source/ConformalDecals/ModuleConformalFlag.cs index d82ea41..4ce228b 100644 --- a/Source/ConformalDecals/ModuleConformalFlag.cs +++ b/Source/ConformalDecals/ModuleConformalFlag.cs @@ -95,6 +95,7 @@ namespace ConformalDecals { materialProperties.AddOrGetTextureProperty("_Decal", true).TextureUrl = newFlagUrl; UpdateMaterials(); + UpdateScale(); } private void SetFlagSymmetryCounterparts(string newFlagUrl) { From ccd71208dc0701e2b2d000397b450d90535c5414 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Wed, 17 Jun 2020 14:04:42 -0700 Subject: [PATCH 3/4] Update version and add SpaceDock deployment --- .../ConformalDecals/Versioning/ConformalDecals.version | 2 +- README.md | 6 ++++-- changelog.txt | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/GameData/ConformalDecals/Versioning/ConformalDecals.version b/GameData/ConformalDecals/Versioning/ConformalDecals.version index 46028ef..0914349 100644 --- a/GameData/ConformalDecals/Versioning/ConformalDecals.version +++ b/GameData/ConformalDecals/Versioning/ConformalDecals.version @@ -6,7 +6,7 @@ { "MAJOR":0, "MINOR":1, - "PATCH":0, + "PATCH":1, "BUILD":0 }, "KSP_VERSION": diff --git a/README.md b/README.md index 75593df..202c5af 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Conformal Decals v0.1.0 +# Conformal Decals v0.1.1 [![Build Status](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals.svg?branch=release)](https://travis-ci.org/drewcassidy/KSP-Conformal-Decals) [![Art: CC BY-SA 4.0](https://img.shields.io/badge/Art%20License-CC%20BY--SA%204.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) [![Code: GPL v3](https://img.shields.io/badge/Code%20License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0) ![Screenshot](http://pileof.rocks/KSP/images/ConformalDecalsHeader.png) @@ -8,10 +8,12 @@ Conformal Decals adds a set of decal stickers to KSP, as well as providing a fra ## Dependencies Required: -- KSP (1.8.0 to 1.9.0) +- KSP (1.8.x to 1.9.x) - B9 Part Switch (2.16.0). Bundled with release. - ModuleManager (4.1.3). Bundled with release. - Shabby (0.1.2). Bundled with release. +Optional: +- Wild Blue Tools. For custom decals category in the VAB and SPH. ## Credits diff --git a/changelog.txt b/changelog.txt index ffa5bb6..23b08f3 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,3 +1,10 @@ +v0.1.1 +------ +Fixes: +- Fixed flag decal not adjusting to new texture sizes immediately. +- Fixed decal bounds being visible on launch. +- Fixed decal bounds being visible in the part icon. + v0.1.0 ------ From 32097e8baf048d528a35b3f45a2c0460422caf72 Mon Sep 17 00:00:00 2001 From: drewcassidy Date: Wed, 17 Jun 2020 14:04:57 -0700 Subject: [PATCH 4/4] Add spacedock deployment --- .mod_data.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.mod_data.yml b/.mod_data.yml index 7017423..5d3dc77 100644 --- a/.mod_data.yml +++ b/.mod_data.yml @@ -23,5 +23,8 @@ dependencies: # Configure dependencies url: http://taniwha.org/~bill/Shabby_v0.1.2.zip zip: true deploy: - GitHub: - enabled: true # activate/deactivate this deployment script \ No newline at end of file + - SpaceDock: + enabled: true # activate/deactivate this deployment script + mod-id: 2451 # The Spacedock mod ID for deployment + - GitHub: + enabled: true # activate/deactivate this deployment script \ No newline at end of file