Skip to content

Commit

Permalink
Merge pull request #14 from Olympic1/develop
Browse files Browse the repository at this point in the history
v4.4
  • Loading branch information
Olympic1 authored Apr 11, 2017
2 parents 020b940 + e927161 commit 2e613f5
Show file tree
Hide file tree
Showing 17 changed files with 256 additions and 225 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,6 @@ $RECYCLE.BIN/

# Mac crap
.DS_Store

# Other
*.svg
9 changes: 9 additions & 0 deletions GameData/LTech/Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
v4.4 - 11 Apr 2017
------------------
* Performance updates
* Removed unnecessary saving
* Settings icon wasn't correctly updated in flight scene
* Updated ToolbarWrapper (again)
* Switched tech level of cameras with each other

v4.3 - 15 Dec 2016
------------------
* Fixed windows not always closing on scene changes
Expand All @@ -9,6 +17,7 @@ v4.2 - 26 Oct 2016
v4.1 - 12 Oct 2016
------------------
* Updated for KSP 1.2
* Performance updates
* Added abbreviation and hsp to resources
* Fixed TweakScale for airbrake
* Fixed loading RPM modules when not installed
Expand Down
2 changes: 1 addition & 1 deletion GameData/LTech/LTech.version
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{
"MAJOR":0,
"MINOR":4,
"PATCH":3,
"PATCH":4,
"BUILD":0
},
"KSP_VERSION":
Expand Down
4 changes: 2 additions & 2 deletions GameData/LTech/Parts/Science/ExtCamera/ExtCam1.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ PART

node_attach = 0.0, 0.0, 0.0, 0.0, -1.0, 0.0

TechRequired = scienceTech
TechRequired = electrics
entryCost = 1000
cost = 500
cost = 1500
category = Science
subcategory = 0
title = Kerb-I External Camera
Expand Down
4 changes: 2 additions & 2 deletions GameData/LTech/Parts/Science/ExtCamera/ExtCam2.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ PART

node_attach = 0.0, 0.0, 0.0, 0.0, -2.0, 0.0

TechRequired = electrics
TechRequired = scienceTech
entryCost = 1000
cost = 1500
cost = 500
category = Science
subcategory = 0
title = I-C External Camera
Expand Down
Binary file modified GameData/LTech/Plugins/LtScience.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion LTechContinued.netkan
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
],
"depends" :
[
{ "name" : "ModuleManager", "min_version" : "2.7.0" }
{ "name" : "ModuleManager", "min_version" : "2.7.5" }
],
"suggests" :
[
Expand Down
72 changes: 40 additions & 32 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,76 @@

L-Tech Sciencific Industries is a mod designed to add to the career mode of Kerbal Space Program by providing new ways to generate science, aswell as experimenting with new device types.

[![][shield:ksp]][KSP:website]
[![][shield:ksp]][site:ksp]
[![][shield:ckan]][thread:ckan]
[![][shield:mit]][link:license]
[![][shield:mit]][file:license]

[![][logo:ltech]][thread:ltech]

#### Creators
### Creators
* [ludsoe](http://forum.kerbalspaceprogram.com/index.php?/profile/6624-ludsoe/) (Code)
* [Dungchunker](http://forum.kerbalspaceprogram.com/index.php?/profile/67255-dungchunker/) (Models)

#### Maintainers
### Maintainers
* [Olympic1](http://forum.kerbalspaceprogram.com/index.php?/profile/79730-olympic1/)
* [linuxgurugamer](http://forum.kerbalspaceprogram.com/index.php?/profile/129964-linuxgurugamer/)

#### Required Mods
### Required Mods
* [Module Manager](http://forum.kerbalspaceprogram.com/index.php?/topic/50533-mm)

#### Supported Mods
### Supported Mods
* [Alternate Resource Panel](http://forum.kerbalspaceprogram.com/index.php?/topic/54876-arp/)
* [Connected Living Space](http://forum.kerbalspaceprogram.com/index.php?/topic/109972-cls)
* [HullCam VDS](http://forum.kerbalspaceprogram.com/index.php?/topic/145633-vds)
* [Kerbal Inventory System](http://forum.kerbalspaceprogram.com/index.php?/topic/101928-kis)
* [RasterPropMonitor](http://forum.kerbalspaceprogram.com/index.php?/topic/105821-rpm)
* [Snacks](https://github.com/Angel-125/Snacks/releases)
* [Snacks](https://github.com/Angel-125/Snacks)

#### Incompatible Mods
### Incompatible Mods
* [[x] Science!](http://forum.kerbalspaceprogram.com/index.php?/topic/107661-science)
* [KEI](http://forum.kerbalspaceprogram.com/index.php?/topic/143433-kei)

#### New in v0.4.3
* Fixed windows not always closing on scene changes

#### Downloads
* [![][GH:logo]][GH:url]
* [![][DB:logo]][DB:url]
* [![][OD:logo]][OD:url]
* [![][BX:logo]][BX:url]
* [![][SD:logo]][SD:url]
### New in v0.4.4
* Performance updates
* Removed unnecessary saving
* Settings icon wasn't correctly updated in flight scene
* Updated ToolbarWrapper (again)
* Switched tech level of cameras with each other

### Downloads
* [![][image:dropbox]][release:dropbox]
* [![][image:onedrive]][release:onedrive]
* [![][image:box]][release:box]
* [![][image:github]][release:github]
* [![][image:spacedock]][release:spacedock]
* [![][image:ckan]][release:ckan]

### License
This work is licensed under the MIT License.



[KSP:website]: https://kerbalspaceprogram.com/
[thread:ckan]: http://forum.kerbalspaceprogram.com/index.php?/topic/143140-ckan
[link:license]: https://github.com/Olympic1/L-Tech/blob/master/LICENSE.txt
[site:ksp]: https://kerbalspaceprogram.com/
[thread:ckan]: http://forum.kerbalspaceprogram.com/index.php?/topic/154922-ckan/
[file:license]: https://github.com/Olympic1/L-Tech/blob/master/LICENSE.txt

[shield:ksp]: https://img.shields.io/badge/KSP-v1.2.2-green.svg
[shield:ksp]: https://img.shields.io/badge/KSP-v1.2.x-green.svg
[shield:ckan]: https://img.shields.io/badge/CKAN-Indexed-brightgreen.svg
[shield:mit]: https://img.shields.io/badge/License-MIT-blue.svg

[logo:ltech]: https://github.com/Olympic1/L-Tech/blob/master/GameData/LTech/Flags/LTechScience.png
[thread:ltech]: http://forum.kerbalspaceprogram.com/index.php?/topic/49319-ltech

[GH:url]: https://github.com/Olympic1/L-Tech/releases
[GH:logo]: http://i59.tinypic.com/2i11u2d.jpg
[DB:url]: https://www.dropbox.com/s/fub7gk0z6i3uw8q/L-Tech_Scientific_Industries_Continued-v0.4.3.0.zip?dl=0
[DB:logo]: http://i60.tinypic.com/70jj43.jpg
[OD:url]: https://1drv.ms/u/s!AlH25jPUX2gF2mY-Qq4cCu8-g-Ih
[OD:logo]: http://i67.tinypic.com/169lvds.png
[BX:url]: https://app.box.com/s/7k0wnubhektrwdg8yh2rcojviboqeca5
[BX:logo]: http://i68.tinypic.com/2zxur92.png

[SD:url]: https://spacedock.info/mod/227
[SD:logo]: http://i65.tinypic.com/ot0ks9.jpg
[release:dropbox]: https://www.dropbox.com/s/pi18d81k59eean5/L-Tech_Scientific_Industries_Continued-v0.4.4.0.zip?dl=0
[release:onedrive]: https://1drv.ms/u/s!AlH25jPUX2gF5DDRDbVwl9lHwjgd
[release:box]: https://app.box.com/s/zu04fx49iabbf1ibttng19ig98mf8cys
[release:github]: https://github.com/Olympic1/L-Tech/releases/latest
[release:spacedock]: https://spacedock.info/mod/227
[release:ckan]: http://forum.kerbalspaceprogram.com/index.php?/topic/154922-ckan/

[image:dropbox]: http://i60.tinypic.com/70jj43.jpg
[image:onedrive]: http://i67.tinypic.com/169lvds.png
[image:box]: http://i68.tinypic.com/2zxur92.png
[image:github]: http://i59.tinypic.com/2i11u2d.jpg
[image:spacedock]: http://i65.tinypic.com/ot0ks9.jpg
[image:ckan]: http://i59.tinypic.com/jidcvk.jpg
6 changes: 1 addition & 5 deletions Source/LtScience/APIClients/ToolbarWrapper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -830,11 +830,7 @@ internal static Type getType(string name)
type = t;
});

if (type != null)
{
return type;
}
return null;
return type;
}

internal static PropertyInfo getProperty(Type type, string name)
Expand Down
4 changes: 2 additions & 2 deletions Source/LtScience/InternalObjects/LtToolTips.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ private static void ShowToolTip(Vector2 toolTipPos, string toolTip)
{
if (LtSettings.showToolTips && (toolTip != null) && (toolTip.Trim().Length > 0))
{
Vector2 size = LtAddon.ToolTipStyle.CalcSize(new GUIContent(toolTip));
Vector2 size = LtStyle.ToolTipStyle.CalcSize(new GUIContent(toolTip));
_position = new Rect(toolTipPos.x, toolTipPos.y, size.x, size.y);
RepositionToolTip();
GUI.Window(0, _position, EmptyWindow, toolTip, LtAddon.ToolTipStyle);
GUI.Window(0, _position, EmptyWindow, toolTip, LtStyle.ToolTipStyle);
GUI.BringWindowToFront(0);
}
}
Expand Down
2 changes: 1 addition & 1 deletion Source/LtScience/LTSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ internal static void LoadSettings()
}

// Force styles to refresh/load
LtAddon.WindowStyle = null;
LtStyle.WindowStyle = null;

// Lets make sure that the windows can be seen on the screen
LtAddon.RepositionWindows();
Expand Down
Loading

0 comments on commit 2e613f5

Please sign in to comment.