aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-09-19 19:20:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various improvements to clients

Browse source
This commit is contained in:
Sit Melai 2016-10-31 22:46:39 +01:00
parent 5c4f5bcb50
commit 5231e8de28
11 changed files with 321 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -166,7 +166,9 @@ code/build_mac
code/build_linux32 code/build_linux32
code/build_linux64 code/build_linux64
code/build_windows32 code/build_windows32
code/build_windows64
code/build_server code/build_server
code/build_nel_tools
# Linux nel compile # Linux nel compile
code/nel/build/nel-config code/nel/build/nel-config
@ -243,6 +245,7 @@ code/ryzom/tools/server/ryzom_ams/old
#tools and external dir's #tools and external dir's
external external
external_vc14
external_stlport external_stlport
nel_tools* nel_tools*
ryzom_tools* ryzom_tools*

1
code/CMakeLists.txt
View file

@ -66,6 +66,7 @@ SET(AUTHOR "Winch Gate and The Ryzom Core Community")
SET(RYZOM_VERSION_MAJOR 2) SET(RYZOM_VERSION_MAJOR 2)
SET(RYZOM_VERSION_MINOR 9) SET(RYZOM_VERSION_MINOR 9)
SET(RYZOM_VERSION_PATCH 0) SET(RYZOM_VERSION_PATCH 0)
SET(REVISION 0)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Redirect output files # Redirect output files

2
code/nel/include/nel/3d/skeleton_model.h
View file

@ -87,7 +87,7 @@ public:
/** The list of CBone, created from the CSkeletonShape. /** The list of CBone, created from the CSkeletonShape.
* They are odered in depth-first order. * They are odered in depth-first order.
*/ */
std::vector<CBone> Bones; std::vector<const CBone> Bones;
public: public:
/// \name IAnimatable Interface (registering only IAnimatable sons (bones)). /// \name IAnimatable Interface (registering only IAnimatable sons (bones)).

2
code/nel/src/3d/driver/opengl/resources.rc
View file

@ -25,7 +25,7 @@ BEGIN
VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll" VALUE "OriginalFilename", "nel_drv_opengl_win_d.dll"
#else #else
VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll" VALUE "OriginalFilename", "nel_drv_opengl_win_r.dll"
#endif #endif
VALUE "ProductName", "Ryzom Core" VALUE "ProductName", "Ryzom Core"
VALUE "ProductVersion", NL_VERSION VALUE "ProductVersion", NL_VERSION
END END

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

@ -1,11 +1,11 @@
////////////////////////// //////////////////////////
//////////////////////////
/// CLIENT CONFIG FILE /// /// CLIENT CONFIG FILE ///
////////////////////////// //////////////////////////
////////////////////////// //////////////////////////
//////////////////////////
// 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;
@ -15,24 +15,24 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2" Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware // "Auto" will choose the best suited driver depending on hardware
FullScreen = 1; FullScreen = 0;
Width = 1024; Width = 0;
Height = 768; Height = 0;
PositionX = 0; PositionX = 0;
PositionY = 0; PositionY = 0;
Frequency = 60; Frequency = 0;
Depth = 32; Depth = 32;
Sleep = -1; Sleep = -1;
ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time ProcessPriority = 0; // -2 = idle, -1 = below normal, 0 = normal, 1 = above normal, 2 = high, 3 = real time
Contrast = 0.0; // -1.0 ~ 1.0 Contrast = 0.0; // -1.0 ~ 1.0
Luminosity = 0.0; // -1.0 ~ 1.0 Luminosity = 0.0; // -1.0 ~ 1.0
Gamma = 0.0; // -1.0 ~ 1.0 Gamma = 0.0; // -1.0 ~ 1.0
Contrast_min = -1.0; Contrast_min = -1.0;
Luminosity_min = -1.0; Luminosity_min = -1.0;
Gamma_min = -1.0; Gamma_min = -1.0;
Contrast_max = 1.0; Contrast_max = 1.0;
Luminosity_max = 1.0; Luminosity_max = 1.0;
Gamma_max = 1.0; Gamma_max = 1.0;
///////////// /////////////
@ -62,33 +62,39 @@ ConditionsTermsURL = "khaganat.net/wikhan/fr:charte";
//////////////// ////////////////
// the language to use as in ISO 639-2 // the language to use as in ISO 639-2
LanguageCode = "en"; // english 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",
}; };
TexturesInterface = "texture_interfaces_v3"; TexturesInterface = {
TexturesInterfaceDXTC = "texture_interfaces_dxtc"; "interface_game_khaganat"
};
TexturesLoginInterface = {
"interface_login_khaganat"
};
TexturesOutGameInterface = {
"interface_outgame_khaganat"
};
// The ligo primitive class file // The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml"; LigoPrimitiveClass = "world_editor_classes.xml";
@ -98,28 +104,28 @@ VerboseLog = 1;
/////////// ///////////
// MOUSE // // MOUSE //
/////////// ///////////
HardwareCursor = 1; HardwareCursor = 1;
CursorSpeed = 1.0; // In pixels per mickey CursorSpeed = 1.0; // In pixels per mickey
CursorSpeed_min = 0.5; CursorSpeed_min = 0.5;
CursorSpeed_max = 2.0; CursorSpeed_max = 2.0;
CursorAcceleration = 40; // Threshold in mickey CursorAcceleration = 40; // Threshold in mickey
CursorAcceleration_min = 20; CursorAcceleration_min = 20;
CursorAcceleration_max = 80; CursorAcceleration_max = 80;
FreeLookSpeed = 0.004; // In radian per mickey FreeLookSpeed = 0.004; // In radian per mickey
FreeLookSpeed_min = 0.0001; FreeLookSpeed_min = 0.0001;
FreeLookSpeed_max = 0.01; FreeLookSpeed_max = 0.01;
FreeLookAcceleration = 40; // Threshold in mickey FreeLookAcceleration = 40; // Threshold in mickey
FreeLookAcceleration_min = 20; FreeLookAcceleration_min = 20;
FreeLookAcceleration_max = 80; FreeLookAcceleration_max = 80;
FreeLookInverted = 0; FreeLookInverted = 0;
AutomaticCamera = 0; AutomaticCamera = 0;
DblClickMode = 1; DblClickMode = 1;
AutoEquipTool = 1; AutoEquipTool = 1;
/////////////////// ///////////////////
// RENDER CONFIG // // RENDER CONFIG //
@ -151,172 +157,172 @@ LandscapeThreshold_ps1 = 500.0;
LandscapeThreshold_ps2 = 1000.0; LandscapeThreshold_ps2 = 1000.0;
LandscapeThreshold_ps3 = 2000.0; LandscapeThreshold_ps3 = 2000.0;
Vision = 500.000000; Vision = 500.000000;
Vision_min = 200.000000; Vision_min = 200.000000;
Vision_max = 800.000000; Vision_max = 800.000000;
Vision_step = 100.000000; Vision_step = 100.000000;
Vision_ps0 = 200.0; Vision_ps0 = 200.0;
Vision_ps1 = 400.0; Vision_ps1 = 400.0;
Vision_ps2 = 500.0; Vision_ps2 = 500.0;
Vision_ps3 = 800.0; Vision_ps3 = 800.0;
MicroVeget = 1; // Enable/Disable MicroVeget. MicroVeget = 1; // Enable/Disable MicroVeget.
MicroVeget_ps0 = 0; MicroVeget_ps0 = 0;
MicroVeget_ps1 = 1; MicroVeget_ps1 = 1;
MicroVeget_ps2 = 1; MicroVeget_ps2 = 1;
MicroVeget_ps3 = 1; MicroVeget_ps3 = 1;
MicroVegetDensity = 80.0; MicroVegetDensity = 80.0;
MicroVegetDensity_min = 10.0; MicroVegetDensity_min = 10.0;
MicroVegetDensity_max = 100.0; MicroVegetDensity_max = 100.0;
MicroVegetDensity_step = 10.0; MicroVegetDensity_step = 10.0;
MicroVegetDensity_ps0 = 10.0; // not used since disabled! MicroVegetDensity_ps0 = 10.0; // not used since disabled!
MicroVegetDensity_ps1 = 30.0; MicroVegetDensity_ps1 = 30.0;
MicroVegetDensity_ps2 = 80.0; MicroVegetDensity_ps2 = 80.0;
MicroVegetDensity_ps3 = 100.0; MicroVegetDensity_ps3 = 100.0;
// *** FX // *** FX
FxNbMaxPoly = 20000; FxNbMaxPoly = 20000;
FxNbMaxPoly_min = 2000; FxNbMaxPoly_min = 2000;
FxNbMaxPoly_max = 50000; FxNbMaxPoly_max = 50000;
FxNbMaxPoly_step= 2000; FxNbMaxPoly_step= 2000;
FxNbMaxPoly_ps0 = 2000; FxNbMaxPoly_ps0 = 2000;
FxNbMaxPoly_ps1 = 10000; FxNbMaxPoly_ps1 = 10000;
FxNbMaxPoly_ps2 = 20000; FxNbMaxPoly_ps2 = 20000;
FxNbMaxPoly_ps3 = 50000; FxNbMaxPoly_ps3 = 50000;
Cloud = 1; Cloud = 1;
Cloud_ps0 = 0 ; Cloud_ps0 = 0 ;
Cloud_ps1 = 1 ; Cloud_ps1 = 1 ;
Cloud_ps2 = 1 ; Cloud_ps2 = 1 ;
Cloud_ps3 = 1 ; Cloud_ps3 = 1 ;
CloudQuality = 160.0; CloudQuality = 160.0;
CloudQuality_min = 80.0; CloudQuality_min = 80.0;
CloudQuality_max = 320.0; CloudQuality_max = 320.0;
CloudQuality_step = 20.0; CloudQuality_step = 20.0;
CloudQuality_ps0 = 80.0; // not used since disabled! CloudQuality_ps0 = 80.0; // not used since disabled!
CloudQuality_ps1 = 80.0; CloudQuality_ps1 = 80.0;
CloudQuality_ps2 = 160.0; CloudQuality_ps2 = 160.0;
CloudQuality_ps3 = 320.0; CloudQuality_ps3 = 320.0;
CloudUpdate = 1; CloudUpdate = 1;
CloudUpdate_min = 1; CloudUpdate_min = 1;
CloudUpdate_max = 8; CloudUpdate_max = 8;
CloudUpdate_step= 1; CloudUpdate_step= 1;
CloudUpdate_ps0 = 1; // not used since disabled! CloudUpdate_ps0 = 1; // not used since disabled!
CloudUpdate_ps1 = 1; CloudUpdate_ps1 = 1;
CloudUpdate_ps2 = 1; CloudUpdate_ps2 = 1;
CloudUpdate_ps3 = 3; CloudUpdate_ps3 = 3;
Shadows = 1; Shadows = 1;
Shadows_ps0 = 0; Shadows_ps0 = 0;
Shadows_ps1 = 1; Shadows_ps1 = 1;
Shadows_ps2 = 1; Shadows_ps2 = 1;
Shadows_ps3 = 1; Shadows_ps3 = 1;
FXAA = 1; FXAA = 1;
FXAA_ps0 = 0; FXAA_ps0 = 0;
FXAA_ps1 = 1; FXAA_ps1 = 1;
FXAA_ps2 = 1; FXAA_ps2 = 1;
FXAA_ps3 = 1; FXAA_ps3 = 1;
AnisotropicFilter = 0; AnisotropicFilter = 0;
Bloom = 0; Bloom = 1;
Bloom_ps0 = 0; Bloom_ps0 = 0;
Bloom_ps1 = 1; Bloom_ps1 = 1;
Bloom_ps2 = 1; Bloom_ps2 = 1;
Bloom_ps3 = 1; Bloom_ps3 = 1;
SquareBloom = 1; SquareBloom = 1;
SquareBloom_ps0 = 0; SquareBloom_ps0 = 0;
SquareBloom_ps1 = 1; SquareBloom_ps1 = 1;
SquareBloom_ps2 = 1; SquareBloom_ps2 = 1;
SquareBloom_ps3 = 1; SquareBloom_ps3 = 1;
DensityBloom = 255.0; DensityBloom = 255.0;
DensityBloom_min = 0.0; DensityBloom_min = 0.0;
DensityBloom_max = 255.0; DensityBloom_max = 255.0;
DensityBloom_step = 1.0; DensityBloom_step = 1.0;
DensityBloom_ps0 = 255.0; DensityBloom_ps0 = 255.0;
DensityBloom_ps1 = 255.0; DensityBloom_ps1 = 255.0;
DensityBloom_ps2 = 255.0; DensityBloom_ps2 = 255.0;
DensityBloom_ps3 = 255.0; DensityBloom_ps3 = 255.0;
// *** CHARACTERS // *** CHARACTERS
SkinNbMaxPoly = 100000; SkinNbMaxPoly = 100000;
SkinNbMaxPoly_min = 5000; SkinNbMaxPoly_min = 5000;
SkinNbMaxPoly_max = 250000; SkinNbMaxPoly_max = 250000;
SkinNbMaxPoly_step = 5000; SkinNbMaxPoly_step = 5000;
SkinNbMaxPoly_ps0 = 10000; SkinNbMaxPoly_ps0 = 10000;
SkinNbMaxPoly_ps1 = 70000; SkinNbMaxPoly_ps1 = 70000;
SkinNbMaxPoly_ps2 = 100000; SkinNbMaxPoly_ps2 = 100000;
SkinNbMaxPoly_ps3 = 200000; SkinNbMaxPoly_ps3 = 200000;
NbMaxSkeletonNotCLod = 125; NbMaxSkeletonNotCLod = 125;
NbMaxSkeletonNotCLod_min = 5; NbMaxSkeletonNotCLod_min = 5;
NbMaxSkeletonNotCLod_max = 255; NbMaxSkeletonNotCLod_max = 255;
NbMaxSkeletonNotCLod_step = 5; NbMaxSkeletonNotCLod_step = 5;
NbMaxSkeletonNotCLod_ps0 = 10; NbMaxSkeletonNotCLod_ps0 = 10;
NbMaxSkeletonNotCLod_ps1 = 50; NbMaxSkeletonNotCLod_ps1 = 50;
NbMaxSkeletonNotCLod_ps2 = 125; NbMaxSkeletonNotCLod_ps2 = 125;
NbMaxSkeletonNotCLod_ps3 = 255; NbMaxSkeletonNotCLod_ps3 = 255;
CharacterFarClip = 200.0; CharacterFarClip = 200.0;
CharacterFarClip_min = 50.0; CharacterFarClip_min = 50.0;
CharacterFarClip_max = 500.0; CharacterFarClip_max = 500.0;
CharacterFarClip_step = 10.0; CharacterFarClip_step = 10.0;
CharacterFarClip_ps0 = 50.0; CharacterFarClip_ps0 = 50.0;
CharacterFarClip_ps1 = 100.0; CharacterFarClip_ps1 = 100.0;
CharacterFarClip_ps2 = 200.0; CharacterFarClip_ps2 = 200.0;
CharacterFarClip_ps3 = 500.0; CharacterFarClip_ps3 = 500.0;
EnableRacialAnimation = 1; EnableRacialAnimation = 1;
// *** MISC // *** MISC
// This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance // This is the actual aspect ratio of your screen (no relation with the resolution!!). Set 1.7777 if you got a 16/9 screen for instance
ScreenAspectRatio = 0.0; ScreenAspectRatio = 0.0;
ForceDXTC = 1; // Enable/Disable DXTC. ForceDXTC = 1; // Enable/Disable DXTC.
DivideTextureSizeBy2= 0; // Divide texture size DivideTextureSizeBy2= 0; // Divide texture size
DisableVtxProgram = 0; // Disable Hardware Vertex Program. DisableVtxProgram = 0; // Disable Hardware Vertex Program.
DisableVtxAGP = 0; // Disable Hardware Vertex AGP. DisableVtxAGP = 0; // Disable Hardware Vertex AGP.
DisableTextureShdr = 0; // Disable Hardware Texture Shader. DisableTextureShdr = 0; // Disable Hardware Texture Shader.
HDEntityTexture = 0; HDEntityTexture = 1;
HDTextureInstalled = 1; HDTextureInstalled = 1;
WaitVBL = 0; // 0 or 1 to wait Vertical Sync. WaitVBL = 0; // 0 or 1 to wait Vertical Sync.
////////////////// //////////////////
// GAME OPTIONS // // GAME OPTIONS //
////////////////// //////////////////
SelectWithRClick = 1; SelectWithRClick = 1;
DisplayWeapons = 1; DisplayWeapons = 1;
RotKeySpeedMax = 2.0; RotKeySpeedMax = 2.0;
RotKeySpeedMax_min = 1.0; RotKeySpeedMax_min = 1.0;
RotKeySpeedMax_max = 4.0; RotKeySpeedMax_max = 4.0;
RotKeySpeedMin = 1.0; RotKeySpeedMin = 1.0;
RotKeySpeedMin_min = 0.5; RotKeySpeedMin_min = 0.5;
RotKeySpeedMin_max = 2.0; RotKeySpeedMin_max = 2.0;
RotAccel = 3.0; RotAccel = 3.0;
FollowOnAtk = 0; FollowOnAtk = 0;
AtkOnSelect = 0; AtkOnSelect = 0;
ZCPacsPrim = "gen_bt_col_ext.pacs_prim"; ZCPacsPrim = "gen_bt_col_ext.pacs_prim";
///////////////// /////////////////
// PREFERENCES // // PREFERENCES //
///////////////// /////////////////
FPV = 0; // FPV(First Person View) : default is false (Third Person View). FPV = 0; // FPV(First Person View) : default is false (Third Person View).
CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View). CameraHeight = 2.2; // Camera Height (in meter) from the ground (for the Third Person View).
CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View). CameraDistance = 3.0; // Camera Distance(in meter) from the user (for the Third Person View).
CameraDistStep = 1.0; CameraDistStep = 1.0;
CameraDistMin = 1.0; CameraDistMin = 1.0;
CameraDistMax = 25.0; CameraDistMax = 25.0;
CameraAccel = 5.0; CameraAccel = 5.0;
CameraSpeedMin = 2.0; CameraSpeedMin = 2.0;
CameraSpeedMax = 100.0; CameraSpeedMax = 100.0;
CameraResetSpeed = 10.0; // Speed in radian/s CameraResetSpeed = 10.0; // Speed in radian/s
////////////////// //////////////////
// SOUND CONFIG // // SOUND CONFIG //
@ -343,7 +349,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001; SoundGameMusicVolume_step = 0.001;
// MISC // MISC
PreDataPath = { "user", "patch", "data", "examples" }; PreDataPath = { "user", "data", "patch", "examples", };
DataPath = { "data" };
NeedComputeVS = 0; NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" }; NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
@ -351,15 +358,15 @@ NegFiltersInfo = { "CLIMPD:", "CPath::lookup" , "LNET" };
NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" }; NegFiltersWarning = { "'basics.Equipment Slot'.", "_usercolor.tga", "PACS" };
// Big screen shot // Big screen shot
ScreenShotWidth = 0; ScreenShotWidth = 0;
ScreenShotHeight = 0; 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
"BC", "0 0 0 255 normal", // Black to see when there is an error "BC", "0 0 0 255 normal", // Black to see when there is an error
"JA", "0 0 0 255 normal", // Black to see when there is an error "JA", "0 0 0 255 normal", // Black to see when there is an error
"BL", "0 0 0 255 normal", // Black to see when there is an error "BL", "0 0 0 255 normal", // Black to see when there is an error
@ -367,38 +374,38 @@ SystemInfoColors =
"VI", "0 0 0 255 normal", // Black to see when there is an error "VI", "0 0 0 255 normal", // Black to see when there is an error
// NEW System Info Categories // NEW System Info Categories
"SYS", "255 255 255 255 normal", // Default system messages "SYS", "255 255 255 255 normal", // Default system messages
"BC", "255 255 255 255 centeraround", // Broadcast messages "BC", "255 255 255 255 centeraround", // Broadcast messages
"TAGBC", "255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged "TAGBC", "255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
"XP", "255 255 64 255 over", // XP Gain "XP", "255 255 64 255 over", // XP Gain
"SP", "255 255 64 255 over", // SP Gain "SP", "255 255 64 255 over", // SP Gain
"TTL", "255 255 64 255 over", // Title "TTL", "255 255 64 255 over", // Title
"TSK", "255 255 255 255 over", // Task "TSK", "255 255 255 255 over", // Task
"ZON", "255 255 255 255 center", // Zone "ZON", "255 255 255 255 center", // Zone
"DG", "255 0 0 255 normal", // Damage to me "DG", "255 0 0 255 normal", // Damage to me
"DMG", "255 0 0 255 normal", // Damage to me "DMG", "255 0 0 255 normal", // Damage to me
"DGP", "200 0 0 255 normal", // Damage to me from player "DGP", "200 0 0 255 normal", // Damage to me from player
"DGM", "255 128 64 255 normal", // Damage from me "DGM", "255 128 64 255 normal", // Damage from me
"MIS", "150 150 150 255 normal", // The opponent misses "MIS", "150 150 150 255 normal", // The opponent misses
"MISM", "255 255 255 255 normal", // I miss "MISM", "255 255 255 255 normal", // I miss
"ITM", "0 200 0 255 over", // Item "ITM", "0 200 0 255 over", // Item
"ITMO", "170 170 255 255 overonly", // Item other in group "ITMO", "170 170 255 255 overonly", // Item other in group
"ITMF", "220 0 220 255 over", // Item failed "ITMF", "220 0 220 255 over", // Item failed
"SPL", "50 50 250 255 normal", // Spell to me "SPL", "50 50 250 255 normal", // Spell to me
"SPLM", "50 150 250 255 normal", // Spell from me "SPLM", "50 150 250 255 normal", // Spell from me
"EMT", "255 150 150 255 normal", // Emote "EMT", "255 150 150 255 normal", // Emote
"MTD", "255 255 0 255 over", // Message Of The Day "MTD", "255 255 0 255 over", // Message Of The Day
"FORLD","64 255 64 255 overonly", // Forage Locate Deposit "FORLD","64 255 64 255 overonly", // Forage Locate Deposit
"CHK", "255 120 60 255 center", // Tous ce qui ne remplit pas une condition "CHK", "255 120 60 255 center", // Tous ce qui ne remplit pas une condition
"CHKCB","255 255 0 255 center", // Tous ce qui ne remplit pas une condition en combat (trop loin, cible invalide, pas assez de mana, etc.) "CHKCB","255 255 0 255 center", // Tous ce qui ne remplit pas une condition en combat (trop loin, cible invalide, pas assez de mana, etc.)
"PVPTM","255 120 60 255 overonly", // PVP timer "PVPTM","255 120 60 255 overonly", // PVP timer
"THM", "255 255 64 255 over misc_levelup.ps", // Thema finished "THM", "255 255 64 255 over misc_levelup.ps", // Thema finished
"AMB", "255 255 64 255 center", // Ambiance "AMB", "255 255 64 255 center", // Ambiance
"ISE", "192 208 255 255 normal", // Item special effect "ISE", "192 208 255 255 normal", // Item special effect
"ISE2", "192 208 255 255 center", // Item special effect with center text (for effects without flying text) "ISE2", "192 208 255 255 center", // Item special effect with center text (for effects without flying text)
"OSM", "128 160 255 255 center", // Outpost state message "OSM", "128 160 255 255 center", // Outpost state message
"AROUND","255 255 0 255 around", // Only in around channel "AROUND","255 255 0 255 around", // Only in around channel
"R2_INVITE","0 255 0 255 around", // Ring invitation "R2_INVITE","0 255 0 255 around", // Ring invitation
}; };
PrintfCommands = { PrintfCommands = {
@ -428,30 +435,30 @@ LoadingStringCount = 54;
// Some R2 parameters ... // Some R2 parameters ...
R2Mode = 1; R2Mode = 1;
R2EDEnabled = 1; R2EDEnabled = 1;
R2EDExtendedDebug = 0; R2EDExtendedDebug = 0;
R2EDLightPalette = 0; R2EDLightPalette = 0;
R2ClientGw = "r2linux01"; R2ClientGw = "r2linux01";
LoadLuaDebugger = 0; LoadLuaDebugger = 0;
CheckR2ScenarioMD5 = 1; CheckR2ScenarioMD5 = 1;
LevelDesignEnabled = 0; LevelDesignEnabled = 0;
DmCameraDistMax = 25; DmCameraDistMax = 25;
DmRun = 20; DmRun = 20;
DmWalk = 6; DmWalk = 6;
R2EDReloadFiles = { R2EDReloadFiles = {
"r2ed.xml", "r2ed.xml",
"r2_basic_bricks.lua", "r2_basic_bricks.lua",
"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 = {
@ -487,63 +494,63 @@ 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 =
{ {
"curs_can_pan.tga", "curs_can_pan.tga",
"curs_can_pan_dup.tga", "curs_can_pan_dup.tga",
"curs_create.tga", "curs_create.tga",
"curs_create_multi.tga", "curs_create_multi.tga",
"curs_create_vertex_invalid.tga", "curs_create_vertex_invalid.tga",
"curs_default.tga", "curs_default.tga",
"curs_dup.tga", "curs_dup.tga",
"curs_L.tga", "curs_L.tga",
"curs_M.tga", "curs_M.tga",
"curs_pan.tga", "curs_pan.tga",
"curs_pan_dup.tga", "curs_pan_dup.tga",
"curs_pick.tga", "curs_pick.tga",
"curs_pick_dup.tga", "curs_pick_dup.tga",
"curs_R.tga", "curs_R.tga",
"curs_resize_BL_TR.tga", "curs_resize_BL_TR.tga",
"curs_resize_BR_TL.tga", "curs_resize_BR_TL.tga",
"curs_resize_LR.tga", "curs_resize_LR.tga",
"curs_resize_TB.tga", "curs_resize_TB.tga",
"curs_rotate.tga", "curs_rotate.tga",
"curs_scale.tga", "curs_scale.tga",
"curs_stop.tga", "curs_stop.tga",
"text_cursor.tga", "text_cursor.tga",
"r2_hand_can_pan.tga", "r2_hand_can_pan.tga",
"r2_hand_pan.tga", "r2_hand_pan.tga",
"r2ed_tool_can_pick.tga", "r2ed_tool_can_pick.tga",
"r2ed_tool_can_rotate.tga", "r2ed_tool_can_rotate.tga",
"r2ed_tool_pick.tga", "r2ed_tool_pick.tga",
"r2ed_tool_rotate.tga", "r2ed_tool_rotate.tga",
"r2ed_tool_rotating.tga" "r2ed_tool_rotating.tga"
}; };
Loading_BG = "new_loading_bg.tga"; // Default name for the loading background file. Loading_BG = "new_loading_bg.tga"; // Default name for the loading background file.
Launch_BG = "new_launcher_bg.tga"; // Default name for the launch background file. Launch_BG = "new_launcher_bg.tga"; // Default name for the launch background file.
TeleportKami_BG = "new_teleport_kami_bg.tga"; TeleportKami_BG = "new_teleport_kami_bg.tga";
TeleportKaravan_BG = "new_teleport_caravan_bg.tga"; TeleportKaravan_BG = "new_teleport_caravan_bg.tga";
Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file. Elevator_BG = "new_elevator_bg.tga"; // Default name for the loading background file.
ResurectKami_BG = "new_resurect_kami_bg.tga"; ResurectKami_BG = "new_resurect_kami_bg.tga";
ResurectKaravan_BG = "new_resurect_caravane_bg.tga"; ResurectKaravan_BG = "new_resurect_caravane_bg.tga";
End_BG = "end_bg.tga"; // Default name for the last background file. End_BG = "end_bg.tga"; // Default name for the last background file.
ScenarioSavePath = "./my_scenarios/"; ScenarioSavePath = "./my_scenarios/";
@ -554,10 +561,10 @@ ScenarioSavePath = "./my_scenarios/";
// note : we add a dot in the name to be sure that there cannot be a conflict with character keyset name // note : we add a dot in the name to be sure that there cannot be a conflict with character keyset name
BuiltInKeySets = BuiltInKeySets =
{ {
"", // default ryzom keyboard layout "", // default ryzom keyboard layout
"bi.zqsd", // european keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is french or belgian) "bi.zqsd", // european keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is french or belgian)
"bi.wasd", // english keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is not french nor belgian) "bi.wasd", // english keyboard fps displacement style (NB : don't change this layout name, ryzom will automatically select it if keyboard is not french nor belgian)
"bi.wow_alike" // 'world of warcraft' like keyboard style. (NB : not available for ring) "bi.wow_alike" // 'world of warcraft' like keyboard style. (NB : not available for ring)
}; };
// "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other" // "Newbie Training", "Story Telling", "Mistery", "Hack & Slash", "Guild Training", "Other"
@ -566,7 +573,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://www.khaganat.net/forum/index.php/board,31.0.html", "fr=http://www.khaganat.net/forum/index.php/board,31.0.html",
"en=http://www.khaganat.net/forum/index.php/board,31.0.html", "en=http://www.khaganat.net/forum/index.php/board,31.0.html",

2
code/ryzom/client/macosx/Info.plist
View file

@ -43,7 +43,7 @@
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>
<string>public.app-category.role-playing-games</string> <string>public.app-category.role-playing-games</string>
<key>LSFileQuarantineEnabled</key> <key>LSFileQuarantineEnabled</key>
<true/> <false/>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string> <string>${CMAKE_OSX_DEPLOYMENT_TARGET}</string>
<key>LSRequiresCarbon</key> <key>LSRequiresCarbon</key>

20
code/ryzom/client/macosx/upgd_nl.sh
View file

@ -8,7 +8,7 @@ fi
# determine directory where all files reside # determine directory where all files reside
CONTENTSPATH=$(dirname "$ROOTPATH") CONTENTSPATH=$(dirname "$ROOTPATH")
MACOSPATH=$(dirname "$RYZOM_CLIENT") MACOSPATH=$(dirname "$KHANAT_CLIENT")
SIGNPATH=$CONTENTSPATH/_CodeSignature SIGNPATH=$CONTENTSPATH/_CodeSignature
# all files of original Bundle are in the same directory # all files of original Bundle are in the same directory
@ -24,21 +24,21 @@ cp -p "$ROOTPATH/Info.plist" "$CONTENTSPATH"
cp -p "$ROOTPATH/CodeResources" "$SIGNPATH" cp -p "$ROOTPATH/CodeResources" "$SIGNPATH"
# executable flag for all executables # executable flag for all executables
chmod +x "$ROOTPATH/Ryzom" chmod +x "$ROOTPATH/Khanat"
chmod +x "$ROOTPATH/CrashReport" chmod +x "$ROOTPATH/CrashReport"
chmod +x "$ROOTPATH/RyzomClientPatcher" chmod +x "$ROOTPATH/KhanatClientPatcher"
chmod +x "$ROOTPATH/RyzomConfiguration" chmod +x "$ROOTPATH/KhanatConfiguration"
# remove previous executables # remove previous executables
rm -f "$MACOSPATH/Ryzom" rm -f "$MACOSPATH/Khanat"
rm -f "$MACOSPATH/CrashReport" rm -f "$MACOSPATH/CrashReport"
rm -f "$MACOSPATH/RyzomClientPatcher" rm -f "$MACOSPATH/KhanatClientPatcher"
rm -f "$MACOSPATH/RyzomConfiguration" rm -f "$MACOSPATH/KhanatConfiguration"
# copy all binaries in MacOS directory # copy all binaries in MacOS directory
cp -p "$ROOTPATH/Ryzom" "$MACOSPATH" cp -p "$ROOTPATH/Khanat" "$MACOSPATH"
cp -p "$ROOTPATH/CrashReport" "$MACOSPATH" cp -p "$ROOTPATH/CrashReport" "$MACOSPATH"
cp -p "$ROOTPATH/RyzomClientPatcher" "$MACOSPATH" cp -p "$ROOTPATH/KhanatClientPatcher" "$MACOSPATH"
cp -p "$ROOTPATH/RyzomConfiguration" "$MACOSPATH" cp -p "$ROOTPATH/KhanatConfiguration" "$MACOSPATH"
exit 0 exit 0

10
code/ryzom/client/src/login_patch.cpp
View file

@ -919,7 +919,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
//use bat if windows if not use sh //use bat if windows if not use sh
#ifdef NL_OS_WINDOWS #ifdef NL_OS_WINDOWS
contentPrefix += "@echo off\n"; contentPrefix += "@echo off\n";
contentPrefix += "set RYZOM_CLIENT=\"%1\"\n"; contentPrefix += "set KHANAT_CLIENT=\"%1\"\n";
contentPrefix += "set UNPACKPATH=\"%2\"\n"; contentPrefix += "set UNPACKPATH=\"%2\"\n";
contentPrefix += "set ROOTPATH=\"%3\"\n"; contentPrefix += "set ROOTPATH=\"%3\"\n";
contentPrefix += "set STARTUPPATH=\"%4\"\n"; contentPrefix += "set STARTUPPATH=\"%4\"\n";
@ -930,7 +930,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
contentPrefix += "set SHARDID=%7\n"; contentPrefix += "set SHARDID=%7\n";
#else #else
contentPrefix += "#!/bin/sh\n"; contentPrefix += "#!/bin/sh\n";
contentPrefix += "export RYZOM_CLIENT=$1\n"; contentPrefix += "export KHANAT_CLIENT=$1\n";
contentPrefix += "export UNPACKPATH=$2\n"; contentPrefix += "export UNPACKPATH=$2\n";
contentPrefix += "export ROOTPATH=$3\n"; contentPrefix += "export ROOTPATH=$3\n";
contentPrefix += "export STARTUPPATH=$4\n"; contentPrefix += "export STARTUPPATH=$4\n";
@ -960,7 +960,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
if (wantRyzomRestart) if (wantRyzomRestart)
{ {
// client shouldn't be in memory anymore else it couldn't be overwritten // client shouldn't be in memory anymore else it couldn't be overwritten
contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%RYZOM_CLIENT%%\" %s %%LOGIN%% %%PASSWORD%% %%SHARDID%%\n", additionalParams.c_str()); contentSuffix += toString("start \"\" /D \"%%STARTUPPATH%%\" \"%%KHANAT_CLIENT%%\" %s %%LOGIN%% %%PASSWORD%% %%SHARDID%%\n", additionalParams.c_str());
} }
#else #else
if (wantRyzomRestart) if (wantRyzomRestart)
@ -973,7 +973,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
contentSuffix += "if [ -e \"$UPGRADE_FILE\" ]; then chmod +x \"$UPGRADE_FILE\" && \"$UPGRADE_FILE\"; fi\n\n"; contentSuffix += "if [ -e \"$UPGRADE_FILE\" ]; then chmod +x \"$UPGRADE_FILE\" && \"$UPGRADE_FILE\"; fi\n\n";
// be sure file is executable // be sure file is executable
contentSuffix += "chmod +x \"$RYZOM_CLIENT\"\n\n"; contentSuffix += "chmod +x \"$KHANAT_CLIENT\"\n\n";
if (wantRyzomRestart) if (wantRyzomRestart)
{ {
@ -981,7 +981,7 @@ void CPatchManager::createBatchFile(CProductDescriptionForClient &descFile, bool
contentSuffix += "cd \"$STARTUPPATH\"\n\n"; contentSuffix += "cd \"$STARTUPPATH\"\n\n";
// launch new client // launch new client
contentSuffix += toString("\"$RYZOM_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str()); contentSuffix += toString("\"$KHANAT_CLIENT\" %s $LOGIN $PASSWORD $SHARDID\n", additionalParams.c_str());
} }
#endif #endif

6
code/ryzom/client/unix/upgd_nl.sh
View file

@ -7,9 +7,9 @@ then
fi fi
# executable flag for all executables # executable flag for all executables
chmod +x "$ROOTPATH/ryzom_client" chmod +x "$ROOTPATH/khanat_client"
chmod +x "$ROOTPATH/crash_report" chmod +x "$ROOTPATH/crash_report"
chmod +x "$ROOTPATH/ryzom_client_patcher" chmod +x "$ROOTPATH/khanat_client_patcher"
chmod +x "$ROOTPATH/ryzom_configuration_qt" chmod +x "$ROOTPATH/khanat_configuration_qt"
exit 0 exit 0

2
code/ryzom/common/data_common/msg.xml
View file

@ -173,7 +173,7 @@
sendto="EGS" sendto="EGS"
format="u8" format="u8"
description="the client select a new slot to defend (or none)" /> description="the client select a new slot to defend (or none)" />
<leaf name="FLYING_HP_DELTA" <leaf name="FLYING_ChaScore1_DELTA"
description="add a flying text to an entity (u32 entity, u32 rgba, s16 delta)" /> description="add a flying text to an entity (u32 entity, u32 rgba, s16 delta)" />
<leaf name="FLYING_TEXT_ISE" <leaf name="FLYING_TEXT_ISE"
description="add a flying text to an entity (u32 entity, u32 rgba, u8 effect, s32 param)" /> description="add a flying text to an entity (u32 entity, u32 rgba, u8 effect, s32 param)" />

BIN
code/ryzom/common/data_common/sheet_id.bin Normal file
View file

Binary file not shown.