Skip to content

Commit

Permalink
Merge pull request #365 from ihsoft/next
Browse files Browse the repository at this point in the history
Release v1.26
  • Loading branch information
ihsoft authored Jul 19, 2020
2 parents 35d3c47 + e211d5e commit 246e349
Show file tree
Hide file tree
Showing 52 changed files with 908 additions and 125 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
Source/obj
Source/bin
**/*.wrk
.DS_Store
166 changes: 166 additions & 0 deletions ArtSources/fun_snacks.part/KIS_snacks.obj
Original file line number Diff line number Diff line change
@@ -0,0 +1,166 @@
# Blender v2.79 (sub 0) OBJ File: 'KIS_snacks.blend'
# www.blender.org
mtllib KIS_snacks.mtl
o Chocolate_Cube
v -0.032118 0.001519 -0.074304
v -0.032118 -0.001519 -0.074304
v 0.032118 -0.001519 -0.074304
v 0.032118 0.001519 -0.074304
v -0.034173 0.000571 -0.083766
v -0.034173 -0.000571 -0.083766
v 0.034173 -0.000571 -0.083766
v 0.034173 0.000571 -0.083766
v -0.030630 -0.005174 -0.070545
v -0.031954 -0.003850 -0.070545
v -0.031954 0.003850 -0.070545
v -0.030630 0.005174 -0.070545
v 0.031954 -0.003850 -0.070545
v 0.030630 -0.005174 -0.070545
v 0.030630 0.005174 -0.070545
v 0.031954 0.003850 -0.070545
v -0.029261 -0.005174 0.069221
v -0.029809 -0.003850 0.070545
v -0.030630 -0.005174 0.067852
v -0.031954 -0.003850 0.068400
v -0.030630 0.005174 0.067852
v -0.031954 0.003850 0.068400
v -0.029261 0.005174 0.069221
v -0.029809 0.003850 0.070545
v 0.030630 -0.005174 0.067852
v 0.031954 -0.003850 0.068400
v 0.029261 -0.005174 0.069221
v 0.029809 -0.003850 0.070545
v 0.029261 0.005174 0.069221
v 0.029809 0.003850 0.070545
v 0.030630 0.005174 0.067852
v 0.031954 0.003850 0.068400
vt 0.709109 0.018475
vt 0.709109 0.052912
vt 0.695543 0.052912
vt 0.695543 0.018475
vt 0.695543 0.018474
vt 0.695543 0.052912
vt 0.074080 0.052912
vt 0.074080 0.018474
vt 0.177844 0.492600
vt 0.176021 0.126130
vt 0.922918 0.122596
vt 0.931514 0.131289
vt 0.927749 0.488354
vt 0.918871 0.496609
vt 0.709109 0.018474
vt 0.709109 0.052912
vt 0.057252 0.028901
vt 0.057252 0.042485
vt 0.013946 0.038246
vt 0.013946 0.033140
vt 0.142352 0.109298
vt 0.142353 0.509601
vt 0.083094 0.522411
vt 0.083093 0.096489
vt 0.057252 0.028901
vt 0.074081 0.018474
vt 0.074081 0.052912
vt 0.057252 0.042485
vt 0.178600 0.945906
vt 0.176636 0.579732
vt 0.922932 0.575914
vt 0.931525 0.584597
vt 0.927898 0.941373
vt 0.919031 0.949625
vt 0.083938 0.975729
vt 0.076510 0.975729
vt 0.076343 0.550151
vt 0.083771 0.550151
vt 0.013946 0.038246
vt 0.013946 0.033141
vt 0.142987 0.562927
vt 0.143144 0.962907
vt 0.988541 0.052633
vt 0.724660 0.052633
vt 0.724660 0.018553
vt 0.988541 0.018553
vt 0.176292 0.958893
vt 0.173878 0.113418
vt 0.174490 0.567031
vt 0.175529 0.505597
vt 0.939862 0.946653
vt 0.924657 0.962201
vt 0.928120 0.110082
vt 0.943413 0.125601
vt 0.939721 0.493642
vt 0.924497 0.509197
vt 0.928126 0.563407
vt 0.943413 0.578908
vn 0.7071 0.0000 0.7071
vn -1.0000 0.0000 0.0000
vn -0.9999 0.0000 0.0171
vn 0.0000 1.0000 0.0000
vn -0.7071 0.0000 0.7071
vn -0.9936 0.0000 0.1130
vn -0.9772 0.0000 0.2123
vn 0.0000 0.9950 -0.0997
vn 0.9936 0.0000 0.1130
vn 0.9999 0.0000 0.0171
vn 0.0000 -1.0000 0.0000
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn 0.9772 0.0000 0.2123
vn 0.0000 -0.9950 -0.0997
vn 0.0000 0.7169 -0.6972
vn 0.0000 0.0000 1.0000
vn 0.0000 -0.7169 -0.6972
vn -0.7007 -0.7007 -0.1338
vn -0.6906 -0.6906 -0.2145
vn -0.6548 -0.6548 -0.3776
vn -0.6906 0.6906 -0.2145
vn -0.7007 0.7007 -0.1338
vn -0.6548 0.6548 -0.3776
vn 0.6906 -0.6906 -0.2145
vn 0.7007 -0.7007 -0.1338
vn 0.6548 -0.6548 -0.3776
vn 0.7007 0.7007 -0.1338
vn 0.6906 0.6906 -0.2145
vn 0.6548 0.6548 -0.3776
vn -0.5000 -0.7071 0.5000
vn -0.5000 0.7071 0.5000
vn 0.5000 0.7071 0.5000
vn 0.5000 -0.7071 0.5000
vn -0.7071 -0.7071 0.0000
vn 0.7071 -0.7071 0.0000
vn 0.0000 -0.7071 0.7071
vn -0.7071 0.7071 0.0000
vn 0.0000 0.7071 0.7071
vn 0.7071 0.7071 0.0000
usemtl None
s 1
f 30/1/1 28/2/1 26/3/1 32/4/1
f 20/5/2 22/6/2 11/7/3 10/8/3
f 15/9/4 12/10/4 21/11/4 23/12/4 29/13/4 31/14/4
f 18/15/5 24/16/5 22/6/5 20/5/5
f 2/17/6 1/18/6 5/19/7 6/20/7
f 1/21/8 4/22/8 8/23/8 5/24/8
f 4/25/9 16/26/10 13/27/10 3/28/9
f 9/29/11 14/30/11 25/31/11 27/32/11 17/33/11 19/34/11
f 13/27/10 16/26/10 32/4/12 26/3/12
f 6/35/13 5/36/13 8/37/13 7/38/13
f 4/25/9 3/28/9 7/39/14 8/40/14
f 3/41/15 2/42/15 6/35/15 7/38/15
f 1/21/16 12/10/16 15/9/16 4/22/16
f 18/43/17 28/44/17 30/45/17 24/46/17
f 3/41/18 14/30/18 9/29/18 2/42/18
f 9/29/19 10/47/20 2/42/21
f 11/48/22 12/10/23 1/21/24
f 13/49/25 14/30/26 3/41/27
f 15/9/28 16/50/29 4/22/30
f 19/34/31 17/33/31 18/51/31 20/52/31
f 23/12/32 21/11/32 22/53/32 24/54/32
f 31/14/33 29/13/33 30/55/33 32/56/33
f 27/32/34 25/31/34 26/57/34 28/58/34
f 20/52/35 10/47/20 9/29/19 19/34/35
f 13/49/25 26/57/36 25/31/36 14/30/26
f 28/58/37 18/51/37 17/33/37 27/32/37
f 21/11/38 12/10/23 11/48/22 22/53/38
f 29/13/39 23/12/39 24/54/39 30/55/39
f 32/56/40 16/50/29 15/9/28 31/14/40
f 2/17/6 10/8/3 11/7/3 1/18/6
Binary file not shown.
9 changes: 9 additions & 0 deletions ArtSources/fun_snacks.part/LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Sound sample

The sound for this fun part (`snacks.ogg`) was obtained from [this source](https://lasonotheque.org/detail-0352-bruits-de-bouche-1.html).
It's distributed under `CC0 1.0 Universal, Public Domain Dedication` license.

# Model, textures, and part CFG

The original author of these resources is [@Well](https://forum.kerbalspaceprogram.com/index.php?/profile/145290-well/),
who is releasing the resources under `Public Domain` license.
7 changes: 7 additions & 0 deletions ArtSources/fun_snacks.part/Readme.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@

ʕ•ᴥ•ʔ SNACKS! °(ᵔᴥᵔ)°

This little fun part is made by Stéphane Colombain @Well
Inspired by the 1.10 promo picture

Gift for KIS Modder @IgorZ and KSP community
Binary file added ArtSources/fun_snacks.part/snacks.psd
Binary file not shown.
Binary file not shown.
10 changes: 5 additions & 5 deletions Binaries/KSPDev_Utils.2.2.xml → Binaries/KSPDev_Utils.2.4.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Binaries/MiniAVC-V2.dll
Binary file not shown.
19 changes: 7 additions & 12 deletions Binaries/KSP-AVC.version → Binaries/MiniAVC-V2.version
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
{
"NAME": "KSP-AVC Plugin",
"URL": "http://ksp.spacetux.net/avc/KSP-AVC",
"NAME": "MiniAVC-V2 Plugin",
"URL": "http://ksp.spacetux.net/avc/MiniAVC-V2",
"DOWNLOAD": "https://github.com/linuxgurugamer/KSPAddonVersionChecker/releases",
"GITHUB": {
"USERNAME": "linuxgurugamer",
"REPOSITORY": "KSPAddonVersionChecker"
},
"VERSION": {
"MAJOR": 1,
"MINOR": 2,
"MAJOR": 2,
"MINOR": 0,
"PATCH": 0,
"BUILD": 7
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 5,
"PATCH": 1
"BUILD": 0
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
"MINOR": 5,
"PATCH": 1
"MINOR": 8,
"PATCH": 0
}
}
Binary file removed Binaries/MiniAVC.dll
Binary file not shown.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 1.26 (July 18th, 2020):
* [Change] Switch to `MiniAVC-V2`.
* [Enhancement] Add a new fun part: Snacks!
* [Enhancement] Add a new fun part: Fallen Kerbonaut. FYI, there is a real life prototype for this part.
* [Enhancement] Add storage lockers parts. They used to be a part of the defunc SEP mod.
* [Enhancement #360] Use fuel type from the config for the EVA fuel canister.
* [Fix #362] Tab Key in Map View crashes the game.
* [Fix #364] KSP 1.10: Carriable items cannot be equipped.

# 1.25 (April 25th, 2020):
* [Change] Stop complaining about KSP minor version change.
* [Change] Update ES-ES localization.
Expand Down
Binary file modified Deps/CommunityCategoryKit/CCK.dll
Binary file not shown.
38 changes: 19 additions & 19 deletions Deps/CommunityCategoryKit/CCK.version
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
"REPOSITORY": "CommunityCategoryKit",
"USERNAME": "BobPalmer"
},
"KSP_VERSION":{
"MAJOR":1,
"MINOR":8,
"PATCH":0
},
"KSP_VERSION_MIN":{
"MAJOR":1,
"MINOR":8,
"PATCH":0
},
"KSP_VERSION_MAX":{
"MAJOR":1,
"MINOR":8,
"PATCH":9
},
"KSP_VERSION": {
"MAJOR": 1,
"MINOR": 9,
"PATCH": 1
},
"KSP_VERSION_MAX": {
"MAJOR": 1,
"MINOR": 99,
"PATCH": 99
},
"KSP_VERSION_MIN": {
"MAJOR": 1,
"MINOR": 8,
"PATCH": 0
},
"NAME": "Community Category Kit",
"URL": "https://raw.githubusercontent.com/BobPalmer/CommunityCategoryKit/master/FOR_RELEASE/GameData/CommunityCategoryKit/CCK.version",
"VERSION": {
"BUILD": 0,
"MAJOR": 5,
"MINOR": 0,
"PATCH": 0,
"BUILD": 0
}
"MINOR": 1,
"PATCH": 0
}
}
Binary file removed Deps/ModuleManager.4.1.3.dll
Binary file not shown.
Binary file added Deps/ModuleManager.4.1.4.dll
Binary file not shown.
6 changes: 3 additions & 3 deletions KIS.version
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
"NAME": "Kerbal Inventory System",
"URL": "https://raw.githubusercontent.com/ihsoft/KIS/master/KIS.version",
"VERSION": {
"BUILD": 31998,
"BUILD": 42051,
"MAJOR": 1,
"MINOR": 25,
"PATCH": 7420
"MINOR": 26,
"PATCH": 7504
}
}
Loading

0 comments on commit 246e349

Please sign in to comment.