Skip to content

RP-4 Beta Branch #2620

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

Closed
wants to merge 74 commits into from
Closed

RP-4 Beta Branch #2620

Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
3912bd8
Add Program and base folder edits
CXG-2827 Jun 7, 2024
baebbbe
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 Aug 1, 2024
86d6f0a
Altered Program and Contracts
CXG-2827 Aug 1, 2024
bbd32a1
Crewed Mars Program and Contract Further Tweaks
CXG-2827 Aug 3, 2024
93bb04c
Corrected Contract Group and Tweaked Program
CXG-2827 Aug 3, 2024
dc3d8bc
Fix contracts again
CXG-2827 Aug 3, 2024
f61a4ab
Contract Fixes once again
CXG-2827 Aug 3, 2024
d1855af
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 Aug 3, 2024
05a01ef
Further tweaks to Program and Contracts
CXG-2827 Aug 6, 2024
d08a2dd
Mars Crewed Contract Corrections
CXG-2827 Aug 6, 2024
060fc2b
Tweaks Continue
CXG-2827 Aug 6, 2024
26b7e1d
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 Aug 13, 2024
5b9522c
Working Crewed Sample Science and Reduced Program Funding
CXG-2827 Aug 19, 2024
68a0333
Fixed Crewed Mars Landing Error
CXG-2827 Aug 19, 2024
546af23
missing brackets
CXG-2827 Aug 20, 2024
9ec1a79
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 Aug 28, 2024
fb69683
Working mars sample return contract
CXG-2827 Aug 28, 2024
3a69513
Updated Crewed Mars Contracts
CXG-2827 Oct 1, 2024
5b40fd7
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 Oct 1, 2024
4776567
Updated Funding and Curve
CXG-2827 Oct 1, 2024
ebb094a
Update MagneticScan.cfg
njits23 Oct 22, 2024
76fdd42
Update Configure.cfg
njits23 Oct 22, 2024
2692cf9
Adjust MG01 in other configs
njits23 Oct 22, 2024
d7082b7
Merge branch 'KSP-RO:master' into CrewedMars
CXG-2827 Nov 29, 2024
806c769
Contract Edits and Gating Mars Landing
CXG-2827 Nov 29, 2024
4203db9
Removed Orbit Gating Added Flag Planting
CXG-2827 Feb 28, 2025
9d152e6
Formatting fixes
CXG-2827 May 29, 2025
2eea5a8
Recover BetterScience Branch
Capkirk123 Aug 5, 2025
9ab613b
IR Radiometer overhaul
Capkirk123 Aug 5, 2025
15daf5d
Fix typo in IR03 data rate
Capkirk123 Aug 6, 2025
ff2b5f6
Hard drive configs batch 1
Capkirk123 Aug 6, 2025
5949515
More sources
Capkirk123 Aug 8, 2025
5a6f077
Removed lingering NewVessel and simplified Robotic Sample Return
CXG-2827 Aug 11, 2025
fde2dd0
Viking/Voyager data
Capkirk123 Aug 16, 2025
e3494b4
Rebalance leaders
NovemberOrWhatever Aug 17, 2025
e8f0d3d
Merge branch 'master' into BetterScience2
Capkirk123 Aug 17, 2025
0c50bc0
Fix whitespace
Capkirk123 Aug 17, 2025
2d02e26
Revert FD change and balance admins
NovemberOrWhatever Aug 17, 2025
33e9462
program de-WIP
CXG-2827 Aug 17, 2025
4c1cb85
New Optionals
CXG-2827 Aug 17, 2025
99bb041
Merge branch 'BetterScience2' into RP-4-beta
Capkirk123 Aug 17, 2025
0bce796
Merge branch 'HardDrives' into RP-4-beta
Capkirk123 Aug 17, 2025
3fbb742
Merge remote-tracking branch 'origin/LeaderRebalance2' into RP-4-beta
Capkirk123 Aug 17, 2025
1e2f298
Merge branch 'pr/2509' into RP-4-beta
Capkirk123 Aug 17, 2025
bde030d
Merge branch 'pr/2422' into RP-4-beta
Capkirk123 Aug 17, 2025
fdd1784
Add initial configs for breaking ground robotics parts
njits23 Aug 18, 2025
32d3f76
Merge branch 'KSP-RO:master' into breaking_ground_robotics
njits23 Aug 18, 2025
94620c7
Remove accidentally configged turboshaft engines.
njits23 Aug 18, 2025
434df8d
Merge branch 'breaking_ground_robotics' of https://github.com/njits23…
njits23 Aug 18, 2025
ddffbb5
Fix problems after merge
njits23 Aug 18, 2025
ee8c02b
Correct servo name.
njits23 Aug 18, 2025
991e9b4
Add some cost so entirely motorless parts aren't free.
njits23 Aug 18, 2025
415767e
Add some basic cost stepping based on part size.
njits23 Aug 18, 2025
5666a8e
Even more sources
Capkirk123 Aug 20, 2025
dd91d07
Move SPS to 1967, the year Apollo 4 flew.
njits23 Aug 22, 2025
324ce3b
Move missed configs
njits23 Aug 22, 2025
36a696f
Merge branch 'master' into RP-4-beta
siimav Aug 27, 2025
9e9083e
bleh
Capkirk123 Aug 29, 2025
e1ab321
Give me your tape recorders
Capkirk123 Aug 29, 2025
62dc72a
Actually configure everything
Capkirk123 Aug 30, 2025
b9c0055
Merge branch 'HardDrives' into RP-4-beta
Capkirk123 Aug 30, 2025
ad3e5f0
Add my notes
Capkirk123 Aug 30, 2025
2055f5c
Merge branch 'pr/2621' into RP-4-beta
Capkirk123 Aug 30, 2025
74de2f7
Merge branch 'pr/2623' into RP-4-beta
Capkirk123 Aug 30, 2025
7d487cd
Merge branch 'master' into RP-4-beta
siimav Sep 2, 2025
19edcb7
Merge branch 'master' into RP-4-beta
Capkirk123 Sep 15, 2025
b8fb93a
Merge branch 'master' into RP-4-beta
Capkirk123 Sep 15, 2025
534e9f3
Merge branch 'master' into RP-4-beta
Capkirk123 Sep 16, 2025
b0a7c9e
Correct tech nodes
Capkirk123 Sep 17, 2025
b608cb5
Merge branch 'HardDrives' into RP-4-beta
Capkirk123 Sep 17, 2025
96d2ba6
Merge remote-tracking branch 'origin/master' into RP-4-beta
siimav Sep 30, 2025
3812f8f
Merge branch 'master' into RP-4-beta
Capkirk123 Oct 1, 2025
eed839d
Merge branch 'master' into RP-4-beta
Capkirk123 Oct 1, 2025
9dc38cd
Merge branch 'master' into RP-4-beta
Capkirk123 Oct 4, 2025
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

These merge commits were added into this branch cleanly.

There are no new changes to show.