Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop

This commit is contained in:
Sit Melai 2016-09-07 15:39:02 +02:00
commit 5c4f5bcb50
2940 changed files with 3 additions and 3 deletions

View file

@ -178,14 +178,14 @@
<ATOM Name="weight" Value="3"/> <ATOM Name="weight" Value="3"/>
</STRUCT> </STRUCT>
<STRUCT> <STRUCT>
<ATOM Name="name" Value="CurrentChaScore1/> <ATOM Name="name" Value="CurrentChaScore1"/>
<ATOM Name="type" Value="sint32"/> <ATOM Name="type" Value="sint32"/>
<ATOM Name="persistant" Value="true"/> <ATOM Name="persistant" Value="true"/>
<ATOM Name="mirror" Value="true"/> <ATOM Name="mirror" Value="true"/>
<ATOM Name="weight" Value="1"/> <ATOM Name="weight" Value="1"/>
</STRUCT> </STRUCT>
<STRUCT> <STRUCT>
<ATOM Name="name" Value="MaxChaScore1/> <ATOM Name="name" Value="MaxChaScore1"/>
<ATOM Name="type" Value="sint32"/> <ATOM Name="type" Value="sint32"/>
<ATOM Name="persistant" Value="false"/> <ATOM Name="persistant" Value="false"/>
<ATOM Name="mirror" Value="true"/> <ATOM Name="mirror" Value="true"/>

0
code/web/docs/admin/shard_restart/Filelist.xml Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/H38.css Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/H70_2.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hd36.xml Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hf69.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg39_1.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

0
code/web/docs/admin/shard_restart/Hg39_1.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg41_2.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 74 KiB

0
code/web/docs/admin/shard_restart/Hg41_2.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg43_3.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 151 KiB

0
code/web/docs/admin/shard_restart/Hg43_3.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg45_4.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 154 KiB

After

Width:  |  Height:  |  Size: 154 KiB

0
code/web/docs/admin/shard_restart/Hg45_4.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg47_5.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

0
code/web/docs/admin/shard_restart/Hg47_5.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg49_6.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 128 KiB

After

Width:  |  Height:  |  Size: 128 KiB

0
code/web/docs/admin/shard_restart/Hg49_6.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg51_7.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 152 KiB

After

Width:  |  Height:  |  Size: 152 KiB

0
code/web/docs/admin/shard_restart/Hg51_7.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg53_8.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 166 KiB

0
code/web/docs/admin/shard_restart/Hg53_8.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg55_9.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 165 KiB

0
code/web/docs/admin/shard_restart/Hg55_9.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg57_10.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 165 KiB

After

Width:  |  Height:  |  Size: 165 KiB

0
code/web/docs/admin/shard_restart/Hg57_10.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg59_11.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

0
code/web/docs/admin/shard_restart/Hg59_11.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hg61_12.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 146 KiB

0
code/web/docs/admin/shard_restart/Hg61_12.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hn68.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hu37.js Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/Hz63.htm Normal file → Executable file
View file

0
code/web/docs/admin/shard_restart/lt_off.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 900 B

0
code/web/docs/admin/shard_restart/lt_over.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 912 B

After

Width:  |  Height:  |  Size: 912 B

0
code/web/docs/admin/shard_restart/rt_off.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 900 B

After

Width:  |  Height:  |  Size: 900 B

0
code/web/docs/admin/shard_restart/rt_over.gif Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 916 B

After

Width:  |  Height:  |  Size: 916 B

0
code/web/docs/ams/doxygen/Doxyfile Normal file → Executable file
View file

0
code/web/docs/ams/doxygen/img/db.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 201 KiB

After

Width:  |  Height:  |  Size: 201 KiB

0
code/web/docs/ams/doxygen/img/info.jpg Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 454 KiB

After

Width:  |  Height:  |  Size: 454 KiB

0
code/web/docs/ams/doxygen/img/info.psd Normal file → Executable file
View file

0
code/web/docs/ams/doxygen/info.php Normal file → Executable file
View file

0
code/web/docs/ams/doxygen/logo.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

0
code/web/private_php/ams/autoload/.plugincache.php.swp Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/assigned.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/dblayer.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/forwarded.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/gui_elements.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/helpers.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/in_support_group.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/mail_handler.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/mycrypt.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/pagination.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/plugincache.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/querycache.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/rest_api.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/support_group.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/sync.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_category.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_content.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_info.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_log.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_queue.php Normal file → Executable file
View file

View file

0
code/web/private_php/ams/autoload/ticket_reply.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/ticket_user.php Normal file → Executable file
View file

0
code/web/private_php/ams/autoload/users.php Normal file → Executable file
View file

0
code/web/private_php/ams/configs/ams_lib.conf Normal file → Executable file
View file

0
code/web/private_php/ams/configs/ingame_layout.ini Normal file → Executable file
View file

0
code/web/private_php/ams/img/info/client.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/connect.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
code/web/private_php/ams/img/info/cpuid.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/ht.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
code/web/private_php/ams/img/info/local.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
code/web/private_php/ams/img/info/mask.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

0
code/web/private_php/ams/img/info/memory.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
code/web/private_php/ams/img/info/nel.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
code/web/private_php/ams/img/info/os.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
code/web/private_php/ams/img/info/patch.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
code/web/private_php/ams/img/info/position.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/processor.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

0
code/web/private_php/ams/img/info/server.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.3 KiB

After

Width:  |  Height:  |  Size: 4.3 KiB

0
code/web/private_php/ams/img/info/shard.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

0
code/web/private_php/ams/img/info/user.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.9 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

0
code/web/private_php/ams/img/info/view.png Normal file → Executable file
View file

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

View file

View file

0
code/web/private_php/ams/ingame_templates/index.tpl Normal file → Executable file
View file

0
code/web/private_php/ams/ingame_templates/layout.tpl Normal file → Executable file
View file

View file

View file

View file

0
code/web/private_php/ams/ingame_templates/login.tpl Normal file → Executable file
View file

0
code/web/private_php/ams/ingame_templates/register.tpl Normal file → Executable file
View file

0
code/web/private_php/ams/ingame_templates/settings.tpl Normal file → Executable file
View file

View file

View file

View file

Some files were not shown because too many files have changed in this diff Show more