Changed icons for Unix and name.
|
@ -1323,22 +1323,10 @@ NLMISC_COMMAND(setMissingDynstringText, "set text of missing dynamic string"," <
|
|||
|
||||
NLMISC_COMMAND(ah, "Launch an action handler", "<ActionHandler> <AHparam>")
|
||||
{
|
||||
<<<<<<< local
|
||||
if (args.size() == 0)
|
||||
return false;
|
||||
|
||||
if (!ClientCfg.AllowDebugLua && toLower(args[0]) == "lua")
|
||||
||||||| base
|
||||
if (args.size() == 0)
|
||||
return false;
|
||||
|
||||
if (!ClientCfg.AllowDebugLua && strlwr(args[0]) == "lua")
|
||||
=======
|
||||
if (args.size() == 0)
|
||||
return false;
|
||||
|
||||
if (!ClientCfg.AllowDebugLua && toLower(args[0]) == "lua")
|
||||
>>>>>>> other
|
||||
{
|
||||
return false; // not allowed!!
|
||||
}
|
||||
|
@ -1912,7 +1900,6 @@ NLMISC_COMMAND(pos, "Change the position of the user (in local only)", "<x, y, (
|
|||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
// Teleport to anywhere.
|
||||
else if(args.size() == 2 || args.size() == 3)
|
||||
{
|
||||
|
@ -5765,7 +5752,30 @@ NLMISC_COMMAND(em, "emote command", "<emote phrase>")
|
|||
return false;
|
||||
}
|
||||
|
||||
NLMISC_COMMAND(emote, "emote command (1)", "<emote phrase>")
|
||||
NLMISC_COMMAND(me, "emote command", "<emote phrase>")
|
||||
{
|
||||
if (args.size() < 1) return false;
|
||||
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
if( pIM )
|
||||
{
|
||||
string emotePhrase;
|
||||
if( args.size() > 0 )
|
||||
{
|
||||
emotePhrase = args[0];
|
||||
}
|
||||
for(uint i = 1; i < args.size(); ++i )
|
||||
{
|
||||
emotePhrase += " ";
|
||||
emotePhrase += args[i];
|
||||
}
|
||||
CAHManager::getInstance()->runActionHandler("emote", NULL, "nb=0|behav=255|custom_phrase="+emotePhrase);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
NLMISC_COMMAND(emote, "emote command", "<emote phrase>")
|
||||
{
|
||||
if (args.size() < 1) return false;
|
||||
|
||||
|
@ -5811,28 +5821,6 @@ NLMISC_COMMAND(m, "emote command", "<emote phrase>")
|
|||
return false;
|
||||
}
|
||||
|
||||
NLMISC_COMMAND(me, "emote command", "<emote phrase>")
|
||||
{
|
||||
if (args.size() < 1) return false;
|
||||
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
if( pIM )
|
||||
{
|
||||
string emotePhrase;
|
||||
if( args.size() > 0 )
|
||||
{
|
||||
emotePhrase = args[0];
|
||||
}
|
||||
for(uint i = 1; i < args.size(); ++i )
|
||||
{
|
||||
emotePhrase += " ";
|
||||
emotePhrase += args[i];
|
||||
}
|
||||
CAHManager::getInstance()->runActionHandler("emote", NULL, "nb=0|behav=255|custom_phrase="+emotePhrase);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
NLMISC_COMMAND(guildmotd, "Set or see the guild message of the day","<msg of the day>")
|
||||
{
|
||||
|
@ -5878,8 +5866,10 @@ NLMISC_COMMAND(time, "Shows information about the current time", "")
|
|||
return true;
|
||||
}
|
||||
|
||||
NLMISC_COMMAND(easteregg_siela1915.khanat, "Miscellaneous", "")
|
||||
NLMISC_COMMAND(easteregg_siela1915_khanat, "Miscellaneous", "")
|
||||
{
|
||||
CInterfaceManager::getInstance()->displaySystemInfo("Siela1915 blesses you...");
|
||||
string stext = "Siela1915 blesses you...";
|
||||
ucstring ucstext = ucstring(stext);
|
||||
CInterfaceManager::getInstance()->displaySystemInfo(ucstext, "AROUND");
|
||||
return true;
|
||||
}
|
||||
|
|
BIN
code/ryzom/client/unix/khanat_128x128.png
Normal file
After Width: | Height: | Size: 19 KiB |
BIN
code/ryzom/client/unix/khanat_16x16.png
Normal file
After Width: | Height: | Size: 1.4 KiB |
BIN
code/ryzom/client/unix/khanat_22x22.png
Normal file
After Width: | Height: | Size: 2.1 KiB |
BIN
code/ryzom/client/unix/khanat_24x24.png
Normal file
After Width: | Height: | Size: 2.3 KiB |
BIN
code/ryzom/client/unix/khanat_256x256.png
Normal file
After Width: | Height: | Size: 39 KiB |
BIN
code/ryzom/client/unix/khanat_32x32.png
Normal file
After Width: | Height: | Size: 3.3 KiB |
BIN
code/ryzom/client/unix/khanat_48x48.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
code/ryzom/client/unix/khanat_64x64.png
Normal file
After Width: | Height: | Size: 8.3 KiB |
BIN
code/ryzom/client/unix/khanat_client.png
Normal file
After Width: | Height: | Size: 5.5 KiB |
BIN
code/ryzom/client/unix/khanat_logo_color.png
Normal file
After Width: | Height: | Size: 62 KiB |
|
@ -1,11 +1,11 @@
|
|||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Name=Ryzom
|
||||
Version=0.1
|
||||
Name=Khanat
|
||||
Name[ru]=Ризом
|
||||
Type=Application
|
||||
GenericName=Game client
|
||||
Comment=Ryzom client
|
||||
Comment[fr_FR]=Client Ryzom
|
||||
Comment=Khanat client
|
||||
Comment[fr_FR]=Client Khanat
|
||||
TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client
|
||||
Exec=${RYZOM_GAMES_PREFIX}/ryzom_client
|
||||
Icon=${RYZOM_CLIENT_ICON}
|
||||
|
|