Skip to content

Commit

Permalink
Merge pull request sirkut#1 from MagicSmokeIndustries/develop
Browse files Browse the repository at this point in the history
Pulling latest changes from MSI
  • Loading branch information
ZiwKerman committed Apr 12, 2015
2 parents 1f94970 + 19f266b commit 2a00fd6
Show file tree
Hide file tree
Showing 18 changed files with 1,405 additions and 4 deletions.
13 changes: 9 additions & 4 deletions InfernalRobotics/InfernalRobotics/Module/MuMechToggle.cs
Original file line number Diff line number Diff line change
Expand Up @@ -943,15 +943,20 @@ public void Resized(float factor)
//translateMin *= factor;
//translateMax *= factor;

translation *= factor;
minTweak *= factor;
maxTweak *= factor;

// TweakScale considers the origin of the moving mesh as the part center
// so if translation!=0, the fixed mesh moves.
// Not sure what we'd have to do to repair that.
// The part center is the origin of the moving mesh
// so if translation!=0, the fixed mesh moves on rescale.
// We need to move the part back so the fixed mesh stays at the same place.
float gantryCorrection = part.name.Contains("Gantry") ? -1f : 1f;
transform.Translate(-translateAxis * translation * (factor-1f) * gantryCorrection);

if (HighLogic.LoadedSceneIsEditor)
translation *= factor;

// update the window so the new limits are applied
UpdateMinMaxTweaks();
UIPartActionWindow[] actionWindows = FindObjectsOfType<UIPartActionWindow>();
if (actionWindows.Length > 0)
{
Expand Down
1 change: 1 addition & 0 deletions Resources/Branding/FontToUse.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The Infernal Robotics Logo uses the Regular and Light version of the Aeromatics font. This font can be downloaded from: http://www.dafont.com/aero-matics.font
Binary file added Resources/Branding/Forum Logos/IR_Logo_Trans.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
101 changes: 101 additions & 0 deletions Resources/Branding/IR_Icon_InGame_Controller.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
153 changes: 153 additions & 0 deletions Resources/Branding/IR_Icon_InGame_Sequencer.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2a00fd6

Please sign in to comment.