diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..89b6eb660 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,18 @@ +*.cpp ident +*.h ident + +# Set the default behavior, in case people don't have core.autocrlf set. +* text=auto + +# Explicitly declare text files you want to always be normalized and converted +# to native line endings on checkout. +*.c text +*.h text +*.cs text +*.jade text +*.json text +*.js text +*.css text +*.htm text +*.txt text +*.sh text eol=lf diff --git a/nel/src/net/admin.cpp b/nel/src/net/admin.cpp index 4389e0f34..268abdc55 100644 --- a/nel/src/net/admin.cpp +++ b/nel/src/net/admin.cpp @@ -612,7 +612,7 @@ void initAdmin (bool dontUseAES) { CUnifiedNetwork::getInstance()->setServiceUpCallback ("AES", cbAESConnection, NULL); CUnifiedNetwork::getInstance()->setServiceDownCallback ("AES", cbAESDisconnection, NULL); - CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:49997")); + CUnifiedNetwork::getInstance()->addService ("AES", CInetAddress("localhost:43997")); } CUnifiedNetwork::getInstance()->addCallbackArray (CallbackArray, sizeof(CallbackArray)/sizeof(CallbackArray[0])); } diff --git a/nel/src/net/login_client.cpp b/nel/src/net/login_client.cpp index 0f4383e16..888597418 100644 --- a/nel/src/net/login_client.cpp +++ b/nel/src/net/login_client.cpp @@ -141,7 +141,7 @@ string CLoginClient::authenticateBegin(const string &loginServiceAddr, const ucs string addr = loginServiceAddr; if(addr.find(":") == string::npos) - addr += ":49997"; + addr += ":43997"; if(_LSCallbackClient->connected()) _LSCallbackClient->disconnect(); _LSCallbackClient->connect (CInetAddress(addr)); diff --git a/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py index fd85aa5a7..3a1252821 100755 --- a/nel/tools/build_gamedata/0_setup.py +++ b/nel/tools/build_gamedata/0_setup.py @@ -250,13 +250,19 @@ if not args.noconf: DummyUnknownName LinuxServiceExecutableDirectory except NameError: - LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin" + LinuxServiceExecutableDirectory = "R:/build/server_gcc/bin" try: if args.preset: DummyUnknownName LinuxClientExecutableDirectory except NameError: - LinuxClientExecutableDirectory = "R:/build/gcc_client/bin" + LinuxClientExecutableDirectory = "R:/build/client_gcc/bin" + try: + if args.preset: + DummyUnknownName + PatchmanDevDirectory + except NameError: + PatchmanDevDirectory = "R:/patchman/terminal_dev" try: if args.preset: DummyUnknownName @@ -358,6 +364,7 @@ if not args.noconf: WindowsExeDllCfgDirectories[6] = askVar(log, "[IN] Septenary Windows exe/dll/cfg Directory", WindowsExeDllCfgDirectories[6]).replace("\\", "/") LinuxServiceExecutableDirectory = askVar(log, "[IN] Linux Service Executable Directory", LinuxServiceExecutableDirectory).replace("\\", "/") LinuxClientExecutableDirectory = askVar(log, "[IN] Linux Client Executable Directory", LinuxClientExecutableDirectory).replace("\\", "/") + PatchmanDevDirectory = askVar(log, "[IN] Patchman Directory", PatchmanDevDirectory).replace("\\", "/") PatchmanCfgAdminDirectory = askVar(log, "[IN] Patchman Cfg Admin Directory", PatchmanCfgAdminDirectory).replace("\\", "/") PatchmanCfgDefaultDirectory = askVar(log, "[IN] Patchman Cfg Default Directory", PatchmanCfgDefaultDirectory).replace("\\", "/") PatchmanBridgeServerDirectory = askVar(log, "[OUT] Patchman Bridge Server Patch Directory", PatchmanBridgeServerDirectory).replace("\\", "/") @@ -453,6 +460,7 @@ if not args.noconf: sf.write("WindowsExeDllCfgDirectories = " + str(WindowsExeDllCfgDirectories) + "\n") sf.write("LinuxServiceExecutableDirectory = \"" + str(LinuxServiceExecutableDirectory) + "\"\n") sf.write("LinuxClientExecutableDirectory = \"" + str(LinuxClientExecutableDirectory) + "\"\n") + sf.write("PatchmanDevDirectory = \"" + str(PatchmanDevDirectory) + "\"\n") sf.write("PatchmanCfgAdminDirectory = \"" + str(PatchmanCfgAdminDirectory) + "\"\n") sf.write("PatchmanCfgDefaultDirectory = \"" + str(PatchmanCfgDefaultDirectory) + "\"\n") sf.write("PatchmanBridgeServerDirectory = \"" + str(PatchmanBridgeServerDirectory) + "\"\n") @@ -577,6 +585,7 @@ if not args.noverify: findTool(log, ToolDirectories, TranslationToolsTool, ToolSuffix) findTool(log, ToolDirectories, BuildWorldPackedColTool, ToolSuffix) findTool(log, ToolDirectories, R2IslandsTexturesTool, ToolSuffix) + findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix) log.close() if os.path.isfile("0_setup.log"): diff --git a/nel/tools/build_gamedata/b1_client_dev.py b/nel/tools/build_gamedata/b1_client_dev.py index 168a06ab1..e674fefb9 100755 --- a/nel/tools/build_gamedata/b1_client_dev.py +++ b/nel/tools/build_gamedata/b1_client_dev.py @@ -92,8 +92,13 @@ for category in InstallClientData: for package in category["Packages"]: printLog(log, "PACKAGE " + package[0]) mkPath(log, InstallDirectory + "/" + package[0]) - copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath) - copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive) + if "exedll" in package[0]: + if package[0] == "exedll": # or package[0] == platformExeDll # TODO: 64-bit and Linux separation of exedll, only include one + copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPath) + copyFileIfNeeded(log, InstallDirectory + "/" + package[0] + "/client_default.cfg", targetPathLive) + else: + copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPath) + copyFilesNoTreeIfNeeded(log, InstallDirectory + "/" + package[0], targetPathLive) printLog(log, "") log.close() diff --git a/nel/tools/build_gamedata/b3_shard_dev.py b/nel/tools/build_gamedata/b3_shard_dev.py new file mode 100644 index 000000000..c596f7c31 --- /dev/null +++ b/nel/tools/build_gamedata/b3_shard_dev.py @@ -0,0 +1,127 @@ +#!/usr/bin/python +# +# \file b2_shard_data.py +# \brief Install shard data +# \date 2009-02-18 16:19GMT +# \author Jan Boon (Kaetemi) +# Python port of game data build pipeline. +# Install shard data +# +# NeL - MMORPG Framework +# Copyright (C) 2009-2014 by authors +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# + +import time, sys, os, shutil, subprocess, distutils.dir_util +sys.path.append("configuration") + +if os.path.isfile("log.log"): + os.remove("log.log") +log = open("log.log", "w") +from scripts import * +from buildsite_local import * +from tools import * + +sys.path.append(WorkspaceDirectory) +from projects import * + +# Log error +printLog(log, "") +printLog(log, "-------") +printLog(log, "--- Install to shard dev") +printLog(log, "-------") +printLog(log, time.strftime("%Y-%m-%d %H:%MGMT", time.gmtime(time.time()))) +printLog(log, "") + +# Find tools +PatchmanService = findTool(log, ToolDirectories, PatchmanServiceTool, ToolSuffix) +printLog(log, "") + +mkPath(log, ShardDevDirectory) +mkPath(log, ShardDevDirectory + "/local") +printLog(log, ">>> Generate shard dev local.cfg <<<") +cfg = open(ShardDevDirectory + "/local.cfg", "w") +cfg.write("WindowStyle = \"WIN\";\n") +cfg.write("Paths += {\n") +cfg.write(" \"" + ShardDevDirectory + "/local\",\n") +cfg.write(" \"" + DataCommonDirectory + "\",\n") +cfg.write(" \"" + DataShardDirectory + "\",\n") +cfg.write(" \"" + LeveldesignDirectory + "\",\n") +cfg.write(" \"" + WorldEditorFilesDirectory + "\",\n") +for dir in InstallShardDataDirectories: + mkPath(log, ShardInstallDirectory + "/" + dir) + cfg.write(" \"" + ShardInstallDirectory + "/" + dir + "\",\n") +for multiDir in InstallShardDataMultiDirectories: + dstDir = multiDir[0] + mkPath(log, ShardInstallDirectory + "/" + dstDir) + cfg.write(" \"" + ShardInstallDirectory + "/" + dstDir + "\",\n") +cfg.write("};\n") +cfg.write("StartCommands += {\n") +cfg.write(" // Don't launch AES on development shard for now\n") +cfg.write(" \"gw_aes.transportRemove aes_l3c\",\n") +cfg.write("};\n") +cfg.write("DontNeedBackend = 1;\n") +cfg.flush() +cfg.close() +printLog(log, "") + +for execDir in InstallShardDataExecutables: + dstDir = execDir[0] + mkPath(log, PatchmanCfgDefaultDirectory) + mkPath(log, InstallDirectory) + mkPath(log, ShardDevDirectory + "/live/" + dstDir) + printLog(log, "SHARD PACKAGE " + dstDir) + copyFileListNoTreeIfNeeded(log, PatchmanCfgDefaultDirectory, ShardDevDirectory + "/live/" + dstDir, execDir[2]) + copyFileListNoTreeIfNeeded(log, InstallDirectory, ShardDevDirectory + "/live/" + dstDir, execDir[3]) + for cfgName in execDir[2]: + cfgPath = ShardDevDirectory + "/live/" + dstDir + "/" + cfgName + found = False + with open(cfgPath, "r") as f: + for l in f: + if "Paths += {" in l: + found = True + if not found: + with open(cfgPath, "a") as cfg: + cfg.write("\n") + cfg.write("Paths += {\n") + cfg.write(" \"" + ShardDevDirectory + "/live/" + dstDir + "\",\n") + cfg.write("};\n") + cfg.write("\n") + cfg.flush() +printLog(log, "") + + +if PatchmanService == "": + toolLogFail(log, PatchmanServiceTool, ToolSuffix) +else: + mkPath(log, PatchmanDevDirectory) + cwDir = os.getcwd().replace("\\", "/") + os.chdir(PatchmanDevDirectory) + if os.path.isfile("log.log"): + os.remove("log.log") + subprocess.call([ PatchmanService, "-C.", "-L." ]) + if os.path.isfile("log.log"): + f = open("log.log", "r") + for l in f: + printLog(log, l.rstrip()) + f.close() + os.chdir(cwDir) + printLog(log, "") + +log.close() +if os.path.isfile("b3_shard_dev.log"): + os.remove("b3_shard_dev.log") +shutil.copy("log.log", time.strftime("%Y-%m-%d-%H-%M-GMT", time.gmtime(time.time())) + "_shard_dev.log") +shutil.move("log.log", "b3_shard_dev.log") diff --git a/nel/tools/build_gamedata/configuration/tools.py b/nel/tools/build_gamedata/configuration/tools.py index ee933c8e9..e27f4c490 100755 --- a/nel/tools/build_gamedata/configuration/tools.py +++ b/nel/tools/build_gamedata/configuration/tools.py @@ -98,4 +98,5 @@ PatchGenTool = "patch_gen" TranslationToolsTool = "translation_tools" BuildWorldPackedColTool = "build_world_packed_col" R2IslandsTexturesTool = "r2_islands_textures" +PatchmanServiceTool = "ryzom_patchman_service" SevenZipTool = "7za" diff --git a/nel/tools/build_gamedata/processes/_dummy/3_install.py b/nel/tools/build_gamedata/processes/_dummy/3_install.py index d809646b8..345f96dd5 100755 --- a/nel/tools/build_gamedata/processes/_dummy/3_install.py +++ b/nel/tools/build_gamedata/processes/_dummy/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/ai_wmap/3_install.py b/nel/tools/build_gamedata/processes/ai_wmap/3_install.py index fb81b991d..64f9ae0bc 100755 --- a/nel/tools/build_gamedata/processes/ai_wmap/3_install.py +++ b/nel/tools/build_gamedata/processes/ai_wmap/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/anim/3_install.py b/nel/tools/build_gamedata/processes/anim/3_install.py index 896f43db0..a93ae0514 100755 --- a/nel/tools/build_gamedata/processes/anim/3_install.py +++ b/nel/tools/build_gamedata/processes/anim/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/cartographer/3_install.py b/nel/tools/build_gamedata/processes/cartographer/3_install.py index 424e198ef..904d9eb9f 100644 --- a/nel/tools/build_gamedata/processes/cartographer/3_install.py +++ b/nel/tools/build_gamedata/processes/cartographer/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/cegui/3_install.py b/nel/tools/build_gamedata/processes/cegui/3_install.py index d1d6547ad..1c8bb7070 100755 --- a/nel/tools/build_gamedata/processes/cegui/3_install.py +++ b/nel/tools/build_gamedata/processes/cegui/3_install.py @@ -30,7 +30,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/clodbank/3_install.py b/nel/tools/build_gamedata/processes/clodbank/3_install.py index b8da3d280..a69b27b93 100755 --- a/nel/tools/build_gamedata/processes/clodbank/3_install.py +++ b/nel/tools/build_gamedata/processes/clodbank/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/copy/3_install.py b/nel/tools/build_gamedata/processes/copy/3_install.py index 7bcacc473..26fe4fc5b 100755 --- a/nel/tools/build_gamedata/processes/copy/3_install.py +++ b/nel/tools/build_gamedata/processes/copy/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/displace/3_install.py b/nel/tools/build_gamedata/processes/displace/3_install.py index 76c0c03e4..ebc0b5b66 100755 --- a/nel/tools/build_gamedata/processes/displace/3_install.py +++ b/nel/tools/build_gamedata/processes/displace/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/farbank/3_install.py b/nel/tools/build_gamedata/processes/farbank/3_install.py index d9164f84a..7c560e980 100755 --- a/nel/tools/build_gamedata/processes/farbank/3_install.py +++ b/nel/tools/build_gamedata/processes/farbank/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/font/3_install.py b/nel/tools/build_gamedata/processes/font/3_install.py index 11e74ccfe..4456f4b21 100755 --- a/nel/tools/build_gamedata/processes/font/3_install.py +++ b/nel/tools/build_gamedata/processes/font/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/ig/3_install.py b/nel/tools/build_gamedata/processes/ig/3_install.py index 7ab5f182d..3c36ad5f3 100755 --- a/nel/tools/build_gamedata/processes/ig/3_install.py +++ b/nel/tools/build_gamedata/processes/ig/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/ig_light/3_install.py b/nel/tools/build_gamedata/processes/ig_light/3_install.py index 332d02184..b35e4dc02 100755 --- a/nel/tools/build_gamedata/processes/ig_light/3_install.py +++ b/nel/tools/build_gamedata/processes/ig_light/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/interface/3_install.py b/nel/tools/build_gamedata/processes/interface/3_install.py index d7f052561..634bdbc5f 100755 --- a/nel/tools/build_gamedata/processes/interface/3_install.py +++ b/nel/tools/build_gamedata/processes/interface/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/ligo/3_install.py b/nel/tools/build_gamedata/processes/ligo/3_install.py index 9d9e59b54..f85a2695b 100755 --- a/nel/tools/build_gamedata/processes/ligo/3_install.py +++ b/nel/tools/build_gamedata/processes/ligo/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/map/3_install.py b/nel/tools/build_gamedata/processes/map/3_install.py index a5a56bb94..9ec8def8c 100755 --- a/nel/tools/build_gamedata/processes/map/3_install.py +++ b/nel/tools/build_gamedata/processes/map/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/pacs_prim/3_install.py b/nel/tools/build_gamedata/processes/pacs_prim/3_install.py index da932c469..c08294da7 100755 --- a/nel/tools/build_gamedata/processes/pacs_prim/3_install.py +++ b/nel/tools/build_gamedata/processes/pacs_prim/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py b/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py index 73656122c..7acf474c8 100755 --- a/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py +++ b/nel/tools/build_gamedata/processes/pacs_prim_list/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/properties/3_install.py b/nel/tools/build_gamedata/processes/properties/3_install.py index 79da071c0..ac24d80ac 100755 --- a/nel/tools/build_gamedata/processes/properties/3_install.py +++ b/nel/tools/build_gamedata/processes/properties/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/ps/3_install.py b/nel/tools/build_gamedata/processes/ps/3_install.py index 56713d999..e9cf393af 100755 --- a/nel/tools/build_gamedata/processes/ps/3_install.py +++ b/nel/tools/build_gamedata/processes/ps/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/pz/3_install.py b/nel/tools/build_gamedata/processes/pz/3_install.py index c4feedef1..49670c780 100644 --- a/nel/tools/build_gamedata/processes/pz/3_install.py +++ b/nel/tools/build_gamedata/processes/pz/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/rbank/3_install.py b/nel/tools/build_gamedata/processes/rbank/3_install.py index c806c79f9..d3897398b 100755 --- a/nel/tools/build_gamedata/processes/rbank/3_install.py +++ b/nel/tools/build_gamedata/processes/rbank/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/samplebank/3_install.py b/nel/tools/build_gamedata/processes/samplebank/3_install.py index 104f76681..5923f1766 100644 --- a/nel/tools/build_gamedata/processes/samplebank/3_install.py +++ b/nel/tools/build_gamedata/processes/samplebank/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/shape/3_install.py b/nel/tools/build_gamedata/processes/shape/3_install.py index d96770c28..964408dc5 100755 --- a/nel/tools/build_gamedata/processes/shape/3_install.py +++ b/nel/tools/build_gamedata/processes/shape/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/sheet_id/3_install.py b/nel/tools/build_gamedata/processes/sheet_id/3_install.py index 9f27b0dae..4c8bd6800 100755 --- a/nel/tools/build_gamedata/processes/sheet_id/3_install.py +++ b/nel/tools/build_gamedata/processes/sheet_id/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/sheets/3_install.py b/nel/tools/build_gamedata/processes/sheets/3_install.py index ed6efaffd..590eb647e 100755 --- a/nel/tools/build_gamedata/processes/sheets/3_install.py +++ b/nel/tools/build_gamedata/processes/sheets/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/sheets_shard/3_install.py b/nel/tools/build_gamedata/processes/sheets_shard/3_install.py index ba7e1a8a8..a2cb51cde 100755 --- a/nel/tools/build_gamedata/processes/sheets_shard/3_install.py +++ b/nel/tools/build_gamedata/processes/sheets_shard/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/sign/3_install.py b/nel/tools/build_gamedata/processes/sign/3_install.py index b537da92d..35feb223a 100644 --- a/nel/tools/build_gamedata/processes/sign/3_install.py +++ b/nel/tools/build_gamedata/processes/sign/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/skel/3_install.py b/nel/tools/build_gamedata/processes/skel/3_install.py index f70a0258f..0d3e19856 100755 --- a/nel/tools/build_gamedata/processes/skel/3_install.py +++ b/nel/tools/build_gamedata/processes/skel/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/smallbank/3_install.py b/nel/tools/build_gamedata/processes/smallbank/3_install.py index 310cdaa52..7ef4f1474 100755 --- a/nel/tools/build_gamedata/processes/smallbank/3_install.py +++ b/nel/tools/build_gamedata/processes/smallbank/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/sound/3_install.py b/nel/tools/build_gamedata/processes/sound/3_install.py index b8078609f..d6066e514 100644 --- a/nel/tools/build_gamedata/processes/sound/3_install.py +++ b/nel/tools/build_gamedata/processes/sound/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/soundbank/3_install.py b/nel/tools/build_gamedata/processes/soundbank/3_install.py index e8a2a6242..706471973 100644 --- a/nel/tools/build_gamedata/processes/soundbank/3_install.py +++ b/nel/tools/build_gamedata/processes/soundbank/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/swt/3_install.py b/nel/tools/build_gamedata/processes/swt/3_install.py index b70e623f5..0d96b3d42 100755 --- a/nel/tools/build_gamedata/processes/swt/3_install.py +++ b/nel/tools/build_gamedata/processes/swt/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/tiles/3_install.py b/nel/tools/build_gamedata/processes/tiles/3_install.py index a9a31187e..062dedfd6 100755 --- a/nel/tools/build_gamedata/processes/tiles/3_install.py +++ b/nel/tools/build_gamedata/processes/tiles/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/veget/3_install.py b/nel/tools/build_gamedata/processes/veget/3_install.py index 5801e6392..ea63c6faf 100755 --- a/nel/tools/build_gamedata/processes/veget/3_install.py +++ b/nel/tools/build_gamedata/processes/veget/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/vegetset/3_install.py b/nel/tools/build_gamedata/processes/vegetset/3_install.py index 25ebd7677..2aa338f07 100755 --- a/nel/tools/build_gamedata/processes/vegetset/3_install.py +++ b/nel/tools/build_gamedata/processes/vegetset/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/zone/3_install.py b/nel/tools/build_gamedata/processes/zone/3_install.py index 0326abf75..dae542b0a 100755 --- a/nel/tools/build_gamedata/processes/zone/3_install.py +++ b/nel/tools/build_gamedata/processes/zone/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/nel/tools/build_gamedata/processes/zone_light/3_install.py b/nel/tools/build_gamedata/processes/zone_light/3_install.py index 4e4d231a4..35320feaf 100755 --- a/nel/tools/build_gamedata/processes/zone_light/3_install.py +++ b/nel/tools/build_gamedata/processes/zone_light/3_install.py @@ -31,7 +31,7 @@ if os.path.isfile("log.log"): os.remove("log.log") log = open("log.log", "w") from scripts import * -from buildsite import * +from buildsite_local import * from process import * from tools import * from directories import * diff --git a/ryzom/client/data/gamedev/interfaces_v3/browser.css b/ryzom/client/data/gamedev/interfaces_v3/browser.css new file mode 100644 index 000000000..96d2f7a9b --- /dev/null +++ b/ryzom/client/data/gamedev/interfaces_v3/browser.css @@ -0,0 +1,147 @@ +html { + background-color: rgba(0, 0, 0, 1.0); + color: rgba(210, 210, 210, 1.0); + font-size: 12px; + font-style: normal; + font-weight: normal; + text-shadow: none; +} + +address, article, aside, blockquote, details, dialog, dd, div, dl, dt, +fieldset, figcaption, figure, footer, form, h1, h2, h3, h4, h5, h6, +header, hgroup, hr, li, main, nav, ol, p, pre, section, table, ul { + display: block; +} + +table { + display: table; +} + +input,. table, tr, td, th, textarea { + color: inherit; + font-weight: inherit; + font-style: inherit; + font-size: inherit; + text-shadow: inherit; +} + +input, textarea { + text-shadow: 1px 1px #000; +} + +a { + color: rgba(240, 155, 100, 1.0); + text-decoration: underline; +} + +h1, h2, h3, h4, h5, h6 { + color: rgba(255, 255, 255, 1.0); +} + +h1 { + font-size: 2em; +} + +h2 { + font-size: 1.5em; +} + +h3 { + font-size: 1.17em; +} + +h4 { + font-size: 1.0em; +} + +h5 { + font-size: 0.83em; +} + +h6 { + font-size: 0.67em; +} + +pre { + font-family: monospace; +} + +/* th { text-align:center; } overrides property */ +th { + font-weight: bold; +} + +del { + text-decoration: line-through; +} + +u { + text-decoration: underline; +} + +em { + font-style: italic; +} + +strong { + font-weight: bold; +} + +small { + font-size: smaller; +} + +dt { + font-weight: bold; +} + +hr { + color: rgb(120, 120, 120); +} + +/* td { padding: 1px; } overrides attribute */ +/* table { border-spacing: 2px; } overrides attribute */ +table { + border-collapse: separate; +} + +meter::-webkit-meter-bar, +meter::-webkit-optimum-value, +meter::-webkit-suboptimum-value, +meter::-webkit-even-less-good-value { + background: none; +} + +meter::-webkit-meter-bar { + background-color: rgb(100, 100, 100); + width: 5em; + height: 1em; +} + +meter::-webkit-meter-optimum-value { + background-color: rgb(80, 220, 80); +} + +meter::-webkit-meter-suboptimum-value { + background-color: rgb(220, 220, 80); +} + +meter::-webkit-meter-even-less-good-value { + background-color: rgb(220, 80, 80); +} + +progress::-webkit-progress-bar, +progress::-webkit-progress-value { + background: none; +} + +progress::-webkit-progress-bar { + background-color: rgb(230, 230, 230); + width: 10em; + height: 1em; +} + +progress::-webkit-progress-value { + background-color: rgb(0, 100, 180); +} + diff --git a/ryzom/client/data/gamedev/interfaces_v3/login_main.xml b/ryzom/client/data/gamedev/interfaces_v3/login_main.xml index fb45a7123..a1d7afdd2 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/login_main.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/login_main.xml @@ -31,22 +31,31 @@ - - + - - + + + + + + - - + - - - - - + - + + + @@ -296,7 +296,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t checkbox_bitmap_pushed="" checkbox_bitmap_over="" background_bitmap_view="" - home="release.html" + home="" browse_next_time="true" form_text_area_group="edit_box_widget_multiline" > @@ -512,7 +512,7 @@ on_enter="leave_modal" options="no_bordure" mouse_pos="false" exit_key_pushed="t checkbox_bitmap_pushed="" checkbox_bitmap_over="" background_bitmap_view="" - home="release.html" + home="" browse_next_time="true" form_text_area_group="edit_box_widget_multiline" > diff --git a/ryzom/client/data/gamedev/interfaces_v3/macros.xml b/ryzom/client/data/gamedev/interfaces_v3/macros.xml index d3c886282..f905a514f 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/macros.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/macros.xml @@ -185,6 +185,9 @@ + + diff --git a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml index b52674ba6..acef29020 100644 --- a/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml +++ b/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml @@ -696,15 +696,10 @@ onclick_l="leave_modal" /> - - - - - - - + - - - - - - - - - - - - - - - -