Commit graph

346 commits

Author SHA1 Message Date
Sit Melai
f75a3cdd2d Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
Merging local changes
2016-10-31 22:50:39 +01:00
Sit Melai
5231e8de28 various improvements to clients 2016-10-31 22:46:39 +01:00
0ff7b7f01e ajout chascore 2016-09-20 12:39:13 +02:00
2dfcf5f7b6 ajout chascore 2016-09-13 23:24:07 +02:00
Erwan GEORGET
edf0b19c75 Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-09 22:12:11 +02:00
966badbd20 mise a jour du client_default.cfg 2016-08-06 01:15:02 +02:00
kervala
e307920121 Changed: Replace ~0 by std::numeric_limits 2016-06-07 13:31:21 +02:00
kervala
d94941a20b Changed: Replace size() comparisons by empty() 2016-05-25 23:18:11 +02:00
SIELA1915
7e3b9d56bb changed all HP, Sap, Stamina and Focus occurences 2016-05-23 11:45:43 +02:00
kervala
a9bafa02bd Fixed: Delay when logging in 2016-05-18 09:52:48 +02:00
kervala
9e1b9d8050 Changed: Minor changes 2016-05-12 19:52:20 +02:00
kervala
e4a1e9df63 Changed: Minor changes 2016-05-08 19:23:38 +02:00
kervala
e22fa8b951 Fixed: Use correct formatted HTTP 1.1 query, previous one was blocked by some security software (a big thanks to Vojtech Vobr from AVG Technologies for his investigation to help us to fix this issue) 2016-05-08 13:39:17 +02:00
kervala
435ddae54f Changed: Useless to put a space after method name (if needed, we'll add ourself later) 2016-05-08 13:33:21 +02:00
kervala
27fcfd823a Changed: Minor changes 2016-05-08 13:31:54 +02:00
Dremor
159898b081 Merge branch 'ryzomcore' into 'develop'
Merge Ryzomcore into Develop



See merge request !2
2016-05-02 08:01:47 +00:00
kervala
f93dfcfefe Changed: Minor changes 2016-04-06 09:29:37 +02:00
depyraken
d6ef802487 merge aquatic to lirria 2016-03-30 23:13:00 +02:00
kervala
7517200cc7 Merge with develop 2016-03-29 14:00:04 +02:00
kervala
8b5c38392a Fixed: Typo 2016-03-29 13:59:34 +02:00
SIELA1915
52702f64f1 merged from compatibility-develop 2016-03-28 02:12:19 +02:00
kervala
323d981318 Merge with develop 2016-03-20 17:09:13 +01:00
kervala
d11053aa03 Fixed: Compilation (missing NLMISC namespaces for nlfopen) 2016-03-20 17:08:44 +01:00
kervala
894ee5a47b Merge with develop 2016-03-18 22:27:43 +01:00
kervala
78c7a925c7 Changed: Minor changes 2016-03-18 22:26:58 +01:00
kaetemi
4a581d89fa Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
af0568e131 Fix rounding error in _RyzomDay and _RyzomTime calculation 2016-03-10 12:08:48 +01:00
Yann
0ce6b3c411 Adding new talents in mdehaviours in common 2016-03-04 20:16:16 +01:00
kervala
4a8741a9b0 Merge with develop 2016-02-23 17:05:57 +01:00
kervala
6c1cf58572 Changed: Trim URL before to display it 2016-02-23 17:05:04 +01:00
kervala
db2c2c64a7 Changed: Updated world_editor_classes.xml 2016-02-21 17:10:28 +01:00
kervala
d0261d2fc5 Merge with develop 2016-02-21 17:06:38 +01:00
kervala
a58a3451b8 Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!) 2016-02-21 17:05:54 +01:00
kervala
24302acc35 Merge with develop 2016-02-21 13:57:35 +01:00
kervala
af54e427c8 Changed: Updated world_editor_classes.xml 2016-02-21 13:52:20 +01:00
kervala
9f7e192926 Changed: Minor changes (replaced l: by L:) 2016-02-21 13:30:48 +01:00
kervala
b552f850e8 Merge with develop 2016-02-21 13:22:22 +01:00
kervala
045d255a09 Changed: Use L:/ path instead of R:/ for leveldesign 2016-02-21 13:10:16 +01:00
kervala
c217f28626 Merge with develop 2016-02-20 19:29:00 +01:00
kervala
35570eb0a3 Adapt CSTLoader to use nlfopen and some simplifications, issue #261 2016-02-20 18:56:21 +01:00
kervala
e9f8202701 Changed: Minor changes 2016-02-20 18:53:39 +01:00
kervala
bfb32b811d Removed useless comments/commented code 2016-02-20 18:09:24 +01:00
kervala
808f7b2c30 Use new wrapper insteaf of fopen, issue #261 2016-02-20 17:56:25 +01:00
Yann
c76fdbf7db Deleting tries to delete unused continents - doesn't suffice, weather_everywhere.cpp ask for a different number of continents
q
2016-02-09 23:36:10 +01:00
Yann
37c45bebac Changing somelines in continent.cpp 2016-02-09 21:54:52 +01:00
Yann
3fa275e64d merging to lirria 2016-02-09 21:32:08 +01:00
Yann
0dd802f677 Deleting unused continents from code 2016-02-09 21:31:30 +01:00
SIELA1915
68d97aeb0e fixed use of CI18N (it is in namespace NLMISC) 2016-01-31 19:36:58 +01:00
SIELA1915
095bc1b04c merged with compatibility-develop 2016-01-31 15:42:41 +01:00
SIELA1915
db771f1d2b fixed missing include for server when trying to get the date 2016-01-31 15:39:32 +01:00