forked from JACoders/OpenJK
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rend2-unified-wip' into rend2-builds
- Loading branch information
Showing
262 changed files
with
5,574 additions
and
4,634 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| name: build | ||
|
|
||
| # runs every 4 months | ||
| on: | ||
| workflow_dispatch: | ||
| schedule: | ||
| - cron: "0 0 1 */4 *" | ||
|
|
||
| jobs: | ||
| msvcxp: | ||
| name: WinXP ${{ matrix.arch }} ${{ matrix.build_type }} (${{ matrix.portable }}) | ||
| runs-on: windows-2022 | ||
| strategy: | ||
| matrix: | ||
| arch: [x86, x86_64] | ||
| build_type: [Release] | ||
| portable: [Non-Portable] | ||
| include: | ||
| - arch: x86 | ||
| platform: Win32 | ||
| - arch: x86_64 | ||
| platform: x64 | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v3 | ||
|
|
||
| - name: Install v141_xp Toolchain | ||
| continue-on-error: true | ||
| shell: powershell | ||
| run: | | ||
| Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\" | ||
| $InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise" | ||
| $WorkLoads = '--add Microsoft.VisualStudio.Component.WinXP' | ||
| $Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"", $WorkLoads, '--quiet', '--norestart', '--nocache') | ||
| $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden | ||
| if ($process.ExitCode -eq 0) { | ||
| Write-Host "components have been successfully added" | ||
| } else { | ||
| Write-Host "components were not installed" | ||
| } | ||
| - name: Add msbuild to PATH | ||
| uses: microsoft/setup-msbuild@v1.1 | ||
|
|
||
| - name: Create Build Environment | ||
| run: cmake -E make_directory ${{ github.workspace }}/build | ||
|
|
||
| - name: Configure CMake | ||
| shell: bash | ||
| working-directory: ${{ github.workspace }}/build | ||
| run: | | ||
| OPTIONS="-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=bin" | ||
| if [ "${{ matrix.portable }}" == "Portable" ]; then | ||
| OPTIONS+=" -DBuildPortableVersion=ON" | ||
| else | ||
| OPTIONS+=" -DBuildPortableVersion=OFF" | ||
| fi | ||
| OPTIONS+=" -DBuildJK2SPEngine=ON -DBuildJK2SPGame=ON -DBuildJK2SPRdVanilla=ON" | ||
| cmake $GITHUB_WORKSPACE -T v141_xp -A ${{ matrix.platform }} $OPTIONS | ||
| - name: Build | ||
| working-directory: ${{ github.workspace }}/build | ||
| shell: bash | ||
| run: cmake --build . --config ${{ matrix.build_type }} -j $NUMBER_OF_PROCESSORS | ||
|
|
||
| - name: Install | ||
| if: ${{ matrix.build_type == 'Release' }} | ||
| working-directory: ${{ github.workspace }}/build | ||
| shell: bash | ||
| run: cmake --install . --config ${{ matrix.build_type }} | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| if: ${{ matrix.build_type == 'Release' }} | ||
| with: | ||
| name: OpenJK-windowsxp-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.portable }} | ||
| path: ${{ github.workspace }}/build/bin/JediAcademy | ||
| if-no-files-found: error | ||
|
|
||
| - uses: actions/upload-artifact@v3 | ||
| if: ${{ matrix.build_type == 'Release' }} | ||
| with: | ||
| name: OpenJO-windowsxp-${{ matrix.arch }}-${{ matrix.build_type }}-${{ matrix.portable }} | ||
| path: ${{ github.workspace }}/build/bin/JediOutcast | ||
| if-no-files-found: error |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,99 +1,105 @@ | ||
| # OpenJK | ||
|
|
||
| OpenJK is an effort by the JACoders group to maintain and improve the game engines on which the Jedi Academy (JA) and Jedi Outcast (JO) games run on, while maintaining *full backwards compatibility* with the existing games. *This project does not attempt to rebalance or otherwise modify core gameplay*. | ||
| OpenJK is a community effort to maintain and improve the game and engine powering Jedi Academy and Jedi Outcast, while maintaining _full backwards compatibility_ with the existing games and mods. | ||
| This project does not intend to add major features, rebalance, or otherwise modify core gameplay. | ||
|
|
||
| Our aims are to: | ||
| * Improve the stability of the engine by fixing bugs and improving performance. | ||
| * Provide a clean base from which new JO and JA code modifications can be made. | ||
| * Make available this engine to more operating systems. To date, we have ports on Linux and macOS. | ||
|
|
||
| Currently, the most stable portion of this project is the Jedi Academy multiplayer code, with the single player code in a reasonable state. | ||
| - Improve the stability of the engine by fixing bugs and improving performance. | ||
| - Support more hardware (x86_64, Arm, Apple Silicon) and software platforms (Linux, macOS) | ||
| - Provide a clean base from which new code modifications can be made. | ||
|
|
||
| Rough support for Jedi Outcast single player is also available, however this should be considered heavily work in progress. This is not currently actively worked on or tested. OpenJK does not have Jedi Outcast multiplayer support. | ||
| [](https://discord.gg/dPNCfeQ) | ||
| [](https://jkhub.org/forums/forum/49-openjk/) | ||
|
|
||
| Please use discretion when making issue requests on GitHub. The [JKHub sub-forum](https://jkhub.org/forums/forum/49-openjk/) is a better place for support queries, discussions, and feature requests. | ||
| [](https://github.com/JACoders/OpenJK/actions/workflows/build.yml?query=branch%3Amaster) | ||
| [](https://scan.coverity.com/projects/1153) | ||
|
|
||
| <a href="https://discord.gg/dPNCfeQ"><img src="https://img.shields.io/badge/discord-join-7289DA.svg?logo=discord&longCache=true&style=flat" /></a> | ||
| [](https://jkhub.org/forums/forum/49-openjk/) | ||
| ## Supported Games | ||
|
|
||
| [](https://scan.coverity.com/projects/1153) | ||
| | Game | Single Player | Multi Player | | ||
| | - | - | - | | ||
| | Jedi Academy | ✅ Stable | ✅ Stable | | ||
| | Jedi Outcast | 😧 Works, needs attention | 🙅 Not supported - consider [JK2MV](https://jk2mv.org) | | ||
|
|
||
| ## License | ||
| Please direct support queries, discussions and feature requests to the JKHub sub-forum or Discord linked above. | ||
|
|
||
| OpenJK is licensed under GPLv2 as free software. You are free to use, modify and redistribute OpenJK following the terms in LICENSE.txt. | ||
| ## License | ||
|
|
||
| OpenJK is licensed under GPLv2 as free software. You are free to use, modify and redistribute OpenJK following the terms in [LICENSE.txt](https://github.com/JACoders/OpenJK/blob/master/LICENSE.txt) | ||
|
|
||
| ## For players | ||
|
|
||
| To install OpenJK, you will first need Jedi Academy installed. If you don't already own the game you can buy it from online stores such as [Steam](http://store.steampowered.com/app/6020/), [Amazon](http://www.amazon.com/Star-Wars-Jedi-Knight-Academy-Pc/dp/B0000A2MCN) or [GOG](https://www.gog.com/game/star_wars_jedi_knight_jedi_academy). | ||
| To install OpenJK, you will first need Jedi Academy installed. If you don't already own the game you can buy it from online stores such as [Steam](https://store.steampowered.com/app/6020/), [Amazon](https://www.amazon.com/Star-Wars-Jedi-Knight-Academy-Pc/dp/B0000A2MCN) or [GOG](https://www.gog.com/game/star_wars_jedi_knight_jedi_academy). | ||
|
|
||
| Installing and running OpenJK: | ||
| Download the [latest build](https://github.com/JACoders/OpenJK/releases/tag/latest) ([alt link](https://builds.openjk.org)) for your operating system. | ||
|
|
||
| 1. [Download the latest build](http://builds.openjk.org) for your operating system. | ||
| 2. Extract the contents of the file into the Jedi Academy `GameData/` folder. For Steam users, this will be in `<Steam Folder>/steamapps/common/Jedi Academy/GameData`. | ||
| 3. Run `openjk.x86.exe` (Windows), `openjk.i386` (Linux 32-bit), `openjk.x86_64` (Linux 64-bit) or the `OpenJK` app bundle (macOS), depending on your operating system. | ||
| Installing and running OpenJK: | ||
|
|
||
| 1. Extract the contents of the file into the Jedi Academy `GameData/` folder. For Steam users, this will be in `<Steam Folder>/steamapps/common/Jedi Academy/GameData/`. | ||
| 1. Run `openjk.x86.exe` (Windows), `openjk.i386` (Linux 32-bit), `openjk.x86_64` (Linux 64-bit) or the `OpenJK` app bundle (macOS), depending on your operating system. | ||
|
|
||
| **Linux Instructions** | ||
| ### Linux Instructions | ||
|
|
||
| If you do not have a windows partition and need to download the game base. | ||
| If you do not have an existing JKA installation and need to download the base game: | ||
|
|
||
| 1. Download and Install SteamCMD [SteamCMD](https://developer.valvesoftware.com/wiki/SteamCMD#Linux) . | ||
| 2. Set the download path using steamCMD, force_install_dir <path> . | ||
| 3. Using SteamCMD Set the platform to windows to download any windows game on steam. @sSteamCmdForcePlatformType "windows" | ||
| 4. Using SteamCMD download the game, app_update 6020. | ||
| 5. [Download the latest build](http://builds.openjk.org) for your operating system. | ||
| 6. Extract the contents of the file into the Jedi Academy `GameData/` folder. For Steam users, this will be in `<Steam Folder>/steamapps/common/Jedi Academy/GameData`. | ||
| 1. Download and Install SteamCMD [SteamCMD](https://developer.valvesoftware.com/wiki/SteamCMD#Linux). | ||
| 1. Set the download path using steamCMD: `force_install_dir /path/to/install/jka/` | ||
| 1. Using SteamCMD Set the platform to windows to download any windows game on steam. @sSteamCmdForcePlatformType "windows" | ||
| 1. Using SteamCMD download the game, `app_update 6020`. | ||
|
|
||
| Extract the contents of the file into the Jedi Academy `GameData/` folder. For Steam users, this will be in `<Steam Folder>/steamapps/common/Jedi Academy/GameData/`. | ||
|
|
||
| **macOS Instructions** | ||
| ### macOS Instructions | ||
|
|
||
| If you have the Mac App Store Version of Jedi Academy, follow these steps to get OpenJK runnning under macOS: | ||
|
|
||
| 1. Install [Homebrew](http://brew.sh/) if you don't have it. | ||
| 2. Open the Terminal app, and enter the command `brew install sdl2`. | ||
| 3. Extract the contents of the OpenJK DMG ([Download the latest build](http://builds.openjk.org)) into the game directory `/Applications/Star Wars Jedi Knight: Jedi Academy.app/Contents/` | ||
| 4. Run `OpenJK.app` or `OpenJK SP.app` | ||
| 5. Savegames, Config Files and Log Files are stored in `/Users/<USER>/Library/Application Support/OpenJK/` | ||
|
|
||
| 1. Install [Homebrew](https://brew.sh/) if you don't have it. | ||
| 1. Open the Terminal app, and enter the command `brew install sdl2`. | ||
| 1. Extract the contents of the OpenJK DMG into the game directory `/Applications/Star Wars Jedi Knight: Jedi Academy.app/Contents/` | ||
| 1. Run `OpenJK.app` or `OpenJK SP.app` | ||
| 1. Savegames, Config Files and Log Files are stored in `/Users/$USER/Library/Application Support/OpenJK/` | ||
|
|
||
| ## For Developers | ||
|
|
||
|
|
||
| ### Building OpenJK | ||
|
|
||
| * [Compilation guide](https://github.com/JACoders/OpenJK/wiki/Compilation-guide) | ||
| * [Debugging guide](https://github.com/JACoders/OpenJK/wiki/Debugging) | ||
|
|
||
| - [Compilation guide](https://github.com/JACoders/OpenJK/wiki/Compilation-guide) | ||
| - [Debugging guide](https://github.com/JACoders/OpenJK/wiki/Debugging) | ||
|
|
||
| ### Contributing to OpenJK | ||
|
|
||
| * [Fork](https://github.com/JACoders/OpenJK/fork) the project on GitHub | ||
| * Create a new branch and make your changes | ||
| * Send a [pull request](https://help.github.com/articles/creating-a-pull-request) to upstream (JACoders/OpenJK) | ||
|
|
||
| - [Fork](https://github.com/JACoders/OpenJK/fork) the project on GitHub | ||
| - Create a new branch and make your changes | ||
| - Send a [pull request](https://help.github.com/articles/creating-a-pull-request) to upstream (JACoders/OpenJK) | ||
|
|
||
| ### Using OpenJK as a base for a new mod | ||
|
|
||
| * [Fork](https://github.com/JACoders/OpenJK/fork) the project on GitHub | ||
| * Change the GAMEVERSION define in codemp/game/g_local.h from "OpenJK" to your project name | ||
| * If you make a nice change, please consider back-porting to upstream via pull request as described above. This is so everyone benefits without having to reinvent the wheel for every project. | ||
|
|
||
|
|
||
| ## Maintainers (in alphabetical order) | ||
|
|
||
| * Ensiform | ||
| * Razish | ||
| * Xycaleth | ||
|
|
||
|
|
||
| ## Significant contributors (in alphabetical order) | ||
|
|
||
| * eezstreet | ||
| * exidl | ||
| * ImperatorPrime | ||
| * mrwonko | ||
| * redsaurus | ||
| * Scooper | ||
| * Sil | ||
| * smcv | ||
| - [Fork](https://github.com/JACoders/OpenJK/fork) the project on GitHub | ||
| - Change the `GAMEVERSION` define in [codemp/game/g_local.h](https://github.com/JACoders/OpenJK/blob/master/codemp/game/g_local.h) from "OpenJK" to your project name | ||
| - If you make a nice change, please consider back-porting to upstream via pull request as described above. This is so everyone benefits without having to reinvent the wheel for every project. | ||
|
|
||
| ## Maintainers (full list: [@JACoders](https://github.com/orgs/JACoders/people)) | ||
|
|
||
| Leads: | ||
|
|
||
| - [Ensiform](https://github.com/ensiform) | ||
| - [razor](https://github.com/Razish) | ||
| - [Xycaleth](https://github.com/xycaleth) | ||
|
|
||
| ## Significant contributors ([full list](https://github.com/JACoders/OpenJK/graphs/contributors)) | ||
|
|
||
| - [bibendovsky](https://github.com/bibendovsky) (save games, platform support) | ||
| - [BobaFett](https://github.com/Lrns123) | ||
| - [BSzili](https://github.com/BSzili) (JK2, platform support) | ||
| - [Cat](https://github.com/deepy) (infra) | ||
| - [Didz](https://github.com/dionrhys) | ||
| - [eezstreet](https://github.com/eezstreet) | ||
| - exidl (SDL2, platform support) | ||
| - [ImperatorPrime](https://github.com/ImperatorPrime) (JK2) | ||
| - [mrwonko](https://github.com/mrwonko) | ||
| - [redsaurus](https://github.com/redsaurus) | ||
| - [Scooper](https://github.com/xScooper) | ||
| - [Sil](https://github.com/TheSil) | ||
| - [smcv](https://github.com/smcv) (debian packaging) | ||
| - [Tristamus](https://tristamus.com>) (icon) |
Oops, something went wrong.