zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-11 21:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- redo branding for QZDoom

Browse source
This commit is contained in:
Rachael Alexanderson 2019-08-06 15:18:48 -04:00
parent d853961a83
commit 88fd8d01a6
8 changed files with 8532 additions and 8632 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -1,5 +1,5 @@
cmake_minimum_required( VERSION 3.1.0 )
project(GZDoom)
project(QZDoom)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@ -122,7 +122,7 @@ IF( NOT CMAKE_BUILD_TYPE )
ENDIF()
set( ZDOOM_OUTPUT_DIR ${CMAKE_BINARY_DIR} CACHE PATH "Directory where zdoom.pk3 and the executable will be created." )
set( ZDOOM_EXE_NAME "gzdoom" CACHE FILEPATH "Name of the executable to create" )
set( ZDOOM_EXE_NAME "qzdoom" CACHE FILEPATH "Name of the executable to create" )
if( MSVC )
# Allow the user to use ZDOOM_OUTPUT_DIR as a single release point.
# Use zdoom, zdoomd, zdoom64, and zdoomd64 for the binary names

12
README.md
View file

@ -1,8 +1,9 @@
# Welcome to GZDoom!
[![QZDoom Logo](https://forum.drdteam.org/download/file.php?id=3080)](https://zdoom.org/)
# Welcome to QZDoom!
[![Build Status](https://github.com/coelckers/gzdoom/workflows/Continuous%20Integration/badge.svg)](https://github.com/coelckers/gzdoom/actions?query=workflow%3A%22Continuous+Integration%22)
[![Build Status](https://ci.appveyor.com/api/projects/status/github/madame-rachelle/qzdoom?branch=master&svg=true)](https://ci.appveyor.com/project/madame-rachelle/qzdoom) [![Build Status](https://travis-ci.org/madame-rachelle/qzdoom.svg?branch=master)](https://travis-ci.org/madame-rachelle/qzdoom)
## GZDoom is a modder-friendly OpenGL and Vulkan source port based on the DOOM engine
## QZDoom is a fork of [GZDoom](https://github.com/coelckers/gzdoom) for beta testing new features that have not yet been included in GZDoom's mainline.
Copyright (c) 1998-2021 ZDoom + GZDoom teams, and contributors
@ -16,7 +17,8 @@ Special thanks to Coraline of the EDGE team for allowing us to use her [README.m
##### https://www.gnu.org/licenses/quick-guide-gplv3.en.html
---
## How to build GZDoom
## How to build QZDoom
To build GZDoom, 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.
To build QZDoom, 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.
Follow the same instructions as with GZDoom, except substituting "coelckers/gzdoom" with "madame-rachelle/qzdoom" in order to link this repository in your build environment.

BIN
src/posix/osx/zdoom.icns
View file

Binary file not shown.

17116
src/posix/zdoom.xpm
View file

File diff suppressed because it is too large Load diff

10
src/version.h
View file

@ -91,16 +91,16 @@ const char *GetVersionString();
#define SAVEVER 4559
// This is so that derivates can use the same savegame versions without worrying about engine compatibility
#define GAMESIG "GZDOOM"
#define BASEWAD "gzdoom.pk3"
#define GAMESIG "QZDOOM"
#define BASEWAD "qzdoom.pk3"
#define OPTIONALWAD "game_support.pk3"
#define GZDOOM 1
#define VR3D_ENABLED
// More stuff that needs to be different for derivatives.
#define GAMENAME "GZDoom"
#define WGAMENAME L"GZDoom"
#define GAMENAMELOWERCASE "gzdoom"
#define GAMENAME "QZDoom"
#define WGAMENAME L"QZDoom"
#define GAMENAMELOWERCASE "qzdoom"
#define FORUM_URL "http://forum.zdoom.org/"
#define BUGS_FORUM_URL "http://forum.zdoom.org/viewforum.php?f=2"

BIN
src/win32/icon1.ico
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 293 KiB

After

Width:  |  Height:  |  Size: 293 KiB

20
src/win32/zdoom.rc
View file

@ -69,13 +69,13 @@ BEGIN
" BEGIN\r\n"
" VALUE ""Comments"", ""Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg.""\r\n"
" VALUE ""CompanyName"", "" ""\r\n"
" VALUE ""FileDescription"", ""GZDoom""\r\n"
" VALUE ""FileDescription"", ""QZDoom""\r\n"
" VALUE ""FileVersion"", RC_FILEVERSION2\r\n"
" VALUE ""InternalName"", ""GZDoom""\r\n"
" VALUE ""InternalName"", ""QZDoom""\r\n"
" VALUE ""LegalCopyright"", ""Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al.""\r\n"
" VALUE ""LegalTrademarks"", ""DoomR is a Registered Trademark of id Software, Inc.""\r\n"
" VALUE ""OriginalFilename"", ""gzdoom.exe""\r\n"
" VALUE ""ProductName"", ""GZDoom""\r\n"
" VALUE ""OriginalFilename"", ""qzdoom.exe""\r\n"
" VALUE ""ProductName"", ""QZDoom""\r\n"
" VALUE ""ProductVersion"", GIT_VERSION\r\n"
" END\r\n"
" END\r\n"
@ -209,7 +209,7 @@ CAPTION "Welcome"
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
ICON IDI_ICON1,IDC_STATIC,7,7,20,20
LTEXT "Welcome to GZDoom!",IDC_STATIC,43,8,180,8
LTEXT "Welcome to QZDoom!",IDC_STATIC,43,8,180,8
LTEXT "<Version info>",IDC_WELCOME_VERSION,43,18,180,8
GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,117
LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8
@ -237,7 +237,7 @@ END
IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308
STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
CAPTION "GZDoom Very Fatal Error"
CAPTION "QZDoom Very Fatal Error"
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
CONTROL "",IDC_CRASHTAB,"SysTabControl32",WS_TABSTOP,4,4,404,280
@ -347,13 +347,13 @@ BEGIN
BEGIN
VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg."
VALUE "CompanyName", " "
VALUE "FileDescription", "GZDoom " GIT_DESCRIPTION
VALUE "FileDescription", "QZDoom " GIT_DESCRIPTION
VALUE "FileVersion", RC_FILEVERSION2
VALUE "InternalName", "GZDoom"
VALUE "InternalName", "QZDoom"
VALUE "LegalCopyright", "Copyright © 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al."
VALUE "LegalTrademarks", "Doom® is a Registered Trademark of id Software, Inc."
VALUE "OriginalFilename", "gzdoom.exe"
VALUE "ProductName", "GZDoom"
VALUE "OriginalFilename", "qzdoom.exe"
VALUE "ProductName", "QZDoom"
VALUE "ProductVersion", GIT_DESCRIPTION
END
END

2
wadsrc/CMakeLists.txt
View file

@ -1,3 +1,3 @@
cmake_minimum_required( VERSION 3.1.0 )
add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
add_pk3(qzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)