mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-27 15:37:28 +00:00
Merge remote-tracking branch 'origin/master-ng' into develop
This commit is contained in:
@@ -1798,6 +1798,8 @@ ENUMS.Storage.weapons.missiles.Igla_S = 'weapons.missiles.Igla_S'
|
||||
ENUMS.Storage.weapons.gunmounts.AKAN_NO_TRC = 'weapons.gunmounts.{AKAN_NO_TRC}'
|
||||
ENUMS.Storage.weapons.gunmounts.AKAN = 'weapons.gunmounts.{AKAN}'
|
||||
ENUMS.Storage.weapons.shells.M882_9x19 = 'weapons.shells.9x19_m882'
|
||||
ENUMS.Storage.weapons.droptanks.fuel_tank_370gal = "weapons.droptanks.fuel_tank_370gal"
|
||||
ENUMS.Storage.weapons.droptanks.fuel_tank_300gal = "weapons.droptanks.fuel_tank_300gal"
|
||||
|
||||
-- UH-60L Mod
|
||||
ENUMS.Storage.weapons.gunmounts.UH60LGAU19 = 'weapons.gunmounts.UH-60L GAU-19'
|
||||
|
||||
+3
-6
@@ -28,14 +28,11 @@ It is the ambition to grow this framework as a de-facto standard for mission des
|
||||
|
||||
## Two branches - Choose wisely
|
||||
|
||||
In [DCS World] there is a `Stable` version and an `OpenBeta`. New features are released to the `OpenBeta` first and applied to `Stable` later.
|
||||
People who choose to use `OpenBeta` can use the newest featuest and module, but accept the risk of bugs and unstable updates.
|
||||
In MOOSE there is a `master` branch, which is comparable to the `Stable` version.
|
||||
And there is the `development` branch, which is more like the `OpenBeta`.
|
||||
New modules (called classes in [Lua], like [OPS.Auftrag]) will only available in the `development` branch.
|
||||
In MOOSE there is a `master-ng` branch, which is the current `stable` version, and the `develop` branch.
|
||||
New modules (called classes in [Lua], like [OPS.Auftrag]) will first only be available in the `development` branch.
|
||||
|
||||
Releases are the most stable approach to use MOOSE.
|
||||
From time to time the current state of the `master` branch is used to create release.
|
||||
From time to time the current state of the `master-ng` branch is used to create release.
|
||||
A release gets a spefific version number and will not be changed later on.
|
||||
|
||||
## Documentation
|
||||
|
||||
Reference in New Issue
Block a user