Commit graph

1017 commits

Author SHA1 Message Date
kervala
56b8a61b16 Changed: Use empty() to check if a string is empty 2016-10-25 15:52:14 +02:00
kervala
14917f114f Merge with develop 2016-10-22 16:55:51 +02:00
kervala
2e93b84f2c Changed: Typo 2016-10-22 16:49:19 +02:00
kervala
d31bfa9606 Changed: Implement and use CBitmap::makeTransparentPixelsBlack() 2016-10-22 16:47:25 +02:00
Guillaume Dupuy
9ec5a6e693 Fixed a rare case where float and double mixup would result in an incorrect speed 2016-10-13 20:46:10 +02:00
kervala
6abf3cbdaa Fixed: Connexion -> Connection typo 2016-09-28 23:42:01 +02:00
Nimetu
e146348e03 Merge with develop 2016-09-21 20:12:51 +03:00
Nimetu
8e86401f04 Added: Lua function to render html string as new webpage 2016-09-21 20:11:13 +03:00
kervala
8c0af53b48 Merge with develop 2016-09-03 10:15:39 +02:00
kervala
dd88ab208c Changed: Get length of song in FMod driver too (issue #59) 2016-09-03 10:03:33 +02:00
Nimetu
3610c6c8cb Merge with develop 2016-08-30 21:27:56 +03:00
Nimetu
f3ea058c80 Changed: Also return song length with title 2016-08-30 21:25:46 +03:00
Erwan GEORGET
edf0b19c75 Merge ryzomcore into feature/merge-ryzomcore-to-develop+CI 2016-08-09 22:12:11 +02:00
Nimetu
85838aec19 Merge with develop 2016-07-24 16:09:25 +03:00
Nimetu
9e17c46d19 Added: font-family style option 2016-07-24 16:07:31 +03:00
Nimetu
74a4e107b6 Added: Monospace font options 2016-07-24 16:07:18 +03:00
Nimetu
976b5d5689 Changed: Support custom font 2016-07-24 16:05:04 +03:00
Nimetu
9f104a27ba Added: Possible to use multiple fonts at the same time 2016-07-24 16:03:37 +03:00
Nimetu
8f9d7078bd Merge with develop 2016-06-12 12:49:14 +03:00
Nimetu
f5f7a853b9 Added: Minimum lines option to multiline text 2016-06-12 10:22:22 +03:00
Nimetu
dca7c1f40b Merge with develop 2016-06-04 10:36:21 +03:00
kervala
6fbf8c5326 Merge with develop 2016-05-26 19:36:25 +02:00
Nimetu
60e40efe9d Changed: Move addLink code to beginElement 2016-05-25 12:08:08 +03:00
kervala
8a720cd86c Changed: Use uint instead of unsigned 2016-05-25 23:19:46 +02:00
kervala
d94941a20b Changed: Replace size() comparisons by empty() 2016-05-25 23:18:11 +02:00
Nimetu
13bef3b94d Merge with develop 2016-05-14 13:47:03 +03:00
Nimetu
b619ef1865 Changed: Remove legacy HTTPCurrentDomain variable 2016-05-14 12:53:09 +03:00
Nimetu
ec64ba53a7 Changed: Rename CUrlParser domain variable 2016-05-14 12:53:09 +03: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
208e02b31e Merge with develop 2016-04-06 09:34:34 +02:00
kervala
f93dfcfefe Changed: Minor changes 2016-04-06 09:29:37 +02:00
kervala
587804cab7 Merge with develop 2016-04-02 13:32:28 +02:00
kervala
a445afef3c Changed: Better camel case syntax 2016-04-02 13:28:42 +02:00
kervala
e29d08861d Merge with develop 2016-04-02 11:34:39 +02:00
depyraken
d3c21bdd08 add isloopbackIPAddress prototype to code/nel/include/nel/net/inet_address.h
add isloopbackIPAddress to code/nel/src/net/inet_address.cpp
add IPv4&IPv6 loopback IP addresses to localAddresses

In code/nel/src/net/unified_network.cpp:
replace is127001 calls by isloopbackIPAddress
change wrong comments about default network id (nid = 0xFF)
When the selected connectionId is not valid
	warnings are not triggered anymore when using default network (nid = 0xFF): the logs were full of warnings and the server was lagging
	When nid = 0xFF, the new connectionId is stored into DefaultNetwork
	When nid <> 0xFF, the new connectionId is stored into NetworkConnectionAssociations[nid]
2016-03-29 02:29:35 +02:00
kaetemi
4bdca3e82e Merge with develop 2016-03-19 22:34:32 +01:00
kaetemi
354e52aac1 Merge with develop 2016-03-19 22:34:32 +01:00
kaetemi
d76dc8fe56 Compile fix 2016-03-19 22:13:38 +01:00
kervala
5109ae5443 Merge with develop 2016-03-19 19:30:06 +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
dc52b3e24f Merge with develop 2016-03-19 16:21:46 +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
63b2843232 Merge with develop 2016-03-18 22:16:28 +01:00
kervala
29c946b73a Merge with develop 2016-03-18 22:16:28 +01:00
kervala
97979c9083 Changed: Don't need to use Windows functions with locale because the bug also occurs under Linux and OS X 2016-03-18 22:07:52 +01:00
kervala
baa490ca9c Changed: Fix clang warnings 2016-03-18 22:06:20 +01:00
kervala
d72a59f5ea Changed: Implement CI18N::setSystemLanguageCode, if we must force it
Fixed: CI18N::getSystemLanguageCode under Windows (use 2 different methods)
2016-03-18 15:07:49 +01:00
Nimetu
526a716948 Merge with develop 2016-03-03 00:00:30 +02:00