Skip to content

Unfork various fixes and additions #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sovetskysoyuz wants to merge 58 commits into
base: master
Choose a base branch
from
Open

Unfork various fixes and additions #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
e6436c0
Initial set of changes from before fork
sovetskysoyuz Feb 11, 2021
49a0715
Add function for circularizing that accepts hyperbolic orbits
sovetskysoyuz Feb 11, 2021
5822f00
Add function for circularizing that accepts hyperbolic orbits
sovetskysoyuz Feb 11, 2021
3a64b2d
Merge branch 'Hyperbolics' of https://github.com/sovetskysoyuz/Avioni…
sovetskysoyuz Feb 11, 2021
e8851b0
Catch up
sovetskysoyuz Feb 11, 2021
f86b40f
Reverting hyperbolic changes split into own branch
sovetskysoyuz Feb 11, 2021
e586665
Merge branch 'Hyperbolics'
sovetskysoyuz Feb 11, 2021
6826567
Changes to enable using MAS in ProbeControlRoom IVA
sovetskysoyuz Feb 11, 2021
cf3fb21
Addition to FlightComputer
sovetskysoyuz Feb 11, 2021
03502a3
Removing changes split into PCR branch
sovetskysoyuz Feb 11, 2021
6b236e3
Change to FlightComputer
sovetskysoyuz Feb 11, 2021
af94b00
x
sovetskysoyuz Feb 11, 2021
ecab447
Remove extra files
sovetskysoyuz Feb 11, 2021
dda156d
Add UpdateOwnDockingPorts()
sovetskysoyuz Feb 11, 2021
fdb0dd5
Remove UpdateOwnDockingPorts
sovetskysoyuz Feb 11, 2021
29fb75e
Removed logging
sovetskysoyuz Feb 11, 2021
bc6f2ea
Add CreateTypeAlarm
sovetskysoyuz Feb 11, 2021
0dae671
Removed KAC changes split into other branch
sovetskysoyuz Feb 11, 2021
c0d64dc
Address infinite UT bug
sovetskysoyuz Feb 11, 2021
b2c5614
Add logging for UpdateNeighboringVessels
sovetskysoyuz Feb 11, 2021
b588f3b
Undo changes split into Debugging
sovetskysoyuz Feb 11, 2021
eee22f3
Add ClearOneManeuverNode
sovetskysoyuz Feb 11, 2021
ba6a209
Undo more split changes (ClearOneNode)
sovetskysoyuz Feb 11, 2021
f4e4c4e
Remove extra files
sovetskysoyuz Feb 11, 2021
8059d99
Remove extra file
sovetskysoyuz Feb 11, 2021
b713ce0
Merge pull request #1 from sovetskysoyuz/KACAlarms
sovetskysoyuz Feb 11, 2021
0a8986c
Merge pull request #2 from sovetskysoyuz/ProbeControlRoomCompat
sovetskysoyuz Feb 11, 2021
6d05db3
Add SetNextDockToReference
sovetskysoyuz Feb 11, 2021
0e16580
Merge pull request #3 from sovetskysoyuz/DockingPorts
sovetskysoyuz Feb 11, 2021
14b4055
Merge branch 'master' into DebuggingVarious
sovetskysoyuz Feb 11, 2021
3740cda
Merge pull request #4 from sovetskysoyuz/DebuggingVarious
sovetskysoyuz Feb 11, 2021
994d348
Merge pull request #5 from sovetskysoyuz/ClearOneNode
sovetskysoyuz Feb 11, 2021
65712b6
Added missing comment
sovetskysoyuz Feb 11, 2021
ecc790a
Merge pull request #6 from sovetskysoyuz/DockingPorts
sovetskysoyuz Feb 11, 2021
b92c5fb
Update build rules
sovetskysoyuz Feb 11, 2021
5452268
Build Changes
sovetskysoyuz Feb 12, 2021
28bc95b
Merge remote-tracking branch 'upstream/master' into 2023
sovetskysoyuz Jul 26, 2023
0fc3c9f
remove duplicate infinity fix
sovetskysoyuz Jul 26, 2023
c3a3d4f
Only clear a maneuver node if there's one to clear
sovetskysoyuz Jul 29, 2023
93eea34
Implement AtmosphereAutopilot functionality
sovetskysoyuz Jul 29, 2023
665caed
Fix errors or unintended behaviour for ASET props
sovetskysoyuz Aug 3, 2023
85bc182
Add docking port functionality to stock, mod ports
sovetskysoyuz Aug 3, 2023
42bd73a
Add audio functionality to MAS_Tablo_Alarm props
sovetskysoyuz Aug 3, 2023
ecbb0bb
Make RPM internals use more MAS-configured props
sovetskysoyuz Aug 3, 2023
7c4f0c1
New set of props for landing in IVA
sovetskysoyuz Aug 3, 2023
1b42350
Additional single/double NASA Gauges
sovetskysoyuz Aug 3, 2023
a5a34a6
Elec_Output should use its LUA script
sovetskysoyuz Aug 3, 2023
a147f65
Additional flag indicators
sovetskysoyuz Aug 3, 2023
6908397
Additional SignalLamps
sovetskysoyuz Aug 3, 2023
b77be5c
Miscellaneous new props
sovetskysoyuz Aug 3, 2023
a96ed7a
New props and LUA for FMS functions
sovetskysoyuz Aug 3, 2023
2315cc2
New props and LUA for AtmosphereAutopilot
sovetskysoyuz Aug 3, 2023
ce45186
New props and LUA for KAC
sovetskysoyuz Aug 3, 2023
bcda67b
New props for STS_MissionTimer
sovetskysoyuz Aug 3, 2023
5cac768
New prop to change docking port reference
sovetskysoyuz Aug 3, 2023
44f78af
Undo local .csproj changes
sovetskysoyuz Aug 3, 2023
61e0c40
Undo commits related to AtmosphereAutopilot
sovetskysoyuz Aug 3, 2023
11f5262
Remove extra summary tag causing error on build
sovetskysoyuz Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions GameData/MOARdV/MAS_ASET/ASET_ClockTimer/ASET_ClockTimer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,9 @@ PROP
transform = Seconds_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.SecondsOfMinute(fc.UT())
range = 0, 60
variable = fc.UT() % 21600
range = 0, 21600
modulo = 60
blend = true
speed = 1.0
longPath = true
Expand All @@ -67,8 +68,9 @@ PROP
transform = Minutes_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.MinutesOfHour(fc.UT())
range = 0, 60
variable = fc.UT() % 21600
range = 0, 21600
modulo = 3600
blend = true
speed = 1.0
longPath = true
Expand All @@ -93,8 +95,9 @@ PROP
transform = TimerArrowSecObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.SecondsOfMinute(fc.GetPersistentAsNumber("%AUTOID%-TimerValue"))
range = 0, 60
variable = fc.GetPersistentAsNumber("%AUTOID%-TimerValue")
range = 0, 21600
modulo = 60
blend = true
speed = 1.0
longPath = true
Expand All @@ -105,8 +108,9 @@ PROP
transform = TimerArrowMinObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.MinutesOfHour(fc.GetPersistentAsNumber("%AUTOID%-TimerValue"))
range = 0, 60
variable = fc.GetPersistentAsNumber("%AUTOID%-TimerValue")
range = 0, 21600
modulo = 3600
blend = true
speed = 1.0
longPath = true
Expand Down
149 changes: 149 additions & 0 deletions GameData/MOARdV/MAS_ASET/ASET_ClockTimer/MAS_LandingBurnTimer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
PROP
{
name = MAS_LandingBurnTimer
MODEL
{
model = ASET/ASET_Props/Instruments/ASET_ClockTimer/ASET_ClockTimer
}

MODULE
{
name = MASComponent

// Kerbin or Earth time scale -----------------------------------------
TRANSLATION
{
name = Earth time
transform = EarthScaleObj
startTranslation = 0,0,0
endTranslation = 0,-0.003,0
variable = fc.KerbinTime()
}
TRANSLATION
{
name = Kerbin time
transform = KerbinClockScaleObj
startTranslation = 0,-0.003,0
endTranslation = 0,0,0
variable = fc.KerbinTime()
}

// backlight ----------------------------------------------------------
COLOR_SHIFT
{
name = Instrument Lighting
transform = MainScaleObj, EarthScaleObj, KerbinClockScaleObj, Labels_and_TimerScaleObj
passiveColor = COLOR_ASET_AIRCRAFTGAUGESCALE_PASSIVECOLOR
activeColor = COLOR_ASET_AIRCRAFTGAUGESCALE_ACTIVECOLOR
variable = fc.Conditioned(fc.GetPersistentAsNumber("Backlight"))
blend = true
}
COLOR_SHIFT
{
name = Component Lighting
transform = TimerButtonLabelObj, Hours_arrowObj, Minutes_arrowObj, Seconds_arrowObj, TimerArrowSecObj, TimerArrowMinObj
passiveColor = COLOR_ASET_AIRCRAFTGAUGEHAND_PASSIVECOLOR
activeColor = COLOR_ASET_AIRCRAFTGAUGEHAND_ACTIVECOLOR
variable = fc.Conditioned(fc.GetPersistentAsNumber("Backlight"))
blend = true
}

// Clock Hands --------------------------------------------------------
ROTATION
{
name = Second hand
transform = Seconds_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.Conditioned(fc.SuicideBurnTime())
range = 0, 21600
blend = true
speed = 1.0
longPath = true
modulo = 60
}
ROTATION
{
name = Minute hand
transform = Minutes_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.Conditioned(fc.SuicideBurnTime())
range = 0, 21600
blend = true
speed = 1.0
longPath = true
modulo = 3600
}
ROTATION
{
name = Hour hand
transform = Hours_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.Conditioned(fc.HourOfDay(fc.SuicideBurnTime()))
range = 0, fc.HoursPerDay()
blend = true
speed = 1.0
longPath = true
}

// Timer Hands --------------------------------------------------------
// ROTATION
// {
// name = Timer Second hand
// transform = TimerArrowSecObj
// startRotation = 0,0,0
// endRotation = 0,360,0
// variable = fc.SecondsOfMinute(fc.GetPersistentAsNumber("%AUTOID%-TimerValue"))
// range = 0, 60
// blend = true
// speed = 1.0
// longPath = true
// }
// ROTATION
// {
// name = Timer Minute hand
// transform = TimerArrowMinObj
// startRotation = 0,0,0
// endRotation = 0,360,0
// variable = fc.MinutesOfHour(fc.GetPersistentAsNumber("%AUTOID%-TimerValue"))
// range = 0, 60
// blend = true
// speed = 1.0
// longPath = true
// }

// // Timer Control ------------------------------------------------------
// COLLIDER_EVENT
// {
// name = Timer button
// collider = StartColl
// onClick = fc.AddPersistentWrapped("%AUTOID%-TimerMode", 1, 0, 3)
// sound = ASET/ASET_Props/Sounds/AnalogTimerButton
// volume = 0.5
// }
// TRANSLATION
// {
// name = Timer flag
// transform = TimerON_flagObj
// startTranslation = 0,0,0
// endTranslation = 0,0,-0.005
// variable = fc.GetPersistentAsNumber("%AUTOID%-TimerMode") == 1
// }
// TRIGGER_EVENT
// {
// name = Timer Initialize
// event = fc.SetPersistent("%AUTOID%-TimerValue", 0)
// exitEvent = fc.SetPersistent("%AUTOID%-TimerStart", fc.UT())
// variable = fc.GetPersistentAsNumber("%AUTOID%-TimerMode") == 0
// }
// TRIGGER_EVENT
// {
// name = Timer Update
// event = fc.SetPersistent("%AUTOID%-TimerValue", fc.UT() - fc.GetPersistentAsNumber("%AUTOID%-TimerStart"))
// variable = fc.GetPersistentAsNumber("%AUTOID%-TimerMode") == 1
// autoRepeat = true
// }
}
}
149 changes: 149 additions & 0 deletions GameData/MOARdV/MAS_ASET/ASET_ClockTimer/MAS_LandingTimer.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
PROP
{
name = MAS_LandingTimer
MODEL
{
model = ASET/ASET_Props/Instruments/ASET_ClockTimer/ASET_ClockTimer
}

MODULE
{
name = MASComponent

// Kerbin or Earth time scale -----------------------------------------
TRANSLATION
{
name = Earth time
transform = EarthScaleObj
startTranslation = 0,0,0
endTranslation = 0,-0.003,0
variable = fc.KerbinTime()
}
TRANSLATION
{
name = Kerbin time
transform = KerbinClockScaleObj
startTranslation = 0,-0.003,0
endTranslation = 0,0,0
variable = fc.KerbinTime()
}

// backlight ----------------------------------------------------------
COLOR_SHIFT
{
name = Instrument Lighting
transform = MainScaleObj, EarthScaleObj, KerbinClockScaleObj, Labels_and_TimerScaleObj
passiveColor = COLOR_ASET_AIRCRAFTGAUGESCALE_PASSIVECOLOR
activeColor = COLOR_ASET_AIRCRAFTGAUGESCALE_ACTIVECOLOR
variable = fc.Conditioned(fc.GetPersistentAsNumber("Backlight"))
blend = true
}
COLOR_SHIFT
{
name = Component Lighting
transform = TimerButtonLabelObj, Hours_arrowObj, Minutes_arrowObj, Seconds_arrowObj, TimerArrowSecObj, TimerArrowMinObj
passiveColor = COLOR_ASET_AIRCRAFTGAUGEHAND_PASSIVECOLOR
activeColor = COLOR_ASET_AIRCRAFTGAUGEHAND_ACTIVECOLOR
variable = fc.Conditioned(fc.GetPersistentAsNumber("Backlight"))
blend = true
}

// Clock Hands --------------------------------------------------------
ROTATION
{
name = Second hand
transform = Seconds_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.Conditioned(fc.LandingTime())
range = 0, 21600
blend = true
speed = 1.0
longPath = true
modulo = 60
}
ROTATION
{
name = Minute hand
transform = Minutes_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.Conditioned(fc.LandingTime())
range = 0, 21600
blend = true
speed = 1.0
longPath = true
modulo = 3600
}
ROTATION
{
name = Hour hand
transform = Hours_arrowObj
startRotation = 0,0,0
endRotation = 0,360,0
variable = fc.Conditioned(fc.HourOfDay(fc.LandingTime()))
range = 0, fc.HoursPerDay()
blend = true
speed = 1.0
longPath = true
}

// Timer Hands --------------------------------------------------------
// ROTATION
// {
// name = Timer Second hand
// transform = TimerArrowSecObj
// startRotation = 0,0,0
// endRotation = 0,360,0
// variable = fc.SecondsOfMinute(fc.GetPersistentAsNumber("%AUTOID%-TimerValue"))
// range = 0, 60
// blend = true
// speed = 1.0
// longPath = true
// }
// ROTATION
// {
// name = Timer Minute hand
// transform = TimerArrowMinObj
// startRotation = 0,0,0
// endRotation = 0,360,0
// variable = fc.MinutesOfHour(fc.GetPersistentAsNumber("%AUTOID%-TimerValue"))
// range = 0, 60
// blend = true
// speed = 1.0
// longPath = true
// }

// // Timer Control ------------------------------------------------------
// COLLIDER_EVENT
// {
// name = Timer button
// collider = StartColl
// onClick = fc.AddPersistentWrapped("%AUTOID%-TimerMode", 1, 0, 3)
// sound = ASET/ASET_Props/Sounds/AnalogTimerButton
// volume = 0.5
// }
// TRANSLATION
// {
// name = Timer flag
// transform = TimerON_flagObj
// startTranslation = 0,0,0
// endTranslation = 0,0,-0.005
// variable = fc.GetPersistentAsNumber("%AUTOID%-TimerMode") == 1
// }
// TRIGGER_EVENT
// {
// name = Timer Initialize
// event = fc.SetPersistent("%AUTOID%-TimerValue", 0)
// exitEvent = fc.SetPersistent("%AUTOID%-TimerStart", fc.UT())
// variable = fc.GetPersistentAsNumber("%AUTOID%-TimerMode") == 0
// }
// TRIGGER_EVENT
// {
// name = Timer Update
// event = fc.SetPersistent("%AUTOID%-TimerValue", fc.UT() - fc.GetPersistentAsNumber("%AUTOID%-TimerStart"))
// variable = fc.GetPersistentAsNumber("%AUTOID%-TimerMode") == 1
// autoRepeat = true
// }
}
}
Loading