ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-10 12:01:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #535 from illwieckz/unvanquished

Browse source 
initial unvanquished support
This commit is contained in:
Timothee "TTimo" Besset 2018-01-21 15:09:53 -06:00 committed by GitHub
commit c0a5da84f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 199 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -19,7 +19,7 @@ Useful links
Supported games Supported games
--------------- ---------------
GtkRadiant provides level editing support for [Quake](https://en.wikipedia.org/wiki/Quake_(video_game)), [Quake2](https://en.wikipedia.org/wiki/Quake_II), [Quake III Arena](https://ioquake3.org), [QuakeLive](https://www.quakelive.com), [Quetoo](http://quetoo.org), [Return to Castle Wolfenstein](https://en.wikipedia.org/wiki/Return_to_Castle_Wolfenstein), [Star Trek Voyager: Elite Force](https://en.wikipedia.org/wiki/Star_Trek:_Voyager_–_Elite_Force), [Star Wars Jedi Knight: Jedi Academy](https://en.wikipedia.org/wiki/Star_Wars_Jedi_Knight:_Jedi_Academy), [Urban Terror](http://urbanterror.info), [Wolfenstein: Enemy Territory](http://www.splashdamage.com/content/wolfenstein-enemy-territory-barracks). GtkRadiant provides level editing support for [Quake](https://en.wikipedia.org/wiki/Quake_(video_game)), [Quake2](https://en.wikipedia.org/wiki/Quake_II), [Quake III Arena](https://ioquake3.org), [QuakeLive](https://www.quakelive.com), [Quetoo](http://quetoo.org), [Return to Castle Wolfenstein](https://en.wikipedia.org/wiki/Return_to_Castle_Wolfenstein), [Star Trek Voyager: Elite Force](https://en.wikipedia.org/wiki/Star_Trek:_Voyager_–_Elite_Force), [Star Wars Jedi Knight: Jedi Academy](https://en.wikipedia.org/wiki/Star_Wars_Jedi_Knight:_Jedi_Academy), [Unvanquished](https://www.unvanquished.net), [Urban Terror](http://urbanterror.info), [Wolfenstein: Enemy Territory](http://www.splashdamage.com/content/wolfenstein-enemy-territory-barracks).
How to build How to build
------------ ------------

10
config.py
View file

@ -31,7 +31,7 @@ class Config:
# platforms for which to assemble a setup # platforms for which to assemble a setup
self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ] self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
# paks to assemble in the setup # paks to assemble in the setup
self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'QuetooPack', 'JAPack', 'STVEFPack', 'WolfPack' ] self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'QuetooPack', 'JAPack', 'STVEFPack', 'WolfPack', 'UnvanquishedPack' ]
def __repr__( self ): def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected ) return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@ -262,10 +262,14 @@ class Config:
def FetchGamePaks( self, path ): def FetchGamePaks( self, path ):
for pak in self.setup_packs: for pak in self.setup_packs:
pak_path = os.path.join( path, 'installs', pak )
if pak == 'UnvanquishedPack':
svnurl = 'https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/'
else:
svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak
self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) ) self.CheckoutOrUpdate( svnurl, pak_path )
def CopyTree( self, src, dst ): def CopyTree( self, src, dst):
for root, dirs, files in os.walk( src ): for root, dirs, files in os.walk( src ):
target_dir = os.path.join( dst, root[root.find( '/' )+1:] ) target_dir = os.path.join( dst, root[root.find( '/' )+1:] )
print ( target_dir ) print ( target_dir )

24
radiant/preferences.cpp
View file

@ -3479,6 +3479,9 @@ void CGameInstall::BuildDialog() {
case GAME_WOLF: case GAME_WOLF:
gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( game_select_combo ), _( "Return To Castle Wolfenstein" ) ); gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( game_select_combo ), _( "Return To Castle Wolfenstein" ) );
break; break;
case GAME_UNVANQUISHED:
gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( game_select_combo ), _( "Unvanquished" ) );
break;
} }
iGame++; iGame++;
} }
@ -3645,6 +3648,10 @@ void CGameInstall::Run() {
gamePack = WOLF_PACK; gamePack = WOLF_PACK;
gameFilePath += WOLF_GAME; gameFilePath += WOLF_GAME;
break; break;
case GAME_UNVANQUISHED:
gamePack = UNVANQUISHED_PACK;
gameFilePath += UNVANQUISHED_GAME;
break;
default: default:
Error( "Invalid game selected: %d", m_availGames[ m_nComboSelect ] ); Error( "Invalid game selected: %d", m_availGames[ m_nComboSelect ] );
} }
@ -3832,6 +3839,20 @@ void CGameInstall::Run() {
} }
break; break;
} }
case GAME_UNVANQUISHED: {
fprintf( fg, " prefix=\".unvanquished\"\n" );
fprintf( fg, " basegame=\"pkg\"\n" );
// Hardcoded fix for "missing" shaderlist in gamepack
Str dest = m_strEngine.GetBuffer();
dest += "/pkg/scripts/shaderlist.txt";
if( CheckFile( dest.GetBuffer() ) != PATH_FILE ) {
Str source = gameInstallPath.GetBuffer();
source += "pkg/scripts/default_shaderlist.txt";
radCopyFile( source.GetBuffer(), dest.GetBuffer() );
}
break;
}
} }
fprintf( fg, "/>\n" ); fprintf( fg, "/>\n" );
fclose( fg ); fclose( fg );
@ -3896,6 +3917,9 @@ void CGameInstall::ScanGames() {
if ( stricmp( dirname, Q1_PACK ) == 0 ) { if ( stricmp( dirname, Q1_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_Q1; m_availGames[ iGame++ ] = GAME_Q1;
} }
if ( stricmp( dirname, UNVANQUISHED_PACK ) == 0) {
m_availGames[ iGame++ ] = GAME_UNVANQUISHED;
}
} }
Sys_Printf( "No installable games found in: %s\n", Sys_Printf( "No installable games found in: %s\n",
pakPaths.GetBuffer() ); pakPaths.GetBuffer() );

3
radiant/preferences.h
View file

@ -217,6 +217,7 @@ void Dump();
#define STVEF_GAME "stvef.game" #define STVEF_GAME "stvef.game"
#define WOLF_GAME "wolf.game" #define WOLF_GAME "wolf.game"
#define Q1_GAME "q1.game" #define Q1_GAME "q1.game"
#define UNVANQUISHED_GAME "unvanquished.game"
#define Q3_PACK "Q3Pack" #define Q3_PACK "Q3Pack"
#define URT_PACK "UrTPack" #define URT_PACK "UrTPack"
@ -233,6 +234,7 @@ void Dump();
#define STVEF_PACK "STVEFPack" #define STVEF_PACK "STVEFPack"
#define WOLF_PACK "WolfPack" #define WOLF_PACK "WolfPack"
#define Q1_PACK "Q1Pack" #define Q1_PACK "Q1Pack"
#define UNVANQUISHED_PACK "UnvanquishedPack"
class CGameInstall : public Dialog { class CGameInstall : public Dialog {
public: public:
@ -262,6 +264,7 @@ public:
GAME_STVEF, GAME_STVEF,
GAME_WOLF, GAME_WOLF,
GAME_Q1, GAME_Q1,
GAME_UNVANQUISHED,
GAME_COUNT GAME_COUNT
}; };

160
tools/quake3/q3map2/game_unvanquished.h Normal file
View file

@ -0,0 +1,160 @@
/* -------------------------------------------------------------------------------
Copyright (C) 1999-2007 id Software, Inc. and contributors.
For a list of contributors, see the accompanying CONTRIBUTORS file.
This file is part of GtkRadiant.
GtkRadiant is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
GtkRadiant is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GtkRadiant; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
----------------------------------------------------------------------------------
This code has been altered significantly from its original form, to support
several games based on the Quake III Arena engine, in the form of "Q3Map2."
------------------------------------------------------------------------------- */
/* Derived from Tremulous support by LinuxManMikeC */
/* Updated to Unvanquished support by Neumond */
/* marker */
#ifndef GAME_UNVANQUISHED_H
#define GAME_UNVANQUISHED_H
/* -------------------------------------------------------------------------------
content and surface flags - also uses defines from game_quake3.h
------------------------------------------------------------------------------- */
#define UNV_CONT_NOALIENBUILD 0x1000
#define UNV_CONT_NOHUMANBUILD 0x2000
#define UNV_CONT_NOBUILD 0x4000
#define UNV_SURF_NOALIENBUILDSURFACE 0x80000
#define UNV_SURF_NOHUMANBUILDSURFACE 0x100000
#define UNV_SURF_NOBUILDSURFACE 0x200000
/* -------------------------------------------------------------------------------
game_t struct
------------------------------------------------------------------------------- */
{
"unvanquished", /* -game x */
"pkg", /* default base game data dir */
".unvanquished", /* unix home sub-dir */
"unvanquished", /* magic path word */
"scripts", /* shader directory */
1048575, /* max lightmapped surface verts */
1048575, /* max surface verts */
1048575, /* max surface indexes */
qfalse, /* flares */
"flareshader", /* default flare shader */
qfalse, /* wolf lighting model? */
128, /* lightmap width/height */
1.0f, /* lightmap gamma */
1.0f, /* lightmap compensate */
"IBSP", /* bsp file prefix */
46, /* bsp file version */
qfalse, /* cod-style lump len/ofs order */
LoadIBSPFile, /* bsp load function */
WriteIBSPFile, /* bsp write function */
{
/* name contentFlags contentFlagsClear surfaceFlags surfaceFlagsClear compileFlags compileFlagsClear */
/* default */
{ "default", Q_CONT_SOLID, -1, 0, -1, C_SOLID, -1 },
/* ydnar */
{ "lightgrid", 0, 0, 0, 0, C_LIGHTGRID, 0 },
{ "antiportal", 0, 0, 0, 0, C_ANTIPORTAL, 0 },
{ "skip", 0, 0, 0, 0, C_SKIP, 0 },
/* compiler */
{ "origin", Q_CONT_ORIGIN, Q_CONT_SOLID, 0, 0, C_ORIGIN | C_TRANSLUCENT, C_SOLID },
{ "areaportal", Q_CONT_AREAPORTAL, Q_CONT_SOLID, 0, 0, C_AREAPORTAL | C_TRANSLUCENT, C_SOLID },
{ "trans", Q_CONT_TRANSLUCENT, 0, 0, 0, C_TRANSLUCENT, 0 },
{ "detail", Q_CONT_DETAIL, 0, 0, 0, C_DETAIL, 0 },
{ "structural", Q_CONT_STRUCTURAL, 0, 0, 0, C_STRUCTURAL, 0 },
{ "hint", 0, 0, Q_SURF_HINT, 0, C_HINT, 0 },
{ "nodraw", 0, 0, Q_SURF_NODRAW, 0, C_NODRAW, 0 },
{ "alphashadow", 0, 0, Q_SURF_ALPHASHADOW, 0, C_ALPHASHADOW | C_TRANSLUCENT, 0 },
{ "lightfilter", 0, 0, Q_SURF_LIGHTFILTER, 0, C_LIGHTFILTER | C_TRANSLUCENT, 0 },
{ "nolightmap", 0, 0, Q_SURF_VERTEXLIT, 0, C_VERTEXLIT, 0 },
{ "pointlight", 0, 0, Q_SURF_VERTEXLIT, 0, C_VERTEXLIT, 0 },
/* game */
{ "nonsolid", 0, Q_CONT_SOLID, Q_SURF_NONSOLID, 0, 0, C_SOLID },
{ "trigger", Q_CONT_TRIGGER, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "water", Q_CONT_WATER, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID },
{ "slime", Q_CONT_SLIME, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID },
{ "lava", Q_CONT_LAVA, Q_CONT_SOLID, 0, 0, C_LIQUID | C_TRANSLUCENT, C_SOLID },
{ "playerclip", Q_CONT_PLAYERCLIP, Q_CONT_SOLID, 0, 0, C_DETAIL | C_TRANSLUCENT, C_SOLID },
{ "monsterclip", Q_CONT_MONSTERCLIP, Q_CONT_SOLID, 0, 0, C_DETAIL | C_TRANSLUCENT, C_SOLID },
{ "nodrop", Q_CONT_NODROP, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "clusterportal", Q_CONT_CLUSTERPORTAL, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "donotenter", Q_CONT_DONOTENTER, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "botclip", Q_CONT_BOTCLIP, Q_CONT_SOLID, 0, 0, C_TRANSLUCENT, C_SOLID },
{ "fog", Q_CONT_FOG, Q_CONT_SOLID, 0, 0, C_FOG, C_SOLID },
{ "sky", 0, 0, Q_SURF_SKY, 0, C_SKY, 0 },
{ "slick", 0, 0, Q_SURF_SLICK, 0, 0, 0 },
{ "noimpact", 0, 0, Q_SURF_NOIMPACT, 0, 0, 0 },
{ "nomarks", 0, 0, Q_SURF_NOMARKS, 0, C_NOMARKS, 0 },
{ "ladder", 0, 0, Q_SURF_LADDER, 0, 0, 0 },
{ "nodamage", 0, 0, Q_SURF_NODAMAGE, 0, 0, 0 },
{ "metalsteps", 0, 0, Q_SURF_METALSTEPS, 0, 0, 0 },
{ "flesh", 0, 0, Q_SURF_FLESH, 0, 0, 0 },
{ "nosteps", 0, 0, Q_SURF_NOSTEPS, 0, 0, 0 },
{ "nodlight", 0, 0, Q_SURF_NODLIGHT, 0, 0, 0 },
{ "dust", 0, 0, Q_SURF_DUST, 0, 0, 0 },
/* unvanquished */
{"noalienbuild", UNV_CONT_NOALIENBUILD, 0, 0, 0, 0, 0 },
{"nohumanbuild", UNV_CONT_NOHUMANBUILD, 0, 0, 0, 0, 0 },
{"nobuild", UNV_CONT_NOBUILD, 0, 0, 0, 0, 0 },
{"noalienbuildsurface", 0, 0, UNV_SURF_NOALIENBUILDSURFACE, 0, 0, 0 },
{"nohumanbuildsurface", 0, 0, UNV_SURF_NOHUMANBUILDSURFACE, 0, 0, 0 },
{"nobuildsurface", 0, 0, UNV_SURF_NOBUILDSURFACE, 0, 0, 0 },
/* null */
{ NULL, 0, 0, 0, 0, 0, 0 }
}
}
/* end marker */
#endif

1
tools/quake3/q3map2/path_init.c
View file

@ -326,7 +326,6 @@ void InitPaths( int *argc, char **argv ){
int i, j, k, len, len2; int i, j, k, len, len2;
char temp[ MAX_OS_PATH ]; char temp[ MAX_OS_PATH ];
/* note it */ /* note it */
Sys_FPrintf( SYS_VRB, "--- InitPaths ---\n" ); Sys_FPrintf( SYS_VRB, "--- InitPaths ---\n" );

2
tools/quake3/q3map2/q3map2.h
View file

@ -1886,6 +1886,8 @@ Q_EXTERN game_t games[]
#include "game_nexuiz.h" /* most be after game_quake3.h as they share defines! */ #include "game_nexuiz.h" /* most be after game_quake3.h as they share defines! */
, ,
#include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */ #include "game_tremulous.h" /*LinuxManMikeC: must be after game_quake3.h, depends on #define's set in it */
,
#include "game_unvanquished.h" /* must be after game_quake3.h as they share defines! */
, ,
#include "game_tenebrae.h" #include "game_tenebrae.h"
, ,