mirror of
https://github.com/drewcassidy/KSP-Conformal-Decals.git
synced 2024-09-01 18:23:54 +00:00
Compare commits
9 Commits
Author | SHA1 | Date | |
---|---|---|---|
c653c9efc8 | |||
374fc8b753 | |||
88b2b4841a | |||
b2da56b1ca | |||
14bc694588 | |||
7e1b993d20 | |||
f8d692352d | |||
fa4b799788 | |||
970a69be11 |
2
.github/workflows/ff-release.yml
vendored
2
.github/workflows/ff-release.yml
vendored
@ -1,7 +1,7 @@
|
||||
name: Fast-Forward Release Branch
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
types: [created]
|
||||
|
||||
jobs:
|
||||
fast-forward:
|
||||
|
@ -1 +0,0 @@
|
||||
USE_SSM_CREDENTIALS: false
|
@ -1,34 +0,0 @@
|
||||
# Example annotated build data file
|
||||
mod-name: ConformalDecals
|
||||
package:
|
||||
include-dependencies: true # Include dependencies in the package
|
||||
included-gamedata: # Include these gamedata-level folders in packages:
|
||||
- ConformalDecals
|
||||
included-support: # Include these root-level files in packages
|
||||
- README.md
|
||||
- LICENSE-ART.md
|
||||
- LICENSE-SOURCE.md
|
||||
- changelog.txt
|
||||
dependencies: # Configure dependencies
|
||||
ModuleManager:
|
||||
location: url
|
||||
url: https://ksp.sarbian.com/jenkins/job/ModuleManager/159/artifact/ModuleManager.4.1.4.dll
|
||||
zip: false
|
||||
B9PartSwitch:
|
||||
location: url
|
||||
url: http://pileof.rocks/KSP/B9PartSwitch-v2.18.0.zip
|
||||
zip: true
|
||||
Shabby:
|
||||
location: url
|
||||
url: http://pileof.rocks/KSP/Shabby_v0.2.0.zip
|
||||
zip: true
|
||||
HarmonyKSP:
|
||||
location: url
|
||||
url: https://github.com/KSPModdingLibs/HarmonyKSP/releases/download/2.0.4.0/HarmonyKSP_2.0.4.0_for_KSP1.8+.zip
|
||||
zip: true
|
||||
deploy:
|
||||
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
|
11
CHANGELOG.md
11
CHANGELOG.md
@ -8,7 +8,16 @@ 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 |
|
||||
| author | Andrew Cassidy |
|
||||
|
||||
## Unreleased
|
||||
## 0.2.11 - 2022-10-30
|
||||
|
||||
### Fixed
|
||||
|
||||
- PR by LinuxGuruGamer:
|
||||
- Fixed nullref caused when an entry in `_targets` was null
|
||||
- Fixed memory leak caused by the OnDestroy() methods not being called due to them being virtual
|
||||
|
||||
|
||||
## 0.2.10 - 2022-03-14
|
||||
|
||||
### Fixed
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Conformal Decals
|
||||
[](https://creativecommons.org/licenses/by-sa/4.0/) [](https://www.gnu.org/licenses/gpl-3.0)
|
||||
[](https://creativecommons.org/licenses/by-sa/4.0/) [](https://www.gnu.org/licenses/gpl-3.0) [](https://github.com/KSP-CKAN/CKAN)
|
||||
|
||||

|
||||
|
||||
|
@ -283,7 +283,7 @@ namespace ConformalDecals {
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void OnDestroy() {
|
||||
public void OnDestroy() {
|
||||
// remove GameEvents
|
||||
if (HighLogic.LoadedSceneIsEditor) {
|
||||
GameEvents.onEditorPartEvent.Remove(OnEditorEvent);
|
||||
@ -440,7 +440,8 @@ namespace ConformalDecals {
|
||||
|
||||
// update projection
|
||||
foreach (var target in _targets) {
|
||||
target.Project(_orthoMatrix, decalProjectorTransform, _boundsRenderer.bounds, useBaseNormal);
|
||||
if (target != null)
|
||||
target.Project(_orthoMatrix, decalProjectorTransform, _boundsRenderer.bounds, useBaseNormal);
|
||||
}
|
||||
}
|
||||
else {
|
||||
@ -577,7 +578,8 @@ namespace ConformalDecals {
|
||||
|
||||
// render on each target object
|
||||
foreach (var target in _targets) {
|
||||
target.Render(_decalMaterial, part.mpb, camera);
|
||||
if (target != null)
|
||||
target.Render(_decalMaterial, part.mpb, camera);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -48,14 +48,12 @@ namespace ConformalDecals {
|
||||
UpdateFlag();
|
||||
}
|
||||
|
||||
public override void OnDestroy() {
|
||||
public void OnDestroy() {
|
||||
if (HighLogic.LoadedSceneIsEditor) {
|
||||
// Unregister flag change event
|
||||
GameEvents.onMissionFlagSelect.Remove(OnEditorFlagSelected);
|
||||
}
|
||||
|
||||
base.OnDestroy();
|
||||
}
|
||||
}
|
||||
|
||||
[KSPEvent(guiActive = false, guiActiveEditor = true, guiName = "#LOC_ConformalDecals_gui-select-flag")]
|
||||
public void SelectFlag() {
|
||||
|
@ -220,15 +220,13 @@ namespace ConformalDecals {
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDestroy() {
|
||||
public void OnDestroy() {
|
||||
if (HighLogic.LoadedSceneIsGame && _currentText != null) TextRenderer.UnregisterText(_currentText);
|
||||
|
||||
// close all UIs
|
||||
if (_textEntryController != null) _textEntryController.Close();
|
||||
if (_fillColorPickerController != null) _fillColorPickerController.Close();
|
||||
if (_outlineColorPickerController != null) _outlineColorPickerController.Close();
|
||||
|
||||
base.OnDestroy();
|
||||
}
|
||||
|
||||
protected override void OnDetach() {
|
||||
|
Reference in New Issue
Block a user