Compare commits
No commits in common. "trunk" and "v0.1.0" have entirely different histories.
@ -4,21 +4,18 @@ steps:
|
|||||||
pull: true
|
pull: true
|
||||||
commands:
|
commands:
|
||||||
- apt update && apt upgrade -y && apt install -y zip
|
- apt update && apt upgrade -y && apt install -y zip
|
||||||
- xargs -a .pk3include -I% find . -wholename ./% | zip zorch_squadron.${CI_COMMIT_TAG}.pk3 -@
|
- xargs -a .pk3include -I% find . -wholename ./% | zip zorch_squadron.pk3 -@
|
||||||
when:
|
when:
|
||||||
- event: tag
|
- event: [tag]
|
||||||
ref: refs/tags/v*.*.*
|
|
||||||
publish:
|
publish:
|
||||||
image: woodpeckerci/plugin-gitea-release
|
image: woodpeckerci/plugin-gitea-release
|
||||||
when:
|
when:
|
||||||
- event: tag
|
- event: [tag]
|
||||||
ref: refs/tags/v*.*.*
|
|
||||||
settings:
|
settings:
|
||||||
base_url: https://vcs.otl-hga.net
|
base_url: https://vcs.otl-hga.net
|
||||||
files:
|
files:
|
||||||
- "zorch_squadron.*.pk3"
|
- "zorch_squadron.pk3"
|
||||||
prerelease: true
|
prerelease: true
|
||||||
target: trunk
|
target: trunk
|
||||||
#note: "${CI_COMMIT_MESSAGE}"
|
|
||||||
api_key:
|
api_key:
|
||||||
from_secret: WOODPECKER_CI_TOKEN
|
from_secret: WOODPECKER_CI_TOKEN
|
7
MAPINFO
@ -38,16 +38,9 @@ map XE1M2 lookup HUSTR_XE1M2 {
|
|||||||
map XE1M3 lookup HUSTR_XE1M3 {
|
map XE1M3 lookup HUSTR_XE1M3 {
|
||||||
Cluster = 11
|
Cluster = 11
|
||||||
InterMusic = D_HGAINT
|
InterMusic = D_HGAINT
|
||||||
Next = XE1M4
|
|
||||||
Sky1 = "CJSKY3A"
|
Sky1 = "CJSKY3A"
|
||||||
}
|
}
|
||||||
|
|
||||||
map XE1M4 lookup HUSTR_XE1M4 {
|
|
||||||
Cluster = 11
|
|
||||||
InterMusic = D_HGAINT
|
|
||||||
Sky1 = "FVOID"
|
|
||||||
}
|
|
||||||
|
|
||||||
DoomEdNums {
|
DoomEdNums {
|
||||||
2001 = LargeZorcherHGA
|
2001 = LargeZorcherHGA
|
||||||
2002 = RapidZorcherHGA
|
2002 = RapidZorcherHGA
|
||||||
|
BIN
PNAMES.lmp
17
TEXTURES.txt
@ -1,5 +1,5 @@
|
|||||||
// Texture definitions generated by SLADE3
|
// Texture definitions generated by SLADE3
|
||||||
// on Sun May 26 12:27:08 2024
|
// on Wed Jan 17 19:08:52 2024
|
||||||
|
|
||||||
Texture "GRNOA0", 64, 45
|
Texture "GRNOA0", 64, 45
|
||||||
{
|
{
|
||||||
@ -101,19 +101,4 @@ Texture "FFLDFLEM", 128, 128
|
|||||||
Patch "FFLDFLEM", 0, 0
|
Patch "FFLDFLEM", 0, 0
|
||||||
}
|
}
|
||||||
|
|
||||||
Texture "EMPL001", 128, 128
|
|
||||||
{
|
|
||||||
Patch "EMPL001", 0, 0
|
|
||||||
}
|
|
||||||
|
|
||||||
Texture "FVOID", 4, 4
|
|
||||||
{
|
|
||||||
Patch "FVOID", 0, 0
|
|
||||||
}
|
|
||||||
|
|
||||||
Texture "EMPL002", 128, 128
|
|
||||||
{
|
|
||||||
Patch "EMPL002", 0, 0
|
|
||||||
}
|
|
||||||
|
|
||||||
// End of texture definitions
|
// End of texture definitions
|
||||||
|
BIN
maps/XE1M3.wad
BIN
maps/XE1M4.wad
BIN
maps/xe1m1.wad
BIN
maps/xe1m2.wad
Before Width: | Height: | Size: 5.5 KiB |
Before Width: | Height: | Size: 20 KiB |
Before Width: | Height: | Size: 98 KiB |
Before Width: | Height: | Size: 853 KiB |
Before Width: | Height: | Size: 201 KiB |
BIN
res/xcf/PORT.xcf
Before Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 9.6 KiB |
Before Width: | Height: | Size: 546 B |
@ -40,7 +40,7 @@ class PowerBlastJump : Powerup {
|
|||||||
override void Tick() {
|
override void Tick() {
|
||||||
Super.Tick();
|
Super.Tick();
|
||||||
if (blasting) {
|
if (blasting) {
|
||||||
ply.AddZ(12);
|
ply.AddZ(8);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,7 +57,7 @@ class InvBlastBoots : PowerupGiver {
|
|||||||
+COUNTITEM
|
+COUNTITEM
|
||||||
Tag "$TAG_BLASTBOOTS";
|
Tag "$TAG_BLASTBOOTS";
|
||||||
Powerup.Type "PowerBlastJump";
|
Powerup.Type "PowerBlastJump";
|
||||||
Powerup.Duration 35;
|
Powerup.Duration 10; // ten tics should be enough for the engine to go "oh yeah powerup" while still being an instant-effect
|
||||||
|
|
||||||
Inventory.Icon "NULLA0";
|
Inventory.Icon "NULLA0";
|
||||||
Inventory.AltHUDIcon "NULLA0";
|
Inventory.AltHUDIcon "NULLA0";
|
||||||
|