Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
23053 commits 14 branches 1 tag 255 MiB
Commit graph

23053 commits

This branch
This branch
All branches
Author SHA1 Message Date
Guillaume Dupuy
7e1556520f Fix an issue where item in groups could not be moved 
Multiple group move would result in some item beeing incorrectly marked as equipped

--HG--
branch : fix_item_group
 2017-05-21 19:32:08 +02:00
Riasan
cfc1951be6 Merge 
--HG--
branch : compatibility-develop
 2017-05-14 19:10:13 +02:00
Riasan
9d01b4dfd8 Merge: with develop 
--HG--
branch : compatibility-develop
 2017-05-14 19:07:54 +02:00
Nimetu
fcbdbd17b7 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-14 01:27:20 +03:00
Nimetu
6c01ded28d Fixed: Redirect for image requests 
--HG--
branch : develop
 2017-05-14 01:03:49 +03:00
Riasan
28b4474ae4 Changed: Add a new gui window web_lua_action 
--HG--
branch : develop
 2017-05-12 19:29:10 +02:00
Nimetu
bb3b7e8277 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-04 10:35:43 +03:00
Nimetu
4f0717c58a Fixed: Image cookies 
--HG--
branch : develop
 2017-05-04 10:26:22 +03:00
Nimetu
b8a3405ad7 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-03 20:53:28 +03:00
Nimetu
3752884a91 Changed: Add next weather tooltip to ingame map 
--HG--
branch : develop
 2017-05-03 20:52:02 +03:00
Nimetu
753d9efccb Changed: Add humidity to ingame map 
--HG--
branch : develop
 2017-05-03 20:52:02 +03:00
Nimetu
e06f8b0976 Changed: Add minutes to ingame map 
--HG--
branch : develop
 2017-05-03 20:52:02 +03:00
Nimetu
5f8fc673d1 Merge with develop 
--HG--
branch : compatibility-develop
 2017-05-01 13:18:58 +03:00
kervala
5e27fe01f1 Changed: Updated translations (mostly UTF-16 -> UTF-8 conversion and use of UNIX EOL) 
--HG--
branch : compatibility-develop
 2017-04-28 13:05:25 +02:00
Nimetu
082704210b Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-26 08:55:00 +03:00
Nimetu
a47a481c7a Changed: Force max table width if requested. 
--HG--
branch : develop
 2017-04-26 08:53:02 +03:00
Nimetu
bff8ed488e Changed: CGroupParagraph does not handle text with line-breaks 
--HG--
branch : develop
 2017-04-25 12:18:53 +03:00
Nimetu
eb23a3b61c Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-25 00:23:09 +03:00
kervala
f739ed9e62 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-22 18:19:33 +02:00
kervala
532a81f5cb Changed: Don't use CSString 
--HG--
branch : develop
 2017-04-22 18:16:27 +02:00
kervala
e94b06066f Fixed: LibXml must be initialized only once and xmlSetGenericErrorFunc set a global function (calling it for each instance of CIXml is a mistake) 
--HG--
branch : develop
 2017-04-22 18:15:43 +02:00
kervala
d0a199d22d Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-21 11:06:24 +02:00
kervala
21ca659c70 Changed: More information for osxcross 
--HG--
branch : develop
 2017-04-21 11:05:57 +02:00
kervala
4a848b0771 Changed: Centralize Foundation framework search 
--HG--
branch : develop
 2017-04-21 11:04:09 +02:00
kervala
8dca705f73 Fixed: Misc depends on Carbon under OS X 
--HG--
branch : develop
 2017-04-21 11:03:39 +02:00
Nimetu
108759952e Changed: Use http cache headers for image cache 
--HG--
branch : develop
 2017-04-20 21:19:51 +03:00
Nimetu
3d09dd2094 Changed: Save cookies from image request 
--HG--
branch : develop
 2017-04-20 21:19:01 +03:00
Nimetu
3d48368de6 Changed: Workaround for dancing trees under direct3d (issue #160) 
--HG--
branch : develop
 2017-04-23 20:01:35 +03:00
Nimetu
b78e8541ef Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 15:39:29 +03:00
Nimetu
72b37450b4 Changed: Use basic cache expire for web images 
--HG--
branch : develop
 2017-04-20 15:37:47 +03:00
kervala
90c1a21ba6 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 13:53:59 +02:00
kervala
f23600cd30 Fixed: Compilation in 32 bits with GCC (patch provided by Alistair Leslie-Hughes, thanks a lot) 
--HG--
branch : develop
 2017-04-20 13:53:36 +02:00
kervala
d0e8ee195c Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 13:01:25 +02:00
kervala
c16fe64f7e Fixed: Debian packages creation under Xenial and more recent Ubuntu versions 
--HG--
branch : develop
 2017-04-20 13:01:02 +02:00
kervala
91b126a33a Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 11:40:09 +02:00
kervala
a730890d4c Added: Support for Jessie 
--HG--
branch : develop
 2017-04-20 11:39:21 +02:00
kervala
44fa42a6b5 Fixed: Yakkety and Zesty are using libpng-dev now 
--HG--
branch : develop
 2017-04-20 11:38:40 +02:00
kervala
0845ebb5bd Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-20 09:11:30 +02:00
Cédric OCHS
a792bcacf4 Merged in Glorf/ryzomcore/fix_compilation_windows (pull request #151) 
Fix server compilation under windows, with vc12

Approved-by: Cédric OCHS <kervala@gmail.com>

--HG--
branch : develop
 2017-04-19 08:00:42 +00:00
Guillaume Dupuy
9586e39ca4 Use stdpch.h instead for include 
--HG--
branch : fix_compilation_windows
 2017-04-19 09:53:27 +02:00
Guillaume Dupuy
5b3eed58ec Fix server compilation under windows 
--HG--
branch : fix_compilation_windows
 2017-04-18 20:15:14 +02:00
kervala
c6403a1a34 Fixed: Use "revision" file 
--HG--
branch : develop
 2017-04-18 10:57:53 +02:00
kervala
84f733c8d4 Changed: Updated supported Ubuntu versions 
--HG--
branch : develop
 2017-04-18 10:57:24 +02:00
Nimetu
8f5588e0ec Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-16 22:45:39 +03:00
Nimetu
20c216ecda Added: Basic queue for curl downloads 
--HG--
branch : develop
 2017-04-16 22:01:44 +03:00
Nimetu
9e7258d96e Fixed: Crash on webig debug log 
--HG--
branch : develop
 2017-04-16 21:56:12 +03:00
Meelis Mägi
1348304715 Merged in Glorf/ryzomcore/save_deposit_state_v2 (pull request #150) 
Save deposit state

--HG--
branch : develop
 2017-04-13 12:35:37 +00:00
Guillaume Dupuy
4952eeb585 Add default constructor for CDepositState 
--HG--
branch : save_deposit_state_v2
 2017-04-12 22:15:23 +02:00
Guillaume Dupuy
bd3a27778e Save deposit state 
--HG--
branch : save_deposit_state_v2
 2017-04-12 20:02:11 +02:00
kervala
685bb9fb14 Merge with develop 
--HG--
branch : compatibility-develop
 2017-04-11 17:29:56 +02:00