Skip to content

Commit

Permalink
Merge branch 'ioquake:main' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rawr51919 authored Aug 12, 2023
2 parents 0549613 + e5c688b commit d907e47
Show file tree
Hide file tree
Showing 303 changed files with 76,873 additions and 6,023 deletions.
2 changes: 1 addition & 1 deletion .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# These are supported funding model platforms

patreon: timedoctor
patreon: nuclearmonster
open_collective: # Replace with a single Open Collective username
ko_fi: jackslater
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
Expand Down
49 changes: 49 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Build
on: [push, pull_request]

jobs:
linux:
name: Linux
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- name: Install Dependencies
run: |
sudo apt-get update
sudo apt-get install libsdl2-dev
- name: Compile
run: make release
env:
ARCHIVE: 1
- uses: actions/upload-artifact@v3
with:
name: Linux
path: build/*.zip
windows:
name: Windows
runs-on: windows-2019
steps:
- uses: actions/checkout@v3
- name: Compile
run: |
choco install zip
make release
env:
ARCHIVE: 1
- uses: actions/upload-artifact@v3
with:
name: Windows
path: build/*.zip
macos:
name: macOS
runs-on: macos-11
steps:
- uses: actions/checkout@v3
- name: Compile
run: make release
env:
ARCHIVE: 1
- uses: actions/upload-artifact@v3
with:
name: macOS
path: build/*.zip
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Makefile.local
.DS_Store
.LSOverride
Icon?
make-macosx-values.local

# Xcode
####################
Expand Down
48 changes: 0 additions & 48 deletions .travis.yml

This file was deleted.

31 changes: 31 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,34 @@ ioquake3 can be developed locally. For instructions on how to do this, see [the

* Fill in [the required template](PULL_REQUEST_TEMPLATE.md)
* Do not include issue numbers in the PR title.


### Building Official Installers

This is a reminder for how official installers should be built:

* Please include the id patch pk3s in your installer, which are available
from http://ioquake3.org/patch-data/ subject to agreement to the id
EULA. Your installer shall also ask the user to agree to this EULA (which
is in the /web/include directory for your convenience) and subsequently
refuse to continue the installation of the patch pk3s and pak0.pk3 if they
do not.

* Please don't require pak0.pk3, since not everyone using the engine
plans on playing Quake 3 Arena on it. It's fine to (optionally) assist the
user in copying the file or tell them how.

* It is fine to just install the binaries without requiring id EULA agreement,
providing pak0.pk3 and the patch pk3s are not referred to or included in the
installer.

* Please include at least a libSDL2 so/dylib/dll on every platform.

* Please include an OpenAL so/dylib/dll, since every platform should be using
it by now.

* Please be prepared to alter your installer on the whim of the maintainers.

* Your installer will be mirrored to an "official" directory, thus making it
a done deal.

Loading

0 comments on commit d907e47

Please sign in to comment.