mirror of
https://github.com/ZDoom/qzdoom.git
synced 2025-01-22 08:51:28 +00:00
- this is a fork, redo branding
This commit is contained in:
Rachael Alexanderson
parent
be0478972a
commit
5fa7520fd7
8 changed files with 8533 additions and 8633 deletions
|
|
@ -26,10 +26,10 @@ build_script:
|
|||
|
||||
after_build:
|
||||
- set OUTPUT_DIR=%APPVEYOR_BUILD_FOLDER%\build\%CONFIG%\
|
||||
- 7z a ..\gzdoom.zip "%OUTPUT_DIR%gzdoom.exe" "%OUTPUT_DIR%*.pk3"
|
||||
- 7z a ..\qzdoom.zip "%OUTPUT_DIR%qzdoom.exe" "%OUTPUT_DIR%*.pk3"
|
||||
|
||||
artifacts:
|
||||
- path: gzdoom.zip
|
||||
- path: qzdoom.zip
|
||||
|
||||
notifications:
|
||||
- provider: Email
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
cmake_minimum_required( VERSION 2.8.7 )
|
||||
project(GZDoom)
|
||||
project(QZDoom)
|
||||
|
||||
if( COMMAND cmake_policy )
|
||||
if( POLICY CMP0011 )
|
||||
|
|
@ -117,7 +117,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
|
||||
|
|
|
|||
14
README.md
14
README.md
|
|
@ -1,10 +1,11 @@
|
|||
# Welcome to GZDoom!
|
||||
[](https://zdoom.org/)
|
||||
# Welcome to QZDoom!
|
||||
|
||||
[](https://ci.appveyor.com/project/coelckers/gzdoom) [](https://travis-ci.org/coelckers/gzdoom)
|
||||
[](https://ci.appveyor.com/project/madame-rachelle/qzdoom) [](https://travis-ci.org/madame-rachelle/qzdoom)
|
||||
|
||||
## GZDoom is a modder-friendly OpenGL 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-2018 ZDoom + GZDoom teams, and contributors
|
||||
Copyright (c) 1998-2019 ZDoom + GZDoom teams, and contributors
|
||||
|
||||
Doom Source (c) 1997 id Software, Raven Software, and contributors
|
||||
|
||||
|
|
@ -16,7 +17,8 @@ Special thanks to Coraline of the 3DGE team for allowing us to use her README.md
|
|||
##### 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.
|
||||
|
|
|
|||
Binary file not shown.
17116
src/posix/zdoom.xpm
17116
src/posix/zdoom.xpm
File diff suppressed because it is too large
Load diff
Binary file not shown.
|
Before Width: | Height: | Size: 293 KiB After Width: | Height: | Size: 293 KiB |
|
|
@ -72,13 +72,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"
|
||||
|
|
@ -213,7 +213,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
|
|||
FONT 8, "MS Shell Dlg"
|
||||
{
|
||||
CONTROL 101, IDC_STATIC, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20
|
||||
CONTROL "Welcome to GZDoom!", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 8, 180, 8
|
||||
CONTROL "Welcome to QZDoom!", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 8, 180, 8
|
||||
CONTROL "<Version info>", IDC_WELCOME_VERSION, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 42, 18, 180, 8
|
||||
CONTROL "IWAD selection", IDC_STATIC, BUTTON, BS_GROUPBOX | WS_CHILD | WS_VISIBLE, 8, 32, 208, 117
|
||||
CONTROL "Select which game file (IWAD) to run.", IDC_STATIC, STATIC, SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 12, 44, 190, 8
|
||||
|
|
@ -225,7 +225,7 @@ FONT 8, "MS Shell Dlg"
|
|||
CONTROL "Load lights", IDC_WELCOME_LIGHTS, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 130, 180, 51, 10
|
||||
CONTROL "Load brightmaps", IDC_WELCOME_BRIGHTMAPS, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 130, 190, 65, 10
|
||||
CONTROL "Don't ask me this again", IDC_DONTASKIWAD, BUTTON, BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 73, 211, 87, 10
|
||||
CONTROL "Play GZDoom", IDOK, BUTTON, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 228, 90, 14
|
||||
CONTROL "Play QZDoom", IDOK, BUTTON, BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 8, 228, 90, 14
|
||||
CONTROL "Exit", IDCANCEL, BUTTON, BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 166, 228, 50, 14
|
||||
}
|
||||
#else
|
||||
|
|
@ -233,7 +233,7 @@ FONT 8, "MS Shell Dlg"
|
|||
FONT 8, "MS Shell Dlg", 0, 0, 0x1
|
||||
BEGIN
|
||||
ICON IDI_ICON1,IDC_STATIC,7,7,21,20
|
||||
LTEXT "Welcome to GZDoom!",IDC_STATIC,42,8,180,8
|
||||
LTEXT "Welcome to QZDoom!",IDC_STATIC,42,8,180,8
|
||||
LTEXT "<Version info>",IDC_WELCOME_VERSION,42,18,180,8
|
||||
GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,102
|
||||
LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8
|
||||
|
|
@ -244,7 +244,7 @@ BEGIN
|
|||
CONTROL "Lights.pk3",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,46,182,51,10
|
||||
CONTROL "Brightmaps.pk3",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,111,182,65,10
|
||||
CONTROL "Don't ask me this again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,73,201,87,10
|
||||
DEFPUSHBUTTON "Play GZDoom",IDOK,8,228,90,14
|
||||
DEFPUSHBUTTON "Play QZDoom",IDOK,8,228,90,14
|
||||
PUSHBUTTON "Exit",IDCANCEL,166,228,50,14
|
||||
END
|
||||
#endif
|
||||
|
|
@ -396,7 +396,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
|
||||
|
|
@ -493,13 +493,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
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
cmake_minimum_required( VERSION 2.8.7 )
|
||||
|
||||
add_pk3(gzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
|
||||
add_pk3(qzdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static)
|
||||
|
|
|
|||
Loading…
Reference in a new issue