Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c87a7f9
Updated .editorconfig
penev92 Nov 15, 2024
71a50df
Updated GitHub workflows
penev92 Nov 15, 2024
54e721b
Updated all links to HTTPS
penev92 Nov 15, 2024
6c05c66
Use appimagetool with non-glibc linux support
penev92 Nov 15, 2024
e3bb4ef
Fix using appimagetool for building for linux
penev92 Nov 16, 2024
fb31092
Updated targeted engine version
penev92 Nov 16, 2024
e2ba63d
Replace hardcoded mod.yaml Packages list with a mod-defined filesyste…
penev92 Nov 16, 2024
a34809c
Turn ModelRenderer and VoxelCache into traits
penev92 Nov 16, 2024
dfa7fe2
Reworked Fluent file path and yaml references
penev92 Nov 16, 2024
50ab9ec
Updated map editor - Part 1
penev92 Nov 16, 2024
194f0ce
Ran automatic extraction of chrome strings
penev92 Nov 24, 2024
0cd07cb
Added faction dropdown translations
penev92 Nov 24, 2024
59015a5
Added mod metadata translations
penev92 Nov 24, 2024
60588e8
Misc translation fixes
penev92 Nov 24, 2024
2f7b47f
Ran the Utility's update-mod command
penev92 Nov 24, 2024
cf94acb
Misc mod.yaml updates
penev92 Nov 24, 2024
3b576bc
Updated map editor - Part 2
penev92 Nov 24, 2024
173f57f
Sweep unused translation key warnings under the rug
penev92 Nov 24, 2024
bc55b60
Adjusted Fluent files to 4-space indentation
penev92 Mar 30, 2025
50de382
Fix .NET 6 CI false positives
penev92 Mar 30, 2025
11d2d1e
Avoid a third-party GH Actions
penev92 Mar 30, 2025
8dd9f3d
Update Dedicated-Server wiki page URL
penev92 Apr 6, 2025
9dc5725
HACK Remove FluentReferences lint check from the engine
penev92 Apr 8, 2025
76dec24
Updated glyphs.png
penev92 Apr 21, 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
824 changes: 584 additions & 240 deletions .editorconfig

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@ jobs:
runs-on: ubuntu-22.04

steps:
- name: Remove System .NET
run: sudo apt-get remove -y dotnet*

- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install .NET 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

Expand All @@ -43,7 +46,7 @@ jobs:

steps:
- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Prepare Environment
run: |
Expand All @@ -67,10 +70,10 @@ jobs:

steps:
- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install .NET 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

Expand Down
52 changes: 23 additions & 29 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install .NET 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

Expand All @@ -28,27 +28,25 @@ jobs:
run: |
make engine
mkdir -p build/linux
sudo apt install libfuse2
sudo apt-get install -y desktop-file-utils
./packaging/linux/buildpackage.sh "${GIT_TAG}" "${PWD}/build/linux"

- name: Upload Packages
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ github.ref }}
overwrite: true
file_glob: true
file: build/linux/*
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash
run: |
gh release upload ${{ github.ref_name }} build/linux/*

macos:
name: macOS Disk Image
runs-on: macos-11
runs-on: macos-13
steps:
- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install .NET 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

Expand All @@ -68,23 +66,21 @@ jobs:
./packaging/macos/buildpackage.sh "${GIT_TAG}" "${PWD}/build/macos"

- name: Upload Package
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ github.ref }}
overwrite: true
file_glob: true
file: build/macos/*
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash
run: |
gh release upload ${{ github.ref_name }} build/macos/*

windows:
name: Windows Installers
runs-on: ubuntu-22.04
steps:
- name: Clone Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install .NET 6.0
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.0.x'

Expand All @@ -101,10 +97,8 @@ jobs:
./packaging/windows/buildpackage.sh "${GIT_TAG}" "${PWD}/build/windows"

- name: Upload Packages
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
tag: ${{ github.ref }}
overwrite: true
file_glob: true
file: build/windows/*
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash
run: |
gh release upload ${{ github.ref_name }} build/windows/*
6 changes: 3 additions & 3 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ members of the project's leadership.
## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at [http://contributor-covenant.org/version/1/4][version]
available at [https://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[homepage]: https://contributor-covenant.org
[version]: https://contributor-covenant.org/version/1/4/
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Please note that this repository is specifically for the scripts and infrastruct
When developing new features, it is important to make sure that they work on all our supported platforms. Right now, this means Windows >= 7 (with PowerShell >= 3), macOS >= 10.7, and Linux. We would like to also support *BSD, but do not currently have a means to test this.

Some issues to be aware of include:
* Use http://www.shellcheck.net/ to confirm POSIX compatibility of *.sh scripts.
* Use https://www.shellcheck.net/ to confirm POSIX compatibility of *.sh scripts.
* Avoid non-standard gnu extensions to common Unix tools (e.g. the `-f` flag from GNU `readlink`)

While your pull-request is in review it will be helpful if you join IRC to discuss the changes.

See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) on the main OpenRA project wiki. Most of the content on this page also applies to the Mod SDK.
See also the in-depth guide on [contributing](https://github.com/OpenRA/OpenRA/wiki/Contributing) on the main OpenRA project wiki. Most of the content on this page also applies to the Mod SDK.
8 changes: 4 additions & 4 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.

Expand Down Expand Up @@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
along with this program. If not, see <https://www.gnu.org/licenses/>.

Also add information on how to contact you by electronic and paper mail.

Expand All @@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.

The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
<https://www.gnu.org/philosophy/why-not-lgpl.html>.
4 changes: 4 additions & 0 deletions fetch-engine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ if [ "${AUTOMATIC_ENGINE_MANAGEMENT}" = "True" ]; then
rmdir "${AUTOMATIC_ENGINE_EXTRACT_DIRECTORY}"
rm "${AUTOMATIC_ENGINE_TEMP_ARCHIVE_NAME}"

# HACK: Remove bogus lint check that the Example mod can't possibly pass
# because to do so it would need to define a lot of excess things surrounding resources.
rm ${ENGINE_DIRECTORY}/OpenRA.Mods.Common/Lint/CheckFluentReferences.cs

echo "Compiling engine..."
cd "${ENGINE_DIRECTORY}" || exit 1
make version VERSION="${ENGINE_VERSION}"
Expand Down
2 changes: 1 addition & 1 deletion launch-dedicated.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:: example launch script, see https://github.com/OpenRA/OpenRA/wiki/Dedicated for details
:: example launch script, see https://github.com/OpenRA/OpenRA/wiki/Dedicated-Server for details

@echo on

Expand Down
4 changes: 4 additions & 0 deletions make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,10 @@ if ($command -eq "all" -or $command -eq "clean" -or $command -eq "check")

rm $env:AUTOMATIC_ENGINE_EXTRACT_DIRECTORY -r

# HACK: Remove bogus lint check that the Example mod can't possibly pass
# because to do so it would need to define a lot of excess things surrounding resources.
rm $env:ENGINE_DIRECTORY/OpenRA.Mods.Common/Lint/CheckFluentReferences.cs

cd $env:ENGINE_DIRECTORY
Invoke-Expression ".\make.cmd version $env:ENGINE_VERSION"
Invoke-Expression ".\make.cmd $command"
Expand Down
6 changes: 3 additions & 3 deletions mod.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
MOD_ID="example"

# The OpenRA engine version to use for this project.
ENGINE_VERSION="release-20231010"
ENGINE_VERSION="release-20250330"

##############################################################################
# Packaging
Expand Down Expand Up @@ -40,10 +40,10 @@ PACKAGING_DISPLAY_NAME="Example Mod"
# The URL for the project homepage.
# This is used in:
# - Windows "Add/Remove Programs" list
PACKAGING_WEBSITE_URL="http://openra.net"
PACKAGING_WEBSITE_URL="https://openra.net"

# The URL that is displayed in the crash dialog.
PACKAGING_FAQ_URL="http://wiki.openra.net/FAQ"
PACKAGING_FAQ_URL="https://wiki.openra.net/FAQ"

# The human-readable project authors.
# This is used in:
Expand Down
Binary file modified mods/example/chrome/assets/glyphs.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions mods/example/chrome/chrome.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,14 @@ dropdown-separators:

separator:
Inherits: button

editor:
Inherits: ^Glyphs
Regions:
select: 34, 187, 16, 16
tiles: 0, 187, 16, 16
overlays: 17, 187, 16, 16
actors: 34, 68, 16, 16
tools: 136, 68, 16, 16
history: 136, 51, 16, 16
erase: 50, 187, 16, 16
Loading
Loading