mirror of
https://github.com/drewcassidy/KSP-Conformal-Decals.git
synced 2024-09-01 18:23:54 +00:00
Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
6db2d6b82a | |||
37715a46ab | |||
60cc0d76bb | |||
e7307f95e9 | |||
88da55123b | |||
eda04235c3 | |||
65031be081 | |||
0c7f6dd628 | |||
883c027a1a | |||
d51b240c6c | |||
91b5e584a6 | |||
44a5aec21e | |||
8e0a26f17c | |||
b48db63a27 | |||
c0d20f847d |
51
.github/workflows/ksp-publish.yml
vendored
51
.github/workflows/ksp-publish.yml
vendored
@ -6,15 +6,15 @@ jobs:
|
|||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Setup Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.12'
|
||||||
|
|
||||||
- name: Setup .NET Core SDK
|
- name: Setup .NET Core SDK
|
||||||
uses: actions/setup-dotnet@v1.7.2
|
uses: actions/setup-dotnet@v4.0.0
|
||||||
with:
|
with:
|
||||||
dotnet-version: '6.0.x'
|
dotnet-version: '6.0.x'
|
||||||
|
|
||||||
@ -25,7 +25,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Generate Version Info
|
- name: Generate Version Info
|
||||||
run: |
|
run: |
|
||||||
echo "VERSION_TITLE=$(yaclog show -n)" >> $GITHUB_ENV
|
yaclog show
|
||||||
python Scripts/version.py
|
python Scripts/version.py
|
||||||
yaclog-ksp -n "Conformal Decals"
|
yaclog-ksp -n "Conformal Decals"
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Download KSP Dependencies
|
- name: Download KSP Dependencies
|
||||||
run: |
|
run: |
|
||||||
wget http://taniwha.org/~bill/Shabby_v0.3.0.zip
|
wget https://pileof.rocks/KSP/Shabby_v0.3.0.zip
|
||||||
wget https://ksp.sarbian.com/jenkins/job/ModuleManager/161/artifact/ModuleManager.4.2.1.dll
|
wget https://ksp.sarbian.com/jenkins/job/ModuleManager/161/artifact/ModuleManager.4.2.1.dll
|
||||||
wget https://github.com/blowfishpro/B9PartSwitch/releases/download/v2.19.0/B9PartSwitch_v2.19.0.zip
|
wget https://github.com/blowfishpro/B9PartSwitch/releases/download/v2.19.0/B9PartSwitch_v2.19.0.zip
|
||||||
wget https://github.com/KSPModdingLibs/HarmonyKSP/releases/download/2.0.4.0/HarmonyKSP_2.0.4.0_for_KSP1.8+.zip
|
wget https://github.com/KSPModdingLibs/HarmonyKSP/releases/download/2.0.4.0/HarmonyKSP_2.0.4.0_for_KSP1.8+.zip
|
||||||
@ -59,22 +59,22 @@ jobs:
|
|||||||
mv HarmonyKSP/GameData/000_Harmony GameData/
|
mv HarmonyKSP/GameData/000_Harmony GameData/
|
||||||
|
|
||||||
- name: Upload Unbundled Build
|
- name: Upload Unbundled Build
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ConformalDecals-unbundled
|
name: ConformalDecals-unbundled
|
||||||
path: |
|
path: |
|
||||||
GameData/ConformalDecals
|
GameData/ConformalDecals/
|
||||||
README.md
|
README.md
|
||||||
CHANGELOG.md
|
CHANGELOG.md
|
||||||
LICENSE-ART.md
|
LICENSE-ART.md
|
||||||
LICENSE-SOURCE.md
|
LICENSE-SOURCE.md
|
||||||
|
|
||||||
- name: Upload Bundled Build
|
- name: Upload Bundled Build
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: ConformalDecals
|
name: ConformalDecals
|
||||||
path: |
|
path: |
|
||||||
GameData
|
GameData/
|
||||||
README.md
|
README.md
|
||||||
CHANGELOG.md
|
CHANGELOG.md
|
||||||
LICENSE-ART.md
|
LICENSE-ART.md
|
||||||
@ -87,12 +87,12 @@ jobs:
|
|||||||
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
|
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Setup Python
|
||||||
uses: actions/setup-python@v2
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.x'
|
python-version: '3.12'
|
||||||
|
|
||||||
- name: Install Python Tools
|
- name: Install Python Tools
|
||||||
run: |
|
run: |
|
||||||
@ -102,13 +102,14 @@ jobs:
|
|||||||
- name: Get version name and body
|
- name: Get version name and body
|
||||||
run: |
|
run: |
|
||||||
echo "VERSION_TITLE=$(yaclog show -n)" >> $GITHUB_ENV
|
echo "VERSION_TITLE=$(yaclog show -n)" >> $GITHUB_ENV
|
||||||
echo "$(yaclog show -mb)" >> RELEASE.md
|
yaclog show
|
||||||
|
|
||||||
- name: Download Build Artifacts
|
- name: Download Build Artifacts
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
|
|
||||||
- name: Zip Download Packages
|
- name: Zip Download Packages
|
||||||
run: |
|
run: |
|
||||||
|
set -u
|
||||||
mkdir bundled
|
mkdir bundled
|
||||||
mkdir unbundled
|
mkdir unbundled
|
||||||
zip -r bundled/ConformalDecals-$VERSION_TITLE.zip ConformalDecals/*
|
zip -r bundled/ConformalDecals-$VERSION_TITLE.zip ConformalDecals/*
|
||||||
@ -117,23 +118,25 @@ jobs:
|
|||||||
|
|
||||||
- name: Publish to Spacedock
|
- name: Publish to Spacedock
|
||||||
run: |
|
run: |
|
||||||
|
set -u
|
||||||
curl -F "username=drewcassidy" -F "password=${{ secrets.SPACEDOCK_PASS }}" \
|
curl -F "username=drewcassidy" -F "password=${{ secrets.SPACEDOCK_PASS }}" \
|
||||||
-c ./cookies "https://spacedock.info/api/login"
|
-c ./cookies "https://spacedock.info/api/login"
|
||||||
curl -c ./cookies -b ./cookies \
|
curl -c ./cookies -b ./cookies \
|
||||||
-F "version=$VERSION_TITLE" \
|
-F "version=$VERSION_TITLE" \
|
||||||
-F "changelog=$(yaclog show -mb)" \
|
-F "changelog=$(yaclog show -mb)" \
|
||||||
-F "game-version=1.12.3" \
|
-F "game-version=1.12.5" \
|
||||||
-F "notify-followers=yes" \
|
-F "notify-followers=yes" \
|
||||||
-F "zipball=@bundled/ConformalDecals-$VERSION_TITLE.zip" \
|
-F "zipball=@bundled/ConformalDecals-$VERSION_TITLE.zip" \
|
||||||
"https://spacedock.info/api/mod/2451/update"
|
"https://spacedock.info/api/mod/2451/update"
|
||||||
|
|
||||||
- name: Publish to Github
|
- name: Publish to Github
|
||||||
uses: softprops/action-gh-release@v1
|
run: |
|
||||||
with:
|
set -u
|
||||||
files: |
|
gh release create ${{ github.ref_name }} \
|
||||||
bundled/ConformalDecals-*.zip
|
--notes "$(yaclog show -mb)" \
|
||||||
|
--title "Conformal Decals $VERSION_TITLE" \
|
||||||
|
bundled/ConformalDecals-*.zip \
|
||||||
ConformalDecals/GameData/ConformalDecals/Versioning/ConformalDecals.version
|
ConformalDecals/GameData/ConformalDecals/Versioning/ConformalDecals.version
|
||||||
name: Conformal Decals ${{ env.VERSION_TITLE }}
|
|
||||||
body_path: RELEASE.md
|
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
@ -104,8 +104,5 @@
|
|||||||
|
|
||||||
ENDCG
|
ENDCG
|
||||||
}
|
}
|
||||||
|
|
||||||
// shadow casting support
|
|
||||||
UsePass "Legacy Shaders/VertexLit/SHADOWCASTER"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -105,8 +105,5 @@
|
|||||||
|
|
||||||
ENDCG
|
ENDCG
|
||||||
}
|
}
|
||||||
|
|
||||||
// shadow casting support
|
|
||||||
UsePass "Legacy Shaders/VertexLit/SHADOWCASTER"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
14
CHANGELOG.md
14
CHANGELOG.md
@ -8,6 +8,20 @@ All notable changes to this project will be documented in this file
|
|||||||
| website | https://forum.kerbalspaceprogram.com/index.php?/topic/194802-18-111-conformal-decals |
|
| website | https://forum.kerbalspaceprogram.com/index.php?/topic/194802-18-111-conformal-decals |
|
||||||
| author | Andrew Cassidy |
|
| author | Andrew Cassidy |
|
||||||
|
|
||||||
|
## 0.2.14 - 2024-06-25
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed parts showing as all black with the Deferred Rendering mod
|
||||||
|
|
||||||
|
|
||||||
|
## 0.2.13 - 2024-05-17
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Fixed flag decals sometimes not respecting image aspect ratio
|
||||||
|
|
||||||
|
|
||||||
## 0.2.12 - 2022-10-31
|
## 0.2.12 - 2022-10-31
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
Binary file not shown.
@ -8,7 +8,7 @@ Conformal Decals adds a set of decal stickers to KSP, as well as providing a fra
|
|||||||
## Dependencies
|
## Dependencies
|
||||||
|
|
||||||
Required:
|
Required:
|
||||||
- KSP (1.8.x to 1.10.x)
|
- KSP (1.8.x to 1.12.x)
|
||||||
- B9 Part Switch (2.18.0). Bundled with release.
|
- B9 Part Switch (2.18.0). Bundled with release.
|
||||||
- ModuleManager (4.1.4). Bundled with release.
|
- ModuleManager (4.1.4). Bundled with release.
|
||||||
- Shabby (0.2.0 unofficial build). Bundled with release.
|
- Shabby (0.2.0 unofficial build). Bundled with release.
|
||||||
|
@ -250,6 +250,7 @@ namespace ConformalDecals {
|
|||||||
if (HighLogic.LoadedSceneIsEditor) {
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
GameEvents.onEditorPartEvent.Add(OnEditorEvent);
|
GameEvents.onEditorPartEvent.Add(OnEditorEvent);
|
||||||
GameEvents.onVariantApplied.Add(OnVariantApplied);
|
GameEvents.onVariantApplied.Add(OnVariantApplied);
|
||||||
|
GameEvents.onEditorUndo.Add(OnEditorUndo);
|
||||||
|
|
||||||
UpdateTweakables();
|
UpdateTweakables();
|
||||||
}
|
}
|
||||||
@ -287,6 +288,7 @@ namespace ConformalDecals {
|
|||||||
if (HighLogic.LoadedSceneIsEditor) {
|
if (HighLogic.LoadedSceneIsEditor) {
|
||||||
GameEvents.onEditorPartEvent.Remove(OnEditorEvent);
|
GameEvents.onEditorPartEvent.Remove(OnEditorEvent);
|
||||||
GameEvents.onVariantApplied.Remove(OnVariantApplied);
|
GameEvents.onVariantApplied.Remove(OnVariantApplied);
|
||||||
|
GameEvents.onEditorUndo.Remove(OnEditorUndo);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (HighLogic.LoadedSceneIsFlight) {
|
if (HighLogic.LoadedSceneIsFlight) {
|
||||||
@ -350,6 +352,10 @@ namespace ConformalDecals {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void OnEditorUndo(ShipConstruct sc) {
|
||||||
|
UpdateTargets();
|
||||||
|
}
|
||||||
|
|
||||||
protected void OnPartWillDie(Part willDie) {
|
protected void OnPartWillDie(Part willDie) {
|
||||||
if (willDie == part.parent) {
|
if (willDie == part.parent) {
|
||||||
this.Log("Parent part about to be destroyed! Killing decal part.");
|
this.Log("Parent part about to be destroyed! Killing decal part.");
|
||||||
|
@ -114,6 +114,8 @@ namespace ConformalDecals {
|
|||||||
var ratio = DecalConfig.AspectRatios[textureURL];
|
var ratio = DecalConfig.AspectRatios[textureURL];
|
||||||
this.Log($"Overriding aspect ratio for {textureURL} with {ratio}");
|
this.Log($"Overriding aspect ratio for {textureURL} with {ratio}");
|
||||||
textureProperty.AspectRatio = ratio;
|
textureProperty.AspectRatio = ratio;
|
||||||
|
} else {
|
||||||
|
textureProperty.AspectRatio = -1.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
UpdateMaterials();
|
UpdateMaterials();
|
||||||
|
Reference in New Issue
Block a user