Move cyberdogs campaign, version 2

cxong · Feb 3, 2024 · 48b0bfb · 48b0bfb
1 parent 5c363bf
commit 48b0bfb
Show file tree

Hide file tree

Showing 32 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/...tom/techdemo/cyberdogs.cdogscpn/ammo.json → missions/cyberdogs.cdogscpn/ammo.json b/...tom/techdemo/cyberdogs.cdogscpn/ammo.json → missions/cyberdogs.cdogscpn/ammo.json
diff --git a/.../techdemo/cyberdogs.cdogscpn/bullets.json → missions/cyberdogs.cdogscpn/bullets.json b/.../techdemo/cyberdogs.cdogscpn/bullets.json → missions/cyberdogs.cdogscpn/bullets.json
diff --git a/...techdemo/cyberdogs.cdogscpn/campaign.json → missions/cyberdogs.cdogscpn/campaign.json b/...techdemo/cyberdogs.cdogscpn/campaign.json → missions/cyberdogs.cdogscpn/campaign.json
diff --git a/...chdemo/cyberdogs.cdogscpn/characters.json → missions/cyberdogs.cdogscpn/characters.json b/...chdemo/cyberdogs.cdogscpn/characters.json → missions/cyberdogs.cdogscpn/characters.json
diff --git a/...o/cyberdogs.cdogscpn/graphics/LICENSE.txt → ...s/cyberdogs.cdogscpn/graphics/LICENSE.txt b/...o/cyberdogs.cdogscpn/graphics/LICENSE.txt → ...s/cyberdogs.cdogscpn/graphics/LICENSE.txt
diff --git a/...o/cyberdogs.cdogscpn/graphics/blaster.png → ...s/cyberdogs.cdogscpn/graphics/blaster.png b/...o/cyberdogs.cdogscpn/graphics/blaster.png → ...s/cyberdogs.cdogscpn/graphics/blaster.png
diff --git a/...berdogs.cdogscpn/graphics/bullet_ball.png → ...berdogs.cdogscpn/graphics/bullet_ball.png b/...berdogs.cdogscpn/graphics/bullet_ball.png → ...berdogs.cdogscpn/graphics/bullet_ball.png
diff --git a/.../cyberdogs.cdogscpn/graphics/chainsaw.png → .../cyberdogs.cdogscpn/graphics/chainsaw.png b/.../cyberdogs.cdogscpn/graphics/chainsaw.png → .../cyberdogs.cdogscpn/graphics/chainsaw.png
diff --git a/...cdogscpn/graphics/chars/guns/chaingun.txt → ...cdogscpn/graphics/chars/guns/chaingun.txt b/...cdogscpn/graphics/chars/guns/chaingun.txt → ...cdogscpn/graphics/chars/guns/chaingun.txt
diff --git a/...pn/graphics/chars/guns/chaingun_24x22.png → ...pn/graphics/chars/guns/chaingun_24x22.png b/...pn/graphics/chars/guns/chaingun_24x22.png → ...pn/graphics/chars/guns/chaingun_24x22.png
diff --git a/...pn/graphics/chars/guns/chainsaw_16x20.png → ...pn/graphics/chars/guns/chainsaw_16x20.png b/...pn/graphics/chars/guns/chainsaw_16x20.png → ...pn/graphics/chars/guns/chainsaw_16x20.png
diff --git a/...scpn/graphics/chars/guns/flamer_30x22.png → ...scpn/graphics/chars/guns/flamer_30x22.png b/...scpn/graphics/chars/guns/flamer_30x22.png → ...scpn/graphics/chars/guns/flamer_30x22.png
diff --git a/...pn/graphics/chars/guns/launcher_20x20.png → ...pn/graphics/chars/guns/launcher_20x20.png b/...pn/graphics/chars/guns/launcher_20x20.png → ...pn/graphics/chars/guns/launcher_20x20.png
diff --git a/...scpn/graphics/chars/guns/pistol_20x20.png → ...scpn/graphics/chars/guns/pistol_20x20.png b/...scpn/graphics/chars/guns/pistol_20x20.png → ...scpn/graphics/chars/guns/pistol_20x20.png
diff --git a/...gscpn/graphics/chars/guns/rifle_30x22.png → ...gscpn/graphics/chars/guns/rifle_30x22.png b/...gscpn/graphics/chars/guns/rifle_30x22.png → ...gscpn/graphics/chars/guns/rifle_30x22.png
diff --git a/...raphics/chars/guns/zapper_green_20x20.png → ...raphics/chars/guns/zapper_green_20x20.png b/...raphics/chars/guns/zapper_green_20x20.png → ...raphics/chars/guns/zapper_green_20x20.png
diff --git a/...mo/cyberdogs.cdogscpn/graphics/flamer.png → ...ns/cyberdogs.cdogscpn/graphics/flamer.png b/...mo/cyberdogs.cdogscpn/graphics/flamer.png → ...ns/cyberdogs.cdogscpn/graphics/flamer.png
diff --git a/.../cyberdogs.cdogscpn/graphics/launcher.png → .../cyberdogs.cdogscpn/graphics/launcher.png b/.../cyberdogs.cdogscpn/graphics/launcher.png → .../cyberdogs.cdogscpn/graphics/launcher.png
diff --git a/...o/cyberdogs.cdogscpn/graphics/megagun.png → ...s/cyberdogs.cdogscpn/graphics/megagun.png b/...o/cyberdogs.cdogscpn/graphics/megagun.png → ...s/cyberdogs.cdogscpn/graphics/megagun.png
diff --git a/...o/cyberdogs.cdogscpn/graphics/minigun.png → ...s/cyberdogs.cdogscpn/graphics/minigun.png b/...o/cyberdogs.cdogscpn/graphics/minigun.png → ...s/cyberdogs.cdogscpn/graphics/minigun.png
diff --git a/.../cyberdogs.cdogscpn/graphics/powergun.png → .../cyberdogs.cdogscpn/graphics/powergun.png b/.../cyberdogs.cdogscpn/graphics/powergun.png → .../cyberdogs.cdogscpn/graphics/powergun.png
diff --git a/...rdogs.cdogscpn/graphics/reactor_16x32.png → ...rdogs.cdogscpn/graphics/reactor_16x32.png b/...rdogs.cdogscpn/graphics/reactor_16x32.png → ...rdogs.cdogscpn/graphics/reactor_16x32.png
diff --git a/...tom/techdemo/cyberdogs.cdogscpn/guns.json → missions/cyberdogs.cdogscpn/guns.json b/...tom/techdemo/cyberdogs.cdogscpn/guns.json → missions/cyberdogs.cdogscpn/guns.json
diff --git a/...hdemo/cyberdogs.cdogscpn/map_objects.json → missions/cyberdogs.cdogscpn/map_objects.json b/...hdemo/cyberdogs.cdogscpn/map_objects.json → missions/cyberdogs.cdogscpn/map_objects.json
diff --git a/...techdemo/cyberdogs.cdogscpn/missions.json → missions/cyberdogs.cdogscpn/missions.json b/...techdemo/cyberdogs.cdogscpn/missions.json → missions/cyberdogs.cdogscpn/missions.json
diff --git a/.../techdemo/cyberdogs.cdogscpn/pickups.json → missions/cyberdogs.cdogscpn/pickups.json b/.../techdemo/cyberdogs.cdogscpn/pickups.json → missions/cyberdogs.cdogscpn/pickups.json
diff --git a/...echdemo/cyberdogs.cdogscpn/sounds/1up.ogg → missions/cyberdogs.cdogscpn/sounds/1up.ogg b/...echdemo/cyberdogs.cdogscpn/sounds/1up.ogg → missions/cyberdogs.cdogscpn/sounds/1up.ogg
diff --git a/...echdemo/cyberdogs.cdogscpn/sounds/1up.txt → missions/cyberdogs.cdogscpn/sounds/1up.txt b/...echdemo/cyberdogs.cdogscpn/sounds/1up.txt → missions/cyberdogs.cdogscpn/sounds/1up.txt