Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
DartPower committed Oct 26, 2024
1 parent 9a468bc commit c61a236
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 27 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ jobs:
cd build
mkdir package
if [[ "${{ runner.os }}" == 'Windows' ]]; then
cp ${{ matrix.config.build_type }}/Toxiphobia.exe ${{ matrix.config.build_type }}/*.pk3 package
cp ${{ matrix.config.build_type }}/Goida.exe ${{ matrix.config.build_type }}/*.pk3 package
elif [[ "${{ runner.os }}" == 'macOS' ]]; then
cp -r Toxiphobia.app package
cp -r Goida.app package
elif [[ "${{ runner.os }}" == 'Linux' ]]; then
cp Toxiphobia *.pk3 package
cp Goida *.pk3 package
fi
- name: Upload Package
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<img width="200" src="https://github.com/dpteam/ToxiphobiaEngine/assets/2005369/57c130a9-138a-4917-b449-26697590261c" alt="Toxiphobia" align="right">
<img width="200" src="https://raw.githubusercontent.com/dpteam/GoidaEngine/refs/heads/master/icon.png" alt="Goida" align="right">
<div align="left">
<h1>Toxiphobia Engine</h1>
<h1>Goida Engine</h1>

<p align="center">

<img src="https://badges.frapsoft.com/os/v1/open-source.svg?v=103" >

<img src="https://img.shields.io/github/stars/dpteam/ToxiphobiaEngine.svg?style=flat">
<img src="https://img.shields.io/github/stars/dpteam/GoidaEngine.svg?style=flat">

<img src="https://img.shields.io/github/languages/top/dpteam/ToxiphobiaEngine.svg">
<img src="https://img.shields.io/github/languages/top/dpteam/GoidaEngine.svg">

<img src="https://img.shields.io/github/issues/dpteam/ToxiphobiaEngine.svg">
<img src="https://img.shields.io/github/issues/dpteam/GoidaEngine.svg">

<img src="https://img.shields.io/github/downloads/dpteam/ToxiphobiaEngine/total.svg">
<img src="https://img.shields.io/github/downloads/dpteam/GoidaEngine/total.svg">

<!--[![Github-CI](https://github.com/dpteam/ToxiphobiaEngine/workflows/Continuous%20Integration/badge.svg)](https://github.com/drfrag666/gzdoom/actions?query=workflow%3A%22Continuous+Integration%22)-->
[![Github-CI](https://github.com/dpteam/GoidaEngine/workflows/Continuous%20Integration/badge.svg)](https://github.com/dpteam/GoidaEngine/actions?query=workflow%3A%22Continuous+Integration%22)

</p>

</div>

## So what is Toxiphobia?
Toxiphobia is a classic style LZDoom (GZDoom-based) fork with lower system requirements
## So what is Goida Engine?
Goida Engine is a classic style LZDoom (GZDoom-based) fork with lower system requirements

Copyright (c) 1998-2024 ZDoom, GZDoom, LZDoom and DartPower Team(s), and contributors

Expand All @@ -34,8 +34,8 @@ Special thanks to Coraline of the EDGE team for allowing us to use her [README.m
## Licensed under the GPL v3
License information can be found [here](https://www.gnu.org/licenses/quick-guide-gplv3.en.html).

## How to build Toxiphobia
To build Toxiphobia, please see the [wiki](https://zdoom.org/wiki/) and see the "Programmer's Corner" on the bottom-right corner of the page to build for your platform.
## How to build Goida Engine
To build Goida Engine, please see the [wiki](https://zdoom.org/wiki/) and see the "Programmer's Corner" on the bottom-right corner of the page to build for your platform.

## Contributors and other credits...
[DartPower](https://github.com/dartpower)
Expand Down
Binary file removed ico_toxiphobia.png
Binary file not shown.
Binary file added icon.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 modified logo.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 soundfont/Goida.sf2
Binary file not shown.
1 change: 0 additions & 1 deletion soundfont/Toxiphobia.sf2

This file was deleted.

2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1347,7 +1347,7 @@ endif()

add_custom_command(TARGET zdoom POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/soundfont/Toxiphobia.sf2 $<TARGET_FILE_DIR:zdoom>/soundfonts/Toxiphobia.sf2
${CMAKE_SOURCE_DIR}/soundfont/Goida.sf2 $<TARGET_FILE_DIR:zdoom>/soundfonts/Goida.sf2
COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_SOURCE_DIR}/fm_banks/GENMIDI.GS.wopl $<TARGET_FILE_DIR:zdoom>/fm_banks/GENMIDI.GS.wopl
COMMAND ${CMAKE_COMMAND} -E copy_if_different
Expand Down
10 changes: 5 additions & 5 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,16 +92,16 @@ const char *GetVersionString();
#define SAVEVER 4558

// This is so that derivates can use the same savegame versions without worrying about engine compatibility
#define GAMESIG "Toxiphobia"
#define BASEWAD "Toxiphobia.pk3"
#define GAMESIG "Goida"
#define BASEWAD "Goida.pk3"
#define OPTIONALWAD "game_support.pk3"
#define GZDOOM 1
#define VR3D_ENABLED

// More stuff that needs to be different for derivatives.
#define GAMENAME "Toxiphobia"
#define WGAMENAME L"Toxiphobia"
#define GAMENAMELOWERCASE "Toxiphobia" // toxiphobia? No. Toxiphobia!
#define GAMENAME "Goida"
#define WGAMENAME L"Goida"
#define GAMENAMELOWERCASE "goida"
#define FORUM_URL "http://forum.zdoom.org/"
#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2"

Expand Down
2 changes: 1 addition & 1 deletion wadsrc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cmake_minimum_required( VERSION 3.1.0 )

add_pk3(Toxiphobia.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
add_pk3(Goida.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// MAPINFO for Toxiphobia
// MAPINFO for Goida
include "mapinfo/doomcommon.txt"
8 changes: 4 additions & 4 deletions wadsrc_extra/static/iwadinfo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

IWad
{
Name = "Toxiphobia Game"
Autoname = "xyz.dartpower.toxiphobia.game"
Name = "Goida Game"
Autoname = "xyz.dartpower.goida.game"
Game = "Doom"
Config = "Doom"
IWADName = "ToxiphobiaGame.pk3", 1
Mapinfo = "mapinfo/ToxiphobiaGame.txt"
IWADName = "GoidaGame.pk3", 1
Mapinfo = "mapinfo/GoidaGame.txt"
Compatibility = "Shorttex"
MustContain = "MAP01", "MAP30"
BannerColors = "a8 00 00", "a8 a8 a8"
Expand Down

0 comments on commit c61a236

Please sign in to comment.