Commit graph

765 commits

Author SHA1 Message Date
kervala
ede41a3091 Changed: Only compile gameshare for Ryzom servers, client or tools
--HG--
branch : develop
2016-12-04 20:31:24 +01:00
kervala
061bed6635 Merge with develop 2016-12-04 18:39:21 +01:00
kervala
c9c542de8b Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 18:39:21 +01:00
kervala
00048f0d6d Changed: Don't use std::auto_ptr anymore (use std::unique_ptr instead)
--HG--
branch : develop
2016-12-04 18:38:16 +01:00
kervala
18ca67b199 Merge with develop 2016-12-04 17:32:34 +01:00
kervala
316ee0d69c Merge with develop
--HG--
branch : compatibility-develop
2016-12-04 17:32:34 +01:00
kervala
c3a6610f36 Changed: Don't need to use CSString
--HG--
branch : develop
2016-12-04 17:14:47 +01:00
kervala
f17bd720b1 Fixed: Warnings with GGC 6
--HG--
branch : develop
2016-12-04 17:12:58 +01:00
kervala
f3564ed86e Fixed: Compilation with GCC 6
--HG--
branch : develop
2016-12-03 18:14:31 +01:00
kervala
e941cff0ff Fixed: Strict aliasing warnings
--HG--
branch : develop
2016-11-29 20:32:33 +01:00
Guillaume Dupuy
6f1197d633 Allow target to work with sheetName and a quiet option
HG : Enter commit message.  Lines beginning with 'HG:' are removed.
2016-11-28 00:54:33 +01:00
kervala
fe0210690d Merge with develop
--HG--
branch : compatibility-develop
2016-11-20 16:41:28 +01:00
kervala
91a1f4e34b Fixed: Compilation
--HG--
branch : develop
2016-11-20 16:40:39 +01:00
kervala
4eb21c1612 Merge with develop
--HG--
branch : compatibility-develop
2016-11-20 14:51:11 +01:00
kervala
f605c5faa5 Changed: Replace all "" by empty(), clear(), Empty(), etc...
--HG--
branch : develop
2016-11-20 14:49:13 +01:00
kervala
481bbae8ee Changed: Use wide versions of Win32 API
--HG--
branch : develop
2016-11-19 21:12:04 +01:00
kervala
9941fcf82b Fixed: Typos detected by Lintian
--HG--
branch : develop
2016-11-19 19:11:12 +01:00
99543f52f3 Delete sheet_id.bin , il ne devrait pas être la c'est une erreur !!! 2016-11-17 21:20:07 +00:00
Sit Melai
ccb943b852 Merge de la v3 de Ryzom Core 2016-11-07 17:11:05 +01:00
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
kervala
837197ca53 Merge with develop
--HG--
branch : compatibility-develop
2016-10-30 16:52:02 +01:00
kervala
16df8b8c1d Changed: Use empty() instead of comparison with ""
--HG--
branch : develop
2016-10-30 15:59:20 +01:00
kervala
b785a5114b Changed: Use empty() instead of comparison with "" 2016-10-30 15:59:20 +01:00
kervala
1e1f6ece8b Merge with develop
--HG--
branch : compatibility-develop
2016-10-27 16:48:45 +02:00
kervala
3c8bd42335 Changed: Minor change
--HG--
branch : develop
2016-10-27 10:54:55 +02:00
kervala
da10334807 Changed: Minor change 2016-10-27 10:54:55 +02:00
kervala
19e8ee1d05 Changed: Simplified all ENDIF and ELSE
--HG--
branch : develop
2016-10-27 10:54:09 +02:00
kervala
a53ec84c73 Changed: Simplified all ENDIF and ELSE 2016-10-27 10:54:09 +02:00
kervala
5322109eb3 Merge with develop
--HG--
branch : compatibility-develop
2016-10-25 17:41:54 +02:00
kervala
a0075414c0 Changed: Use empty() to check if a string is empty
--HG--
branch : develop
2016-10-25 15:52:14 +02:00
kervala
56b8a61b16 Changed: Use empty() to check if a string is empty 2016-10-25 15:52:14 +02:00
kervala
2e7af6ab0d Merge with develop
--HG--
branch : compatibility-develop
2016-10-20 13:08:48 +02:00
kervala
661975a471 Changed: Simplify toString
--HG--
branch : develop
2016-10-20 12:35:24 +02:00
kervala
02d8b7d400 Changed: Simplify toString 2016-10-20 12:35:24 +02:00
kervala
2fc39bc14d Added: Missing files from data_common.bnp
--HG--
branch : compatibility-develop
2016-09-25 14:17:30 +02: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
65e48df782 Merge with develop
--HG--
branch : compatibility-develop
2016-06-07 13:32:06 +02:00
kervala
3ec485331c Changed: Replace ~0 by std::numeric_limits
--HG--
branch : develop
2016-06-07 13:31:21 +02:00
kervala
e307920121 Changed: Replace ~0 by std::numeric_limits 2016-06-07 13:31:21 +02:00
kervala
86084649a2 Merge with develop
--HG--
branch : compatibility-develop
2016-05-26 19:36:25 +02:00
kervala
4b1959a560 Changed: Replace size() comparisons by empty()
--HG--
branch : develop
2016-05-25 23:18:11 +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
85948a1f1c Changed: Renamed ring_map_entry_ponts.txt to r2_entry_points.txt in compatibility-develop too (don't forget to update data_common.bnp!)
--HG--
branch : compatibility-develop
2016-05-20 19:18:46 +02:00
kervala
119bbe1f71 Merge with develop
--HG--
branch : compatibility-develop
2016-05-18 09:57:33 +02:00
kervala
87ce45dcb1 Fixed: Delay when logging in
--HG--
branch : develop
2016-05-18 09:52:48 +02:00
kervala
a9bafa02bd Fixed: Delay when logging in 2016-05-18 09:52:48 +02:00
kervala
ff5a82ec4f Merge with develop
--HG--
branch : compatibility-develop
2016-05-12 19:57:37 +02:00
kervala
011b545ac8 Changed: Minor changes
--HG--
branch : develop
2016-05-12 19:52:20 +02:00
kervala
9e1b9d8050 Changed: Minor changes 2016-05-12 19:52:20 +02:00
kervala
9e33df4532 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 19:24:04 +02:00
kervala
af6b282ec1 Changed: Minor changes
--HG--
branch : develop
2016-05-08 19:23:38 +02:00
kervala
e4a1e9df63 Changed: Minor changes 2016-05-08 19:23:38 +02:00
kervala
a9685ac366 Merge with develop
--HG--
branch : compatibility-develop
2016-05-08 13:42:53 +02:00
kervala
b932c31546 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)
--HG--
branch : develop
2016-05-08 13:39:17 +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
a0916ca14a Changed: Useless to put a space after method name (if needed, we'll add ourself later)
--HG--
branch : develop
2016-05-08 13:33:21 +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
8099537d02 Changed: Minor changes
--HG--
branch : develop
2016-05-08 13:31:54 +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
ef5b22045c Changed: Version 3.0.0
--HG--
branch : compatibility-develop
2016-04-09 12:53:30 +02:00
kervala
2d8407157b Merge with develop
--HG--
branch : compatibility-develop
2016-04-06 09:34:34 +02:00
kervala
a002b20c7f Changed: Minor changes
--HG--
branch : develop
2016-04-06 09:29:37 +02: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
8f6a72e86f Merge with develop
--HG--
branch : compatibility-develop
2016-03-29 14:00:04 +02:00
kervala
7517200cc7 Merge with develop 2016-03-29 14:00:04 +02:00
kervala
e785de2a6e Fixed: Typo
--HG--
branch : develop
2016-03-29 13:59:34 +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
7bcde43a63 Merge with develop
--HG--
branch : compatibility-develop
2016-03-20 17:09:13 +01:00
kervala
323d981318 Merge with develop 2016-03-20 17:09:13 +01:00
kervala
55de2f0bd2 Fixed: Compilation (missing NLMISC namespaces for nlfopen)
--HG--
branch : develop
2016-03-20 17:08:44 +01:00
kervala
d11053aa03 Fixed: Compilation (missing NLMISC namespaces for nlfopen) 2016-03-20 17:08:44 +01:00
kervala
1eddef3c93 Merge with develop
--HG--
branch : compatibility-develop
2016-03-18 22:27:43 +01:00
kervala
894ee5a47b Merge with develop 2016-03-18 22:27:43 +01:00
kervala
a7b3532687 Changed: Minor changes
--HG--
branch : develop
2016-03-18 22:26:58 +01:00
kervala
78c7a925c7 Changed: Minor changes 2016-03-18 22:26:58 +01:00
kaetemi
b9d366372e Merge with develop
--HG--
branch : compatibility-develop
2016-03-10 12:09:18 +01:00
kaetemi
4a581d89fa Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
c8646b26d1 Fix rounding error in _RyzomDay and _RyzomTime calculation
--HG--
branch : develop
2016-03-10 12:08:48 +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
e23f32e902 Merge with develop
--HG--
branch : compatibility-develop
2016-02-23 17:05:57 +01:00
kervala
4a8741a9b0 Merge with develop 2016-02-23 17:05:57 +01:00
kervala
79be594f54 Changed: Trim URL before to display it
--HG--
branch : develop
2016-02-23 17:05:04 +01:00
kervala
6c1cf58572 Changed: Trim URL before to display it 2016-02-23 17:05:04 +01:00
kervala
14f46e884b Changed: Updated world_editor_classes.xml
--HG--
branch : develop
2016-02-21 17:10:28 +01:00
kervala
db2c2c64a7 Changed: Updated world_editor_classes.xml 2016-02-21 17:10:28 +01:00
kervala
89f4131e8d Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 17:06:38 +01:00
kervala
d0261d2fc5 Merge with develop 2016-02-21 17:06:38 +01:00
kervala
3dfcdb758a Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!)
--HG--
branch : develop
2016-02-21 17:05:54 +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
537f6ab83e Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 13:57:35 +01:00
kervala
24302acc35 Merge with develop 2016-02-21 13:57:35 +01:00