edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily removed crash features til it's fixed, made version 1.071a

Browse source 
changed some names for the build bot to work
This commit is contained in:
GreYFoX 2011-04-12 00:48:51 +02:00
parent 0ee65685be
commit 4a46168631
5 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bam.lua
View file

@ -267,11 +267,11 @@ function build(settings)
end
-- build client, server, version server and master server
client_exe = Link(client_settings, "teeworlds", game_shared, game_client,
client_exe = Link(client_settings, "DDRace", game_shared, game_client,
engine, client, game_editor, zlib, pnglite, wavpack,
client_link_other, client_osxlaunch)
server_exe = Link(server_settings, "teeworlds_srv", engine, server,
server_exe = Link(server_settings, "DDRace-Server", engine, server,
game_shared, game_server, zlib, server_link_other)
serverlaunch = {}

4
scripts/build.py
View file

@ -12,7 +12,7 @@ if match != None:
url_bam = "http://github.com/matricks/bam/zipball/master"
url_DDRace = "http://github.com/GreYFoX/DDRace/zipball/master"
url_DDRace = "http://github.com/oy/teeworlds/zipball/master"
url_teeworlds = "http://github.com/oy/teeworlds/zipball/master"
release_type = "server_release client_release"
arguments = OptionParser()
@ -44,7 +44,7 @@ bam_execution_path = ""
if version_bam < "0.3.0":
bam_execution_path = "src%s" % os.sep
name = "teeworlds"
name = "DDRace"
flag_clean = True
flag_download = True

6
scripts/make_release.py
View file

@ -7,7 +7,7 @@ if len(sys.argv) != 3:
print(sys.argv[0], "VERSION PLATFORM")
sys.exit(-1)
name = "teeworlds"
name = "DDRace"
version = sys.argv[1]
platform = sys.argv[2]
exe_ext = ""
@ -75,7 +75,7 @@ if include_data and not use_bundle:
if include_exe and not use_bundle:
shutil.copy(name+exe_ext, package_dir)
shutil.copy(name+"_srv"+exe_ext, package_dir)
shutil.copy(name+"-Server"+exe_ext, package_dir)
if include_src:
for p in ["src", "scripts", "datasrc", "other", "objs"]:
@ -141,7 +141,7 @@ if use_bundle:
os.mkdir(os.path.join(serverbundle_resource_dir, "data/mapres"))
copydir("data/maps", serverbundle_resource_dir)
shutil.copy("other/icons/Teeworlds_srv.icns", serverbundle_resource_dir)
shutil.copy(name+"_srv"+exe_ext, serverbundle_bin_dir)
shutil.copy(name+"-Server"+exe_ext, serverbundle_bin_dir)
shutil.copy("serverlaunch"+exe_ext, serverbundle_bin_dir + "/"+name+"_server")
file(os.path.join(serverbundle_content_dir, "Info.plist"), "w").write("""
<?xml version="1.0" encoding="UTF-8"?>

10
src/game/server/gamecontext.cpp
View file

@ -647,11 +647,7 @@ void CGameContext::OnClientEnter(int ClientID)
SendChat(-1, CGameContext::CHAT_ALL, aBuf);
SendChatTarget(ClientID, "DDRace Mod. Version: " GAME_VERSION);
SendChatTarget(ClientID, "Official site: DDRace.info");
SendChatTarget(ClientID, "For more Info /cmdlist");
SendChatTarget(ClientID, "Or visit DDRace.info");
SendChatTarget(ClientID, "To see this again say /info");
SendChatTarget(ClientID, "Note This is an Alpha release, just for testing, your feedback is important!!");
SendChatTarget(ClientID, "please visit http://DDRace.info or say /info for more info");
if(g_Config.m_SvWelcome[0]!=0) SendChatTarget(ClientID,g_Config.m_SvWelcome);
//str_format(aBuf, sizeof(aBuf), "team_join player='%d:%s' team=%d", ClientID, Server()->ClientName(ClientID), m_apPlayers[ClientID]->GetTeam());
@ -940,7 +936,7 @@ void CGameContext::OnMessage(int MsgID, CUnpacker *pUnpacker, int ClientID)
}
else if(str_comp_nocase(pMsg->m_Type, "spectate") == 0)
{
if(!g_Config.m_SvVoteSpectate)
//if(!g_Config.m_SvVoteSpectate)
{
SendChatTarget(ClientID, "Server does not allow voting to move players to spectators");
return;
@ -1616,7 +1612,7 @@ void CGameContext::OnConsoleInit()
Console()->Register("add_vote", "sr", CFGFLAG_SERVER, ConAddVote, this, "", IConsole::CONSOLELEVEL_ADMIN);
Console()->Register("remove_vote", "s", CFGFLAG_SERVER, ConRemoveVote, this, "", IConsole::CONSOLELEVEL_ADMIN);
Console()->Register("force_vote", "ss?r", CFGFLAG_SERVER, ConForceVote, this, "", IConsole::CONSOLELEVEL_ADMIN);
//Console()->Register("force_vote", "ss?r", CFGFLAG_SERVER, ConForceVote, this, "", IConsole::CONSOLELEVEL_ADMIN);
Console()->Register("clear_votes", "", CFGFLAG_SERVER, ConClearVotes, this, "", IConsole::CONSOLELEVEL_ADMIN);
Console()->Register("vote", "r", CFGFLAG_SERVER, ConVote, this, "", IConsole::CONSOLELEVEL_ADMIN);

2
src/game/version.h
View file

@ -3,6 +3,6 @@
#ifndef GAME_VERSION_H
#define GAME_VERSION_H
#include "generated/nethash.c"
#define GAME_VERSION "0.6 trunk, 1.07a"
#define GAME_VERSION "0.6 trunk, 1.071a"
#define GAME_NETVERSION "0.6 626fce9a778df4d4"
#endif