Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
ce53e1d
1029merge (#38)
Zedb0T Oct 29, 2023
696539e
Revert "1029merge (#38)" (#39)
Zedb0T Oct 30, 2023
0c62849
New mp3 (#43)
Zedb0T Oct 31, 2023
5f64cdd
vanilla merge (defmethod + sky fix) (#45)
dallmeyer Nov 4, 2023
ab43af4
Update cut-release.yaml
dallmeyer Nov 9, 2023
7f3900b
vanilla merge 11/27
dallmeyer Nov 27, 2023
a75fd64
Update cut-release.yaml
dallmeyer Nov 28, 2023
4fd661f
game-task max (#49)
dallmeyer Dec 8, 2023
07a4bb0
Revert "game-task max (#49)" (#50)
dallmeyer Dec 8, 2023
043a3c3
Revert "Revert "game-task max (#49)" (#50)" (#51)
dallmeyer Dec 9, 2023
9c52820
Vanilla 12 10 (#52)
dallmeyer Dec 10, 2023
67d9253
jak1: use `'base` for water volumes and use enum when setting `task-s…
Hat-Kid Dec 16, 2023
4113078
Merge remote-tracking branch 'vanilla/master'
dallmeyer Dec 22, 2023
713435e
vanilla merge + binaries
dallmeyer Dec 22, 2023
6527108
Fix hover check (#54)
dallmeyer Dec 23, 2023
09fc7b4
Update target-board.gc
dallmeyer Dec 23, 2023
634010f
Merge remote-tracking branch 'vanilla/master'
dallmeyer Jan 5, 2024
c23df04
Merge remote-tracking branch 'vanilla/master'
dallmeyer Jan 27, 2024
a4cb759
update binaries
dallmeyer Jan 27, 2024
690c1ee
backport jak 2 interface for creating blocking-planes (#60)
dallmeyer Jan 27, 2024
1875a3d
Build Linux and Windows Releases (#72)
amarzot Mar 7, 2024
709d6d0
Give release-pipeline write permissions (#74)
amarzot Mar 8, 2024
f55a373
Add process-by-aid function similar to process-by-ename (#75)
blahpy Mar 14, 2024
be23bb7
2024 03 16 vanilla (#76)
dallmeyer Mar 16, 2024
099b7e6
Orb placer debug tool (#69)
dallmeyer Mar 25, 2024
40c30f8
fwd declare breaking jak2 sorry
dallmeyer Mar 27, 2024
6b687b3
Vanilla merge 4/25 (#80)
dallmeyer Apr 25, 2024
94c02bf
Merge remote-tracking branch 'vanilla/master'
dallmeyer Apr 28, 2024
decf335
fix merge
dallmeyer Apr 28, 2024
fb00ea2
Delete out/build/Release/bin/SDL2.dll
dallmeyer Apr 28, 2024
f8e41b4
update binaries
Zedb0T May 7, 2024
8f13d59
Merge remote-tracking branch 'vanilla/master'
dallmeyer May 10, 2024
59d80e3
binaries
dallmeyer May 10, 2024
ec21755
Merge remote-tracking branch 'barg-v/b/j3-extractor'
dallmeyer May 10, 2024
0a55f74
binaries w j3 extractor
dallmeyer May 10, 2024
96f2144
intropal stuff
dallmeyer May 11, 2024
7d28ab8
Main with update (#81)
Zedb0T May 12, 2024
77db0d2
5/13 update (#82)
Zedb0T May 12, 2024
95fb7e3
Add files (#83)
Zedb0T May 18, 2024
fdb37c8
Merge remote-tracking branch 'vanilla/master'
Zedb0T May 24, 2024
e459c81
Vanilla merge 5/24 (#85)
Zedb0T May 24, 2024
804fe11
Merge branch 'main' of https://github.com/OpenGOAL-Mods/OG-Mod-Base
Zedb0T May 25, 2024
9285ac4
replace SFML w miniaudio (#84)
dallmeyer May 26, 2024
5641e9e
commit tex replacements
dallmeyer May 26, 2024
f1eeeac
Vanilla update 6/18 (#89)
Zedb0T Jun 19, 2024
93f3676
Cleanup and sync (#90)
Zedb0T Jun 20, 2024
76067b1
backport jak 3 logic for orbs in crates to jak 2 (#91)
dallmeyer Jun 21, 2024
f08b8e3
Update game.gd (#93)
dallmeyer Jun 29, 2024
52171f3
fix dgo
dallmeyer Jun 29, 2024
54fc0d5
Merge remote-tracking branch 'vanilla/master'
dallmeyer Jun 29, 2024
4a40a0a
get jak3 working again
dallmeyer Jun 29, 2024
034d42d
cleanup tings
dallmeyer Jun 29, 2024
e25e362
dont do permissive redefinition crap
dallmeyer Jun 29, 2024
78ac0d7
Fix audio on reboot
Zedb0T Jun 30, 2024
71f418d
update binaries
Zedb0T Jul 12, 2024
7bb71ae
Add joint helpers (#94)
Zedb0T Jul 14, 2024
5cfbb9e
Add process-drawable-by-ename (#95)
Zedb0T Jul 14, 2024
73a133f
Update 7/22 (#96)
Zedb0T Jul 21, 2024
9417f63
7/23 update (#97)
Zedb0T Jul 23, 2024
aff667b
Update speedruns.gc
dallmeyer Aug 1, 2024
174b16f
Vanilla 8/2 (#98)
Zedb0T Aug 2, 2024
542c058
Merge remote-tracking branch 'vanilla/master'
dallmeyer Aug 3, 2024
d5abb6d
rebuild
dallmeyer Aug 3, 2024
9f460d5
LL custom navmesh stuff (#99)
dallmeyer Aug 3, 2024
7e5dc9f
Merge remote-tracking branch 'vanilla/master'
dallmeyer Aug 3, 2024
d4be818
rebuild again
dallmeyer Aug 3, 2024
c7f1bcc
Default custom-hacky? to #f for non-custom nav-meshes. (#100)
massimilianodelliubaldini Aug 5, 2024
02f2ea4
clean up custom-hacky check
dallmeyer Aug 5, 2024
c97377d
Merge remote-tracking branch 'vanilla/master'
dallmeyer Aug 19, 2024
cbe50b1
vanilla merge
dallmeyer Aug 19, 2024
0e825f7
ci: fix release workflow and fix macOS build issues (#102)
xTVaser Aug 19, 2024
69bbc29
Delete .github/workflows/draft-new-release.yaml
dallmeyer Aug 19, 2024
eae373c
build-matrix.yaml only on mod-base
dallmeyer Aug 19, 2024
a0f2423
Update default-menu.gc
dallmeyer Aug 20, 2024
fbff8ff
Update cut-release.yaml
dallmeyer Aug 26, 2024
5e41611
fix stop-sound-file (and split out stop-all-sounds) (#104)
dallmeyer Aug 27, 2024
c02349b
fix bad map usage
dallmeyer Aug 27, 2024
de1510b
Merge branch 'main' of https://github.com/OpenGOAL-Mods/OG-Mod-Base
dallmeyer Aug 27, 2024
1a0577f
binaries to be safe
dallmeyer Aug 27, 2024
03b82f8
play audio file relative to custom_assets/<game>/audio/
dallmeyer Aug 28, 2024
28baf7e
fix main music and things
dallmeyer Aug 28, 2024
5b2f8df
modversion jak 2
dallmeyer Aug 29, 2024
48b04ec
Add a has-landed to SR text (#103)
Zedb0T Aug 29, 2024
d86fe43
change has-landed logic
dallmeyer Aug 29, 2024
ea8e5bd
Update .gitignore
dallmeyer Aug 29, 2024
32247d9
Update cut-release.yaml
dallmeyer Aug 31, 2024
e9b124d
add stellars normals fix for merc_replacements
dallmeyer Sep 1, 2024
f9a5695
Update default-menu.gc flooooot
dallmeyer Sep 1, 2024
1312112
format before vanilla merge
dallmeyer Sep 1, 2024
63728aa
Merge remote-tracking branch 'vanilla/master'
dallmeyer Sep 1, 2024
1520fe7
Merge branch 'main' of https://github.com/OpenGOAL-Mods/OG-Mod-Base
dallmeyer Sep 1, 2024
50813e1
regen binaries
dallmeyer Sep 1, 2024
6b8e44e
support common_art_groups
dallmeyer Sep 2, 2024
7b4ba3d
fix audio bug
dallmeyer Sep 3, 2024
a6aaaae
include list?
dallmeyer Sep 3, 2024
00646c4
Update release-pipeline.yaml
dallmeyer Sep 3, 2024
97d6ad5
Update speedruns.gc
dallmeyer Sep 3, 2024
71e2446
Update speedruns.gc
dallmeyer Sep 3, 2024
d6b7da8
Update release-pipeline.yaml
dallmeyer Sep 3, 2024
26f89e2
try release-pipeline fixes
dallmeyer Sep 3, 2024
3afce63
Merge pull request #1 from OpenGOAL-Mods/main
The-Stellar Sep 5, 2024
028bb90
Add `linear-plat` (#106)
dallmeyer Sep 6, 2024
a1dacb1
fix integer truncation in linear-plat.gc
dallmeyer Sep 6, 2024
043fe5e
Add cpad-dpad-pressed? function
The-Stellar Sep 10, 2024
c2bc946
Merge pull request #2 from OpenGOAL-Mods/main
The-Stellar Sep 10, 2024
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
19 changes: 12 additions & 7 deletions .github/workflows/build-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,46 @@ name: Build
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
merge_group: {}

jobs:
# Windows
build_windows_clang:
name: "🖥️ Windows"
name: "🖥️ Windows (Clang)"
uses: ./.github/workflows/windows-build-clang.yaml
if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
with:
cmakePreset: "Release-windows-clang"
cachePrefix: ""
secrets: inherit

build_windows_msvc:
name: "🖥️ Windows"
name: "🖥️ Windows (MSVC)"
uses: ./.github/workflows/windows-build-msvc.yaml
if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
with:
cmakePreset: "Release-windows-msvc"
cachePrefix: ""
secrets: inherit

# Linux
build_linux_clang:
name: "🐧 Linux"
name: "🐧 Linux (Clang)"
uses: ./.github/workflows/linux-build-clang.yaml
if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
with:
cmakePreset: "Release-linux-clang-asan"
cachePrefix: ""
secrets: inherit

build_linux_gcc:
name: "🐧 Linux"
name: "🐧 Linux (GCC)"
uses: ./.github/workflows/linux-build-gcc.yaml
if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
with:
cmakePreset: "Release-linux-gcc"
cachePrefix: ""
Expand All @@ -48,11 +52,12 @@ jobs:
build_macos_intel:
name: "🍎 MacOS"
uses: ./.github/workflows/macos-build.yaml
if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
with:
cmakePreset: "Release-macos-clang"
cachePrefix: ""

# Q4 2023 there will hopefully be native arm64 runners
# Q4 2023 there will hopefully be native arm64 runners
# https://github.com/github/roadmap/issues/528
# build_macos_arm:
# name: "🍎 MacOS"
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/cut-release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: 🏭 Cut Mod Release

on:
workflow_dispatch:
inputs:
bump:
description: 'Semver Bump Type'
required: true
default: 'patch'
type: choice
options:
- patch
- minor
- major

permissions:
contents: write

jobs:
cut_release:
name: "Cut Release"
uses: open-goal/mod-bundling-tools/.github/workflows/mod-bundler.yml@v1
with:
semverBump: ${{ inputs.bump }}
metadataName: "Test Mod Bundle"
metadataDescription: "This is a test mod bundle. 2"
metadataSupportedGames: "jak1"
metadataAuthors: "barg,vaser"
metadataTags: "rng,gameplay-mod"
metadataWebsiteUrl: "https://www.example.com/please/change/me"
toolingRepo: "OpenGOAL-Mods/OG-Mod-Base"
gameAssetsDir: "game/assets"
secrets:
token: ${{ secrets.GITHUB_TOKEN }}
15 changes: 10 additions & 5 deletions .github/workflows/linux-build-clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,19 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: |
sudo apt update
sudo apt install build-essential cmake \
clang gcc g++ lcov make nasm libxrandr-dev \
libxinerama-dev libxcursor-dev libpulse-dev \
libxi-dev zip ninja-build libgl1-mesa-dev libssl-dev
libxi-dev zip ninja-build libgl1-mesa-dev libssl-dev \
libfreetype6-dev libx11-dev libxrandr-dev libgl1-mesa-dev \
libudev-dev libopenal-dev libflac-dev libogg-dev libvorbis-dev

- name: Setup sccache
uses: hendrikmuhs/ccache-action@v1.2.14
Expand All @@ -52,10 +57,10 @@ jobs:
- name: Build Project
run: cmake --build build --parallel $((`nproc`))

- name: Run Tests
env:
GTEST_OUTPUT: "xml:opengoal-test-report.xml"
run: ./test.sh
# - name: Run Tests
# env:
# GTEST_OUTPUT: "xml:opengoal-test-report.xml"
# run: ./test.sh

- name: Prepare artifacts
if: ${{ inputs.uploadArtifacts }}
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/linux-build-gcc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: |
Expand Down Expand Up @@ -54,5 +57,5 @@ jobs:
- name: Build Project
run: cmake --build build --parallel $((`nproc`)) -- -w dupbuild=warn

- name: Run Tests
run: ./test.sh
# - name: Run Tests
# run: ./test.sh
3 changes: 3 additions & 0 deletions .github/workflows/macos-build-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Set up ARM64 environment
run: sudo softwareupdate --install-rosetta --agree-to-license
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/macos-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install Package Dependencies
run: brew install cmake nasm ninja
Expand All @@ -47,8 +50,8 @@ jobs:
- name: Build Project
run: cmake --build build --parallel $((`sysctl -n hw.logicalcpu`))

- name: Run Tests
run: ./test.sh
# - name: Run Tests
# run: ./test.sh

- name: Prepare artifacts
if: ${{ inputs.uploadArtifacts }}
Expand Down
28 changes: 16 additions & 12 deletions .github/workflows/release-pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ permissions:
contents: write

jobs:
cut_release:
cut-release:
name: Cut Release
runs-on: ubuntu-latest
outputs:
new_tag: ${{ steps.set_tag.outputs.new_tag }}
steps:
# Docs - https://github.com/mathieudutour/github-tag-action
- name: Bump Version and Push Tag
if: github.repository == 'open-goal/jak-project'
if: github.repository == 'OpenGOAL-Mods/OG-Mod-Base'
id: tag_version
uses: mathieudutour/github-tag-action@v6.2
with:
Expand All @@ -45,6 +45,8 @@ jobs:

# Windows
build_windows_clang:
needs:
- cut-release
name: "🖥️ Windows"
uses: ./.github/workflows/windows-build-clang.yaml
with:
Expand All @@ -55,6 +57,8 @@ jobs:

# Linux
build_linux_clang:
needs:
- cut-release
name: "🐧 Linux"
uses: ./.github/workflows/linux-build-clang.yaml
with:
Expand All @@ -65,6 +69,8 @@ jobs:

# macOS
build_macos_intel:
needs:
- cut-release
name: "🍎 MacOS"
uses: ./.github/workflows/macos-build.yaml
with:
Expand All @@ -75,9 +81,8 @@ jobs:

# Upload the Artifacts
upload_artifacts:
if: github.repository == 'open-goal/jak-project'
needs:
- cut_release
- cut-release
- build_windows_clang
- build_linux_clang
- build_macos_intel
Expand All @@ -86,7 +91,8 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: ${{ needs.cut_release.outputs.new_tag }}
fetch-tags: true
fetch-depth: 0

- name: Prepare Artifact Folder
run: mkdir -p ./ci-artifacts/final
Expand All @@ -104,7 +110,7 @@ jobs:
mkdir -p ./ci-artifacts/linux
./.github/scripts/releases/extract_build_unix.sh ./ci-artifacts/linux ./ci-artifacts/opengoal-linux-static ./
pushd ci-artifacts/linux
TAG_VAL=${{ needs.cut_release.outputs.new_tag }}
TAG_VAL=${{ needs.cut-release.outputs.new_tag }}
tar czf ../final/opengoal-linux-${TAG_VAL}.tar.gz .
popd
chmod +x ./ci-artifacts/opengoal-linux-static/lsp/lsp
Expand All @@ -114,7 +120,7 @@ jobs:
run: |
mkdir -p ./ci-artifacts/windows
./.github/scripts/releases/extract_build_windows.sh ./ci-artifacts/windows ./ci-artifacts/opengoal-windows-static ./
TAG_VAL=${{ needs.cut_release.outputs.new_tag }}
TAG_VAL=${{ needs.cut-release.outputs.new_tag }}
7z a -tzip ./ci-artifacts/final/opengoal-windows-${TAG_VAL}.zip ./ci-artifacts/windows/*
cp ./ci-artifacts/opengoal-windows-static/lsp.exe ./ci-artifacts/final/opengoal-lsp-windows-${TAG_VAL}.exe

Expand All @@ -123,7 +129,7 @@ jobs:
mkdir -p ./ci-artifacts/macos
./.github/scripts/releases/extract_build_unix.sh ./ci-artifacts/macos ./ci-artifacts/opengoal-macos-static ./
pushd ci-artifacts/macos
TAG_VAL=${{ needs.cut_release.outputs.new_tag }}
TAG_VAL=${{ needs.cut-release.outputs.new_tag }}
tar czf ../final/opengoal-macos-intel-${TAG_VAL}.tar.gz .
popd
chmod +x ./ci-artifacts/opengoal-macos-static/lsp/lsp
Expand All @@ -133,12 +139,10 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
TAG_VAL=${{ needs.cut_release.outputs.new_tag }}
gh release upload "${TAG_VAL}" ${{ github.WORKSPACE }}/ci-artifacts/final/* --repo open-goal/jak-project --clobber
gh release upload ${{ needs.cut-release.outputs.new_tag }} ${{ github.WORKSPACE }}/ci-artifacts/final/* --repo ${{ github.repository }} --clobber

- name: Publish Release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
TAG_VAL=${{ needs.cut_release.outputs.new_tag }}
gh release edit ${TAG_VAL} --draft=false --repo open-goal/jak-project
gh release edit ${{ needs.cut-release.outputs.new_tag }} --draft=false --repo ${{ github.repository }}
12 changes: 8 additions & 4 deletions .github/workflows/windows-build-clang.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install NASM
# TODO - Simplify this with just the first command once choco 2.0 rolls out everywhere
Expand Down Expand Up @@ -60,10 +63,11 @@ jobs:
shell: cmd
run: cmake --build build --parallel %NUMBER_OF_PROCESSORS%

- name: Run Tests
env:
GTEST_OUTPUT: "xml:opengoal-test-report.xml"
run: ./build/bin/goalc-test.exe --gtest_color=yes --gtest_brief=0 --gtest_filter="-*MANUAL_TEST*"
# - name: Run Tests
# timeout-minutes: 10
# env:
# GTEST_OUTPUT: "xml:opengoal-test-report.xml"
# run: ./build/bin/goalc-test.exe --gtest_color=yes --gtest_brief=0 --gtest_filter="-*MANUAL_TEST*"

- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/windows-build-msvc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true

- name: Install NASM
# TODO - Simplify this with just the first command once choco 2.0 rolls out everywhere
Expand Down Expand Up @@ -56,10 +59,10 @@ jobs:
set CL=/MP
cmake --build build --parallel %NUMBER_OF_PROCESSORS%

- name: Run Tests
timeout-minutes: 10
env:
GTEST_OUTPUT: "xml:opengoal-test-report.xml"
run: |
./build/bin/goalc-test.exe --gtest_color=yes --gtest_brief=0 --gtest_filter="-*MANUAL_TEST*"
# - name: Run Tests
# timeout-minutes: 10
# env:
# GTEST_OUTPUT: "xml:opengoal-test-report.xml"
# run: |
# ./build/bin/goalc-test.exe --gtest_color=yes --gtest_brief=0 --gtest_filter="-*MANUAL_TEST*"

Loading