Dremor
|
159898b081
|
Merge branch 'ryzomcore' into 'develop'
Merge Ryzomcore into Develop
See merge request !2
|
2016-05-02 08:01:47 +00:00 |
|
Nimetu
|
8b767cabcd
|
Changed: When writing to icfg or keys files, write to temp file and then rename
|
2016-04-29 12:16:43 +03:00 |
|
Nimetu
|
f023fa769a
|
Fixed: bad commit (issue #143)
|
2016-04-19 22:55:34 +03:00 |
|
kervala
|
58347b9353
|
Changed: Display certificate path
|
2016-04-18 13:40:13 +02:00 |
|
kervala
|
8aabb4fec7
|
Fixed: Warnings with clang
|
2016-04-18 13:40:02 +02:00 |
|
kervala
|
a9685f71b2
|
Fixed: Ignore "certificate already in hash table" errors
|
2016-04-18 13:39:48 +02:00 |
|
kervala
|
f36c73a9b1
|
Changed: Display parameters passed to batch in log
|
2016-04-12 19:54:38 +02:00 |
|
kervala
|
3d50a01f83
|
Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6
|
2016-04-12 15:43:13 +02:00 |
|
kervala
|
a545a8b091
|
Changed: Removed extraneous spaces at the end of lines
|
2016-04-12 15:42:53 +02:00 |
|
kervala
|
e77815256f
|
Fixed: CURLE_NOT_BUILT_IN undefined with some CURL versions
|
2016-04-12 15:42:43 +02:00 |
|
kervala
|
8c04ffe056
|
Fixed: Wrong display of max resist levels
|
2016-04-09 13:02:12 +02:00 |
|
kervala
|
130229cbb7
|
Changed: Give priority to login specified as argument
|
2016-04-06 09:36:06 +02:00 |
|
kervala
|
f93dfcfefe
|
Changed: Minor changes
|
2016-04-06 09:29:37 +02:00 |
|
kervala
|
81ca1a9a04
|
Changed: Reverted change, not sure it fixes anything
|
2016-04-02 19:33:53 +02:00 |
|
depyraken
|
8251713821
|
merge aquatic to lirria
|
2016-03-31 02:19:44 +02:00 |
|
depyraken
|
21d93bc1d7
|
fix a compil error on linux (compils with visual studio 2010)
|
2016-03-31 02:15:38 +02:00 |
|
depyraken
|
d6ef802487
|
merge aquatic to lirria
|
2016-03-30 23:13:00 +02:00 |
|
depyraken
|
3bbc975654
|
merge compatibility-develop to aquatic
|
2016-03-30 23:10:24 +02:00 |
|
Nimetu
|
9fb698f8af
|
Fixed: Typo in translation key
|
2016-03-30 10:44:52 +03:00 |
|
depyraken
|
42aeac0243
|
handle separately water and ground
The forbidden zones must be set in the primitives, in the fauna name = "Ybers:Ground|NoGo"
|
2016-03-30 02:56:09 +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 |
|
kervala
|
1b0280b96f
|
Fixed: Wrong locale under Linux
|
2016-03-29 13:58:57 +02:00 |
|
kervala
|
740b7a252d
|
Changed: Updated translations
|
2016-03-29 13:58:29 +02:00 |
|
SIELA1915
|
52702f64f1
|
merged from compatibility-develop
|
2016-03-28 02:12:19 +02:00 |
|
Nimetu
|
df0d249834
|
Added: AppZone translations
|
2016-03-22 12:17:57 +02:00 |
|
Nimetu
|
2be2717ee7
|
Merge with develop
|
2016-03-22 12:23:04 +02:00 |
|
Nimetu
|
5f53c6caa6
|
Added: AppZone and WebBrowser components
|
2016-03-22 11:11:47 +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
|
54ceef6c99
|
Merge with develop
|
2016-03-19 19:30:06 +01:00 |
|
kervala
|
17b390e589
|
Fixed: Clang warnings
|
2016-03-19 19:29:03 +01:00 |
|
kervala
|
a9c06ce8d0
|
Fixed: Use presets from client_default.cfg for client_config_qt
|
2016-03-19 19:27:00 +01:00 |
|
kervala
|
66d9a0eea7
|
Changed: Try to load Steam DLL without path if fails
|
2016-03-19 18:29:14 +01:00 |
|
kervala
|
93f5836fd5
|
Merge with develop
|
2016-03-19 16:21:46 +01:00 |
|
kervala
|
82985016cf
|
Fixed: Use nlfopen in tools and servers
|
2016-03-19 16:21:06 +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 |
|
kervala
|
ba71497344
|
Changed: Load Steam DLL just after initializing logs and before loading config
|
2016-03-18 22:21:01 +01:00 |
|
kervala
|
45f2100a03
|
Fixed: Use language defined in Ryzom properties from Steam
|
2016-03-18 22:20:28 +01:00 |
|
kervala
|
29c946b73a
|
Merge with develop
|
2016-03-18 22:16:28 +01:00 |
|
kervala
|
2a53238ba3
|
Changed: Use named arguments in uiFilterMenuDynamic translation
|
2016-03-18 22:11:03 +01:00 |
|
kervala
|
f728a518a1
|
Fixed: Move setrlimit after initializing logs
|
2016-03-18 22:10:19 +01:00 |
|
kervala
|
baa490ca9c
|
Changed: Fix clang warnings
|
2016-03-18 22:06:20 +01:00 |
|
kervala
|
f5e60a4fea
|
Changed: Init log before calling prelogInit()
|
2016-03-18 18:10:01 +01:00 |
|
kervala
|
38de0a300e
|
Changed: Updated translations
|
2016-03-17 13:51:44 +01:00 |
|
kervala
|
1b724c56fc
|
Merge with develop
|
2016-03-16 19:15:11 +01:00 |
|
kervala
|
23e93ad89e
|
Fixed: Renamed ryzom_configuration to ryzom_configuration_qt under Linux
|
2016-03-16 19:14:23 +01:00 |
|
kervala
|
624b2bbdd8
|
Fixed: We need to restart client from the same startup directory as parent one
|
2016-03-16 19:13:57 +01:00 |
|
kervala
|
7d23cd6f52
|
Changed: Removed some semicolons in Lua when useless
|
2016-03-16 19:13:07 +01:00 |
|