From 48b0bfb77c7c886fc9a22e5635457056601ee5e6 Mon Sep 17 00:00:00 2001 From: Cong Date: Sat, 3 Feb 2024 18:10:07 +1100 Subject: [PATCH] Move cyberdogs campaign, version 2 --- .github/workflows/cmake.yml | 2 +- CMakeLists.txt | 4 ++-- appveyor.yml | 4 ++-- graphics_hd/logo.png | Bin 6173 -> 0 bytes .../techdemo => }/cyberdogs.cdogscpn/ammo.json | 0 .../cyberdogs.cdogscpn/bullets.json | 0 .../cyberdogs.cdogscpn/campaign.json | 0 .../cyberdogs.cdogscpn/characters.json | 0 .../cyberdogs.cdogscpn/graphics/LICENSE.txt | 0 .../cyberdogs.cdogscpn/graphics/blaster.png | Bin .../cyberdogs.cdogscpn/graphics/bullet_ball.png | Bin .../cyberdogs.cdogscpn/graphics/chainsaw.png | Bin .../graphics/chars/guns/chaingun.txt | 0 .../graphics/chars/guns/chaingun_24x22.png | Bin .../graphics/chars/guns/chainsaw_16x20.png | Bin .../graphics/chars/guns/flamer_30x22.png | Bin .../graphics/chars/guns/launcher_20x20.png | Bin .../graphics/chars/guns/pistol_20x20.png | Bin .../graphics/chars/guns/rifle_30x22.png | Bin .../graphics/chars/guns/zapper_green_20x20.png | Bin .../cyberdogs.cdogscpn/graphics/flamer.png | Bin .../cyberdogs.cdogscpn/graphics/launcher.png | Bin .../cyberdogs.cdogscpn/graphics/megagun.png | Bin .../cyberdogs.cdogscpn/graphics/minigun.png | Bin .../cyberdogs.cdogscpn/graphics/powergun.png | Bin .../graphics/reactor_16x32.png | Bin .../techdemo => }/cyberdogs.cdogscpn/guns.json | 0 .../cyberdogs.cdogscpn/map_objects.json | 0 .../cyberdogs.cdogscpn/missions.json | 0 .../cyberdogs.cdogscpn/pickups.json | 0 .../cyberdogs.cdogscpn/sounds/1up.ogg | Bin .../cyberdogs.cdogscpn/sounds/1up.txt | 0 32 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 graphics_hd/logo.png rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/ammo.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/bullets.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/campaign.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/characters.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/LICENSE.txt (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/blaster.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/bullet_ball.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chainsaw.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/chaingun.txt (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/chaingun_24x22.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/chainsaw_16x20.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/flamer_30x22.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/launcher_20x20.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/pistol_20x20.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/rifle_30x22.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/chars/guns/zapper_green_20x20.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/flamer.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/launcher.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/megagun.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/minigun.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/powergun.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/graphics/reactor_16x32.png (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/guns.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/map_objects.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/missions.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/pickups.json (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/sounds/1up.ogg (100%) rename missions/{custom/techdemo => }/cyberdogs.cdogscpn/sounds/1up.txt (100%) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index a0f4ef14c..2207b9fc8 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -11,7 +11,7 @@ on: types: [published, created, edited] env: - VERSION: 1.5.0 + VERSION: 2.0.0 CTEST_EXT_COLOR_OUTPUT: TRUE CTEST_OUTPUT_ON_FAILURE: 1 CTEST_BUILD_FLAGS: -j4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ade8d9ce..677137b89 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ cmake_policy(SET CMP0072 NEW) set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) project(cdogs-sdl C) -set(VERSION_MAJOR "1") -set(VERSION_MINOR "5") +set(VERSION_MAJOR "2") +set(VERSION_MINOR "0") set(VERSION_PATCH "0") set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}") diff --git a/appveyor.yml b/appveyor.yml index 7dd96714f..84dc022ee 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.5.0.{build} +version: 2.0.0.{build} branches: only: @@ -19,7 +19,7 @@ environment: SDL2_IMAGE_VERSION: 2.6.3 SDL2_MIXER_VERSION: 2.6.3 SDLDIR: C:\projects\cdogs-sdl - VERSION: 1.5.0 + VERSION: 2.0.0 install: - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%" diff --git a/graphics_hd/logo.png b/graphics_hd/logo.png deleted file mode 100644 index f321e98e5b17ac085c7b5fa43b4876c1d04ab616..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6173 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