|
1c898ea0b2
|
Merge branch 'ryzomcore' into ryzomcore+develop
# Conflicts:
# .hgtags
# .travis.yml
# code/CMakeModules/FindMSVC.cmake
# code/ryzom/client/src/steam_client.cpp
|
2018-03-24 18:18:50 +01:00 |
|
kervala
|
613d4ddc34
|
Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless
--HG--
branch : develop
|
2018-02-02 21:04:30 +01:00 |
|
compil
|
98942e57b3
|
Merge branch 'ryzomcore' into feature/merge_ryzomcore171003
|
2017-10-14 19:23:02 +02:00 |
|
kervala
|
4a848b0771
|
Changed: Centralize Foundation framework search
--HG--
branch : develop
|
2017-04-21 11:04:09 +02:00 |
|
|
80b032e703
|
Revert "mise a jour de RC"
This reverts commit d526953811 .
|
2017-03-15 20:43:10 +01:00 |
|
|
d526953811
|
mise a jour de RC
|
2017-03-15 20:29:34 +01:00 |
|
Sit Melai
|
ccb943b852
|
Merge de la v3 de Ryzom Core
|
2016-11-07 17:11:05 +01: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
|
a7531eac0d
|
Fixed: Ryzom client patcher doesn't depend on any cfg file anymore
--HG--
branch : develop
|
2016-10-25 16:02:46 +02:00 |
|
kervala
|
ad0ba5c6b1
|
Fixed: Ryzom client patcher doesn't depend on any cfg file anymore
|
2016-10-25 16:02:46 +02:00 |
|
SIELA1915
|
52702f64f1
|
merged from compatibility-develop
|
2016-03-28 02:12:19 +02: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 |
|
kervala
|
81408bbc5a
|
Fixed: Missing translation for bytes in patcher
--HG--
branch : develop
|
2016-03-01 14:01:47 +01:00 |
|
kervala
|
00e6ff45ea
|
Fixed: Missing translation for bytes in patcher
|
2016-03-01 14:01:47 +01:00 |
|
SIELA1915
|
f5459a1b9b
|
merge from compatibility-develop
|
2016-02-12 18:28:23 +01:00 |
|
kervala
|
eb263cd4e4
|
Fixed: Client patcher compilation
--HG--
branch : develop
|
2016-02-04 14:32:40 +01:00 |
|
kervala
|
b00b6acf03
|
Fixed: Client patcher compilation
|
2016-02-04 14:32:40 +01:00 |
|
kervala
|
a8fdf67c19
|
Changed: Simplify client_patcher to not rely on UXT files anymore and only use english
--HG--
branch : develop
|
2016-02-04 13:21:14 +01:00 |
|
kervala
|
f72cf4789c
|
Changed: Simplify client_patcher to not rely on UXT files anymore and only use english
|
2016-02-04 13:21:14 +01:00 |
|
kervala
|
27e7efca56
|
Changed: Use CCmdArgs for client_patcher
--HG--
branch : develop
|
2016-02-02 19:30:19 +01:00 |
|
kervala
|
47f4a5d501
|
Changed: Use CCmdArgs for client_patcher
|
2016-02-02 19:30:19 +01:00 |
|
kervala
|
5a57de43fa
|
Changed: Simplify client_patcher
--HG--
branch : develop
|
2016-02-02 19:30:00 +01:00 |
|
kervala
|
22c8ce32a7
|
Changed: Simplify client_patcher
|
2016-02-02 19:30:00 +01:00 |
|
kervala
|
705173bce7
|
Changed: Minor changes
--HG--
branch : develop
|
2016-02-02 19:21:14 +01:00 |
|
kervala
|
13c4282911
|
Changed: Minor changes
|
2016-02-02 19:21:14 +01:00 |
|
SIELA1915
|
ff4c458f6d
|
changed the last missing
|
2016-02-01 16:04:21 +01:00 |
|
SIELA1915
|
223139d53c
|
merged
|
2016-01-30 20:51:30 +01:00 |
|
kervala
|
3683193dde
|
Fixed: Compilation of client_patcher
--HG--
branch : develop
|
2016-01-27 14:42:19 +01:00 |
|
kervala
|
fc4ef1909b
|
Fixed: Compilation of client_patcher
|
2016-01-27 14:42:19 +01:00 |
|
kervala
|
36f886f5f1
|
Changed: Removed more useless dependencies
--HG--
branch : develop
|
2016-01-26 22:43:35 +01:00 |
|
kervala
|
3faeb82290
|
Changed: Removed more useless dependencies
|
2016-01-26 22:43:35 +01:00 |
|
kervala
|
af2f38612a
|
Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
|
2016-01-26 22:30:13 +01:00 |
|
kervala
|
237b6767b0
|
Fixed: Remove inherited dependency on libxml2 for all projects
|
2016-01-26 22:30:13 +01:00 |
|
SIELA1915
|
da926956b7
|
Merged
|
2016-01-16 17:32:22 +01:00 |
|
kervala
|
02f6248bd4
|
Changed: Expand environment variables in paths read from cfg files
|
2016-01-13 19:59:09 +01:00 |
|
kervala
|
57f216dc3e
|
Changed: Expand environment variables in paths read from cfg files
--HG--
branch : develop
|
2016-01-13 19:59:09 +01:00 |
|
SIELA1915
|
93d2b80966
|
Adjustments to give more options to do custom emotes, "Khanatization" for the Mac Client, changements to the key system.
|
2016-01-13 19:26:28 +01:00 |
|
kervala
|
2ef9f7dbd9
|
Fixed: Compilation
|
2016-01-09 16:29:59 +01:00 |
|
kervala
|
3af2813fbf
|
Fixed: Compilation
--HG--
branch : develop
|
2016-01-09 16:29:59 +01:00 |
|
kervala
|
873ac7e727
|
Changed: Copy tools related to client into client bundle under OS X
|
2016-01-04 13:43:49 +01:00 |
|
kervala
|
6627c04a97
|
Changed: Copy tools related to client into client bundle under OS X
--HG--
branch : develop
|
2016-01-04 13:43:49 +01:00 |
|
kervala
|
df89274053
|
Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle
|
2016-01-03 17:47:31 +01:00 |
|
kervala
|
33e701192d
|
Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle
--HG--
branch : develop
|
2016-01-03 17:47:31 +01:00 |
|
kervala
|
038612ec9b
|
Fixed: Define RZ_USE_CUSTOM_PATCH_SERVER for ryzom_client_patcher
|
2016-01-01 15:57:10 +01:00 |
|
kervala
|
aebc890f9c
|
Fixed: Define RZ_USE_CUSTOM_PATCH_SERVER for ryzom_client_patcher
--HG--
branch : develop
|
2016-01-01 15:57:10 +01:00 |
|
kervala
|
90185f7682
|
Fixed: use PatchUrl instead of PatchServer in ryzom_client_patcher
|
2015-12-21 17:31:14 +01:00 |
|
kervala
|
9bc4534660
|
Fixed: use PatchUrl instead of PatchServer in ryzom_client_patcher
--HG--
branch : develop
|
2015-12-21 17:31:14 +01:00 |
|
kervala
|
583035ff3d
|
Fixed: ryzom_client_patcher compilation
|
2015-12-08 17:49:23 +01:00 |
|