Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
29 changes: 23 additions & 6 deletions .github/workflows/assemble-and-release.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
name: Assemble Assets and Publish Release
name: Asset Assembly
on: [push, pull_request]
jobs:
Assemble:
Build:
runs-on: ubuntu-latest
container:
image: ubuntu:24.10
steps:
- name: Install dependencies
run: |
apt update && apt install wget zip unzip python3 -y
apt update && apt install wget zip unzip python3 libicu-dev -y
shell: bash
- uses: actions/checkout@v2
- name: Clone Repository and Run Scripts
- name: Checkout Repository
uses: actions/checkout@v2
- name: Compile WADs
working-directory: ./
run: |
bash tools/compile-wads.sh
- name: Compile BSPs
working-directory: ./
run: |
bash tools/compile-maps.sh --full
- name: Assemble Archives
working-directory: ./
run: |
cd tools/
bash assemble-assets.sh
- name: Upload build artifacts
Expand All @@ -23,7 +31,7 @@ jobs:
name: assembled-assets
path: ./tmp/*.zip
Release:
needs: [Assemble]
needs: [Build]
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
container:
Expand Down Expand Up @@ -128,6 +136,15 @@ jobs:
asset_path: ./tmp/nspire-nzp-assets.zip
asset_name: nspire-nzp-assets.zip
asset_content_type: application/zip
- name: Upload Texture WAD Archive
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }}
asset_path: ./tmp/texture-wads.zip
asset_name: texture-wads.zip
asset_content_type: application/zip
- name: Publish Release
uses: StuYarrow/publish-release@v1
env:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/test-map-compilation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
image: ubuntu:24.10
steps:
- name: Install dependencies
run: apt update && apt install wget zip unzip -y
run: apt update && apt install wget zip unzip libicu-dev -y
shell: bash
- name: Checkout
uses: actions/checkout@v2
Expand All @@ -17,4 +17,5 @@ jobs:
shell: bash
- name: Run Script
run: |
bash tools/compile-wads.sh
bash tools/compile-maps.sh
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
tmp/*
*.DS_Store
*.DS_Store
*.wad
*.bsp
wadmaker.dat
tools/vhlt/*
tools/wadmaker/*
platforms.json
92 changes: 46 additions & 46 deletions source/maps/Hangar/Hangar.map

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions source/maps/lexi_temple/lexi_temple.map

Large diffs are not rendered by default.

Binary file removed source/textures/wad/4all.wad
Binary file not shown.
Binary file added source/textures/wad/4all/4all_ceil_dirty.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_ceil_rock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_ceil_ruff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_crate_wood.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_floor_dirt.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_floor_jagg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_floor_ruff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_floor_tile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_masjid.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_road_blek.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/4all_road_rock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/BCDG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/b1ood_wall_rock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/bedrock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/box_side3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/box_side_o.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/bricks_red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/bricks_yellow64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/bricks_yellow_d.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/debris_C3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/mechanical_door.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/n3b_metal_door.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/n3b_metal_smol.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/tiles_gb128D.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/wall_grey_top6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/textures/wad/4all/wezu_wall1_choc.png
Binary file added source/textures/wad/4all/wezu_wall2_bred.png
Binary file added source/textures/wad/4all/{4all_fence.png
Binary file removed source/textures/wad/Dung3on.wad
Binary file not shown.
Binary file added source/textures/wad/Dung3on/!dung_water_oof.png
Binary file added source/textures/wad/Dung3on/BCDG.png
Binary file added source/textures/wad/Dung3on/bedrock.png
Binary file added source/textures/wad/Dung3on/dung_crate_wood.png
Binary file added source/textures/wad/Dung3on/dung_metal_bump.png
Binary file added source/textures/wad/Dung3on/dung_metal_flat.png
Binary file added source/textures/wad/Dung3on/wezu_wall1_dark.png
Binary file added source/textures/wad/Dung3on/wezu_wall1_lite.png
Binary file added source/textures/wad/Dung3on/wezu_wall2_dark.png
Binary file added source/textures/wad/Dung3on/wezu_wall2_lite.png
Binary file added source/textures/wad/Dung3on/wezu_wall4.png
Binary file added source/textures/wad/Dung3on/{4all_fence.png
Binary file added source/textures/wad/Dung3on/{power_switch_s.png
Binary file removed source/textures/wad/Example_01.wad
Binary file not shown.
Binary file added source/textures/wad/Example_01/{_cagebar.png
Binary file removed source/textures/wad/Example_02.wad
Binary file not shown.
Binary file added source/textures/wad/Example_02/box_side_o.png
Binary file added source/textures/wad/Example_02/ceilings_64.png
Binary file added source/textures/wad/Example_02/clip.png
Binary file added source/textures/wad/Example_02/doors.png
Binary file added source/textures/wad/Example_02/hint.png
Binary file added source/textures/wad/Example_02/null.png
Binary file added source/textures/wad/Example_02/skip.png
Binary file added source/textures/wad/Example_02/sky.png
Binary file added source/textures/wad/Example_02/tiles_me.png
Binary file added source/textures/wad/Example_02/trigger.png
Binary file added source/textures/wad/Example_02/wall_plainR.png
Binary file added source/textures/wad/Example_02/{metal_piece.png
Binary file removed source/textures/wad/Ju[s]tice_null2.wad
Binary file not shown.
Binary file added source/textures/wad/Ju[s]tice_null2/*water_mc.png
Binary file added source/textures/wad/Ju[s]tice_null2/4tiles.png
Binary file added source/textures/wad/Ju[s]tice_null2/NDUWall.png
Binary file added source/textures/wad/Ju[s]tice_null2/Tiles_red.png
Binary file added source/textures/wad/Ju[s]tice_null2/White.png
Binary file added source/textures/wad/Ju[s]tice_null2/black.png
Binary file added source/textures/wad/Ju[s]tice_null2/blue_wall.png
Binary file added source/textures/wad/Ju[s]tice_null2/box_side2.png
Binary file added source/textures/wad/Ju[s]tice_null2/box_side3.png
Binary file added source/textures/wad/Ju[s]tice_null2/box_side4.png
Binary file added source/textures/wad/Ju[s]tice_null2/brick_l4q.png
Binary file added source/textures/wad/Ju[s]tice_null2/bricks_mc.png
Binary file added source/textures/wad/Ju[s]tice_null2/carpet_64.png
Binary file added source/textures/wad/Ju[s]tice_null2/cement.png
Binary file added source/textures/wad/Ju[s]tice_null2/cement2.png
Binary file added source/textures/wad/Ju[s]tice_null2/cement264.png
Binary file added source/textures/wad/Ju[s]tice_null2/cement64.png
Binary file added source/textures/wad/Ju[s]tice_null2/coal_mc.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS1.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS2.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS2N.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS3.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS4.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5N.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5NB.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5ND.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5NN.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5NNY.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5NNY2.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS5NNY3.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS6.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS6C.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS6CM.png
Binary file added source/textures/wad/Ju[s]tice_null2/conS6CMB.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_DO.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_lb32.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_lines.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_r.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_rN.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_rNL.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_rNLB.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_rNLBB.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_rNLD.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_rNLNB.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_ww.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_wwB.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_wwNb.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_wwNb0.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_wwNb2.png
Binary file added source/textures/wad/Ju[s]tice_null2/con_wwNb3.png
Binary file added source/textures/wad/Ju[s]tice_null2/conc_mp.png
Binary file added source/textures/wad/Ju[s]tice_null2/conc_mpD.png
Binary file added source/textures/wad/Ju[s]tice_null2/conc_mpL.png
Binary file added source/textures/wad/Ju[s]tice_null2/conc_road.png
Binary file added source/textures/wad/Ju[s]tice_null2/conc_wall.png
Binary file added source/textures/wad/Ju[s]tice_null2/couch_t.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris2.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris2P.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_C.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_C1.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_C2.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_C3.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_L1.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_L2.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_L3.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_f1.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_f3.png
Binary file added source/textures/wad/Ju[s]tice_null2/debris_f4.png
Binary file added source/textures/wad/Ju[s]tice_null2/dev_128.png
Binary file added source/textures/wad/Ju[s]tice_null2/dev_64.png
Binary file added source/textures/wad/Ju[s]tice_null2/dev_64tilesG.png
Loading