aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-22 23:06:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge with develop

Browse source
This commit is contained in:
kervala 2016-05-17 20:50:14 +02:00
parent 0766c4766f
commit 0c2cdd108e
6 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
code/ryzom/client/client_default.cfg
View file

@ -5,7 +5,7 @@
////////////////////////// //////////////////////////
// If you set this variable to 1, your client.cfg will be overwritten when you quit the client. // If you set this variable to 1, your client.cfg will be overwritten when you quit the client.
// You will loose all the comments and identation in this file. // You will loose all the comments and identation in this file.
SaveConfig = 1; SaveConfig = 1;
@ -59,21 +59,21 @@ LanguageCode = "en"; // english
XMLInputFile = "input_config_v3.xml"; XMLInputFile = "input_config_v3.xml";
XMLLoginInterfaceFiles = { XMLLoginInterfaceFiles = {
"login_config.xml", "login_config.xml",
"login_widgets.xml", "login_widgets.xml",
"login_main.xml", "login_main.xml",
"login_keys.xml", "login_keys.xml",
}; };
XMLOutGameInterfaceFiles = { XMLOutGameInterfaceFiles = {
"out_v2_config.xml", "out_v2_config.xml",
"out_v2_widgets.xml", "out_v2_widgets.xml",
"out_v2_connect.xml", "out_v2_connect.xml",
"out_v2_intro.xml", "out_v2_intro.xml",
"out_v2_select.xml", "out_v2_select.xml",
"out_v2_appear.xml", "out_v2_appear.xml",
"out_v2_location.xml", "out_v2_location.xml",
"out_v2_crash.xml", "out_v2_crash.xml",
"out_v2_hierarchy.xml", "out_v2_hierarchy.xml",
"out_v2_keys.xml", "out_v2_keys.xml",
@ -345,7 +345,7 @@ ScreenShotHeight = 0;
ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots) ScreenShotFullDetail = 1; // 1 to switch full detail mode for characters (both standard & big screenshots)
// Read : "ID", "R G B A MODE [FX]" // Read : "ID", "R G B A MODE [FX]"
SystemInfoColors = SystemInfoColors =
{ {
// OLD STUFF Here for compatibility // OLD STUFF Here for compatibility
"RG", "0 0 0 255 normal", // Black to see when there is an error "RG", "0 0 0 255 normal", // Black to see when there is an error
@ -391,22 +391,22 @@ SystemInfoColors =
}; };
PrintfCommands = { PrintfCommands = {
"52", "15", "55 55 0 255", "28", "uiChapterV", "624", "52", "15", "55 55 0 255", "28", "uiChapterV", "624",
"428", "0 0 0 255", "18", "", "624", "378", "428", "0 0 0 255", "18", "", "624", "378",
"0 0 0 255", "14", "", "644", "278", "0 0 0 255", "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
"18", "", "52", "17", "255 255 255 255", "28", "18", "", "52", "17", "255 255 255 255", "28",
"uiChapterV", "622", "430", "255 255 255 255", "18", "", "uiChapterV", "622", "430", "255 255 255 255", "18", "",
"622", "380", "255 255 255 255", "14", "", "642", "622", "380", "255 255 255 255", "14", "", "642",
"280", "255 255 255 255", "18", "" "280", "255 255 255 255", "18", ""
}; };
PrintfCommandsFreeTrial = { PrintfCommandsFreeTrial = {
"52", "15", "55 55 0 255", "28", "uiChapterV", "624", "52", "15", "55 55 0 255", "28", "uiChapterV", "624",
"428", "0 0 0 255", "18", "", "624", "378", "428", "0 0 0 255", "18", "", "624", "378",
"0 0 0 255", "14", "", "644", "278", "0 0 0 255", "0 0 0 255", "14", "", "644", "278", "0 0 0 255",
"18", "", "52", "17", "255 255 255 255", "28", "18", "", "52", "17", "255 255 255 255", "28",
"uiChapterV", "622", "430", "255 255 255 255", "18", "", "uiChapterV", "622", "430", "255 255 255 255", "18", "",
"622", "380", "255 255 255 255", "14", "", "642", "622", "380", "255 255 255 255", "14", "", "642",
"280", "255 255 255 255", "18", "" "280", "255 255 255 255", "18", ""
}; };
@ -436,11 +436,11 @@ R2EDReloadFiles = {
"r2_components.lua", "r2_components.lua",
"r2_core.lua", "r2_core.lua",
"r2_features_default.lua", "r2_features_default.lua",
"r2_features_fauna.lua", "r2_features_fauna.lua",
"r2_features_npc_groups.lua", "r2_features_npc_groups.lua",
"r2_palette.lua", "r2_palette.lua",
"r2_scenario.lua", "r2_scenario.lua",
"r2_ui.lua" "r2_ui.lua"
}; };
XMLInterfaceFiles = { XMLInterfaceFiles = {
@ -477,21 +477,21 @@ XMLInterfaceFiles = {
}; };
XMLR2EDInterfaceFiles = XMLR2EDInterfaceFiles =
{ {
"r2ed.xml", "r2ed.xml",
"r2_triggers.xml", "r2_triggers.xml",
"r2_logic_entities.xml", "r2_logic_entities.xml",
"r2ed_acts.xml", "r2ed_acts.xml",
"r2ed_scenario.xml", "r2ed_scenario.xml",
"r2ed_connect.xml" "r2ed_connect.xml"
}; };
FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth FogDistAndDepthLookupBias = 20; // bias for lookup of fog distance and depth
// Hardware cursor textures // Hardware cursor textures
// These will be extracted from the corresponding packed ui .tga files when they are loaded // These will be extracted from the corresponding packed ui .tga files when they are loaded
// * // *
// * individual .tga files for hardware cursor bitmap not looked for, and not supported yet // * individual .tga files for hardware cursor bitmap not looked for, and not supported yet
HardwareCursors = HardwareCursors =
{ {
@ -556,7 +556,7 @@ ScenarioTypes = {"so_newbie_training","so_story_telling","so_mistery","so_hack_s
ScenarioLanguages = {"fr","de","en","other_lang"}; ScenarioLanguages = {"fr","de","en","other_lang"};
// Map each language to a forum help page // Map each language to a forum help page
HelpPages = HelpPages =
{ {
"fr=http://forums.ryzom.com/forum/showthread.php?t=29130", "fr=http://forums.ryzom.com/forum/showthread.php?t=29130",
"en=http://forums.ryzom.com/forum/showthread.php?t=29129", "en=http://forums.ryzom.com/forum/showthread.php?t=29129",
@ -568,7 +568,7 @@ HelpPages =
WebIgMainDomain = "app.ryzom.com"; WebIgMainDomain = "app.ryzom.com";
WebIgTrustedDomains = { WebIgTrustedDomains = {
"api.ryzom.com", "app.ryzom.com" "api.ryzom.com", "app.ryzom.com"
}; };
PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload"; PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload";

BIN
code/ryzom/tools/client/ryzom_installer/res/background.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 62 KiB

BIN
code/ryzom/tools/client/ryzom_installer/res/modern-header.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 17 KiB

BIN
code/ryzom/tools/client/ryzom_installer/res/modern-wizard.bmp
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 131 KiB

2
code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp
View file

@ -384,7 +384,7 @@ void COperationDialog::extractBnpClient()
QProcess process; QProcess process;
QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert("RYZOM_CLIENT", QDir::toNativeSeparators(destinationDirectory + "/ryzom_client_r.exe")); env.insert("RYZOM_CLIENT", QDir::toNativeSeparators(destinationDirectory + "/" + server.clientFilename));
env.insert("UNPACKPATH", QDir::toNativeSeparators(destinationDirectory + "/unpack")); env.insert("UNPACKPATH", QDir::toNativeSeparators(destinationDirectory + "/unpack"));
env.insert("ROOTPATH", QDir::toNativeSeparators(destinationDirectory)); env.insert("ROOTPATH", QDir::toNativeSeparators(destinationDirectory));
env.insert("STARTUPPATH", ""); env.insert("STARTUPPATH", "");

6
code/ryzom/tools/client/ryzom_installer/ui/mainwindow.ui
View file

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>627</width> <width>579</width>
<height>479</height> <height>406</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -97,7 +97,7 @@ p, li { white-space: pre-wrap; }
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>627</width> <width>579</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>