weyne/dcs_liberation
1
0
Fork 0
mirror of https://github.com/dcs-liberation/dcs_liberation.git synced 2025-11-10 14:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: weyne:develop-11.1.1
Branches Tags
weyne:develop weyne:dependabot/pip/starlette-0.49.1 weyne:dependabot/npm_and_yarn/client/multi-1bdbfdbf5c weyne:zhexu14-patch-2 weyne:dependabot/npm_and_yarn/client/multi-7d5e57b41f weyne:pydcs_update weyne:develop-11.1.1 weyne:develop-11.1 weyne:zhexu14-patch-1 weyne:update_readme_links weyne:develop-10.0 weyne:develop-9.0 weyne:develop-8.1 weyne:develop-8.0 weyne:develop-7.1 weyne:develop-7.0 weyne:develop-6.1 weyne:develop-6.0 weyne:develop-5.2 weyne:develop-5.1 weyne:develop-5.0 weyne:develop-4.x weyne:master weyne:verify-changelog-change weyne:develop-3.x weyne:develop_2_5_x weyne:pydcs-2-7-naming weyne:develop_2_4_x weyne:develop_2_3_x weyne:develop_2_2_x weyne:theater-generation-rework weyne:plugin-skynet-iads weyne:develop_2_1_x weyne:qt_ui
weyne:13.0.0 weyne:12.0.1 weyne:12.0.0 weyne:11.1.1 weyne:11.1.0 weyne:11.0.0 weyne:10.0.0 weyne:9.0.0 weyne:8.1.0 weyne:8.0.0 weyne:7.1.0 weyne:7.0.0 weyne:6.1.1 weyne:6.1.0 weyne:6.0.0 weyne:5.2.1 weyne:5.2.0 weyne:5.1.0 weyne:5.0.0 weyne:4.1.1 weyne:4.1.0 weyne:4.0.0 weyne:3.0.0 weyne:2.5.1 weyne:2.5.0 weyne:2.4.3-2 weyne:2.4.3 weyne:2.4.2 weyne:2.4.1 weyne:2.4.0 weyne:2.3.4 weyne:2.3.3 weyne:2.3.2 weyne:2.3.1 weyne:2.3.0 weyne:2.2.1 weyne:2.2.0 weyne:2.1.5 weyne:2.1.4 weyne:2.1.4b weyne:2.1.3 weyne:2.1.2 weyne:2.1.1 weyne:2.1.1-alpha-2 weyne:2.1.1-alpha weyne:2.1.0 weyne:2.0.11 weyne:2.0.10 weyne:2.0RC9 weyne:2.0RC8 weyne:2.0RC7 weyne:2.0RC6 weyne:2.0RC5 weyne:2.0RC4 weyne:1.5 weyne:1.5_rc1 weyne:1.4.4 weyne:1.4.5 weyne:1.4.3 weyne:1.4.2 weyne:1.4 weyne:1.4.1 weyne:1.4_rc6 weyne:1.4_rc5 weyne:1.4_rc4 weyne:1.4_rc3 weyne:1.4_rc2 weyne:1.4_rc1 weyne:1.3.3 weyne:1.3.2 weyne:1.3.1 weyne:1.3 weyne:1.3_rc2 weyne:1.3_rc1 weyne:1.2_rc1 weyne:1.2_rc2 weyne:1.13_rc4 weyne:1.13_rc3 weyne:1.13_rc2 weyne:1.13_rc1 weyne:1.12 weyne:1.11 weyne:1.10 weyne:1.08 weyne:1.07 weyne:1.06 weyne:1.05 weyne:1.04 weyne:1.03 weyne:1.01 weyne:1.0
..
compare: weyne:develop-11.1
Branches Tags
weyne:dependabot/pip/starlette-0.49.1 weyne:develop weyne:dependabot/npm_and_yarn/client/multi-1bdbfdbf5c weyne:zhexu14-patch-2 weyne:dependabot/npm_and_yarn/client/multi-7d5e57b41f weyne:pydcs_update weyne:develop-11.1.1 weyne:develop-11.1 weyne:zhexu14-patch-1 weyne:update_readme_links weyne:develop-10.0 weyne:develop-9.0 weyne:develop-8.1 weyne:develop-8.0 weyne:develop-7.1 weyne:develop-7.0 weyne:develop-6.1 weyne:develop-6.0 weyne:develop-5.2 weyne:develop-5.1 weyne:develop-5.0 weyne:develop-4.x weyne:master weyne:verify-changelog-change weyne:develop-3.x weyne:develop_2_5_x weyne:pydcs-2-7-naming weyne:develop_2_4_x weyne:develop_2_3_x weyne:develop_2_2_x weyne:theater-generation-rework weyne:plugin-skynet-iads weyne:develop_2_1_x weyne:qt_ui
weyne:13.0.0 weyne:12.0.1 weyne:12.0.0 weyne:11.1.1 weyne:11.1.0 weyne:11.0.0 weyne:10.0.0 weyne:9.0.0 weyne:8.1.0 weyne:8.0.0 weyne:7.1.0 weyne:7.0.0 weyne:6.1.1 weyne:6.1.0 weyne:6.0.0 weyne:5.2.1 weyne:5.2.0 weyne:5.1.0 weyne:5.0.0 weyne:4.1.1 weyne:4.1.0 weyne:4.0.0 weyne:3.0.0 weyne:2.5.1 weyne:2.5.0 weyne:2.4.3-2 weyne:2.4.3 weyne:2.4.2 weyne:2.4.1 weyne:2.4.0 weyne:2.3.4 weyne:2.3.3 weyne:2.3.2 weyne:2.3.1 weyne:2.3.0 weyne:2.2.1 weyne:2.2.0 weyne:2.1.5 weyne:2.1.4 weyne:2.1.4b weyne:2.1.3 weyne:2.1.2 weyne:2.1.1 weyne:2.1.1-alpha-2 weyne:2.1.1-alpha weyne:2.1.0 weyne:2.0.11 weyne:2.0.10 weyne:2.0RC9 weyne:2.0RC8 weyne:2.0RC7 weyne:2.0RC6 weyne:2.0RC5 weyne:2.0RC4 weyne:1.5 weyne:1.5_rc1 weyne:1.4.4 weyne:1.4.5 weyne:1.4.3 weyne:1.4.2 weyne:1.4 weyne:1.4.1 weyne:1.4_rc6 weyne:1.4_rc5 weyne:1.4_rc4 weyne:1.4_rc3 weyne:1.4_rc2 weyne:1.4_rc1 weyne:1.3.3 weyne:1.3.2 weyne:1.3.1 weyne:1.3 weyne:1.3_rc2 weyne:1.3_rc1 weyne:1.2_rc1 weyne:1.2_rc2 weyne:1.13_rc4 weyne:1.13_rc3 weyne:1.13_rc2 weyne:1.13_rc1 weyne:1.12 weyne:1.11 weyne:1.10 weyne:1.08 weyne:1.07 weyne:1.06 weyne:1.05 weyne:1.04 weyne:1.03 weyne:1.01 weyne:1.0

2 Commits
develop-11 ... develop-11

Author SHA1 Message Date
zhexu14
efac1263c8 Move latest from develop into 11.1 branch (#3414) 
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-06-21 22:52:06 +10:00
zhexu14
2d8efa5a7a Add NASAMs to MERAD unit list for campaign template (#3406) (#3410) 
Adds NASAM launcher B and C to the list of units that can be placed in a
campaign template to define a MERAD spawn location.

This is needed to maintain compatibility with the new versions of my
campaigns.

Pull requests should be made against the `develop` branch. Any backports
necessary will be handled by the development team.

Pull requests should be focused on one task. Multiple bug fixes should
be
multiple PRs. We cannot merge half a PR, and combined PRs are much more
difficult to review. PRs that do not adhere to this will have their
review
delayed.

Prefer rebase to merge, and squash commits as needed to preserve a
readable
commit history. This project maintains linear history in the develop
branch, so
we will either rebase or squash your PR when merging. It is much easier
for us
if your branch already has a readable commit history (ensure that your
commit
subject lines are clear enough to identify the patch in the git log). An
exception to this is made for large PRs that are likely to require
multiple
rounds of review; in that case it's easier if you **don't** do this
(GitHub
does not preserve the history of old commits, so we cannot filter a PR
for only
new changes if a branch is force pushed) and we will squash it when
merging.

New features and bug fixes are usually worth mentioning in the
changelog.
Exceptions are fixes for bugs that never shipped (were only present in a
canary
build), and changes with no intended user observable behavior, such as a
refactor. If you're comfortable writing the note yourself, add it to
`changelog.md` in the root of the project in the section for the
upcoming
release.

Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com>
 2024-06-19 20:38:09 +10:00
5 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

2
.github/ISSUE_TEMPLATE/bug-report.yml vendored
View File

@@ -31,7 +31,7 @@ body:
If the bug was found in a development build, select "Development build"
and provide a link to the build in the field below.
options:
- 11.1.1
- 11.0.0
- Development build
- type: textarea
attributes:

2
.github/ISSUE_TEMPLATE/new-game-bug.yml vendored
View File

@@ -39,7 +39,7 @@ body:
If the bug was found in a development build, select "Development build"
and provide a link to the build in the field below.
options:
- 11.1.1
- 11.0.0
- Development build
- type: textarea
attributes:

4
changelog.md
View File

@@ -1,6 +1,6 @@
# 11.1.1
# 11.1.0
Saves from 11.0.0 are compatible with 11.1.1. See Known Issues section for exceptions.
Saves from 11.0.0 are compatible with 11.1.0. See Known Issues section for exceptions.
## Features/Improvements

2
docs/conf.py
View File

@@ -9,7 +9,7 @@
project = "DCS Liberation"
copyright = "2024, DCS Liberation Team"
author = "DCS Liberation Team"
release = "11.1.1"
release = "11.1.0"
# -- General configuration ---------------------------------------------------
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

2
game/version.py
View File

@@ -3,7 +3,7 @@ from pathlib import Path
MAJOR_VERSION = 11
MINOR_VERSION = 1
MICRO_VERSION = 1
MICRO_VERSION = 0
VERSION_NUMBER = ".".join(str(v) for v in (MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION))