Commit graph

897 commits

Author SHA1 Message Date
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
kervala
a445afef3c Changed: Better camel case syntax 2016-04-02 13:28:42 +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
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
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
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
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
415eae4388 Merge with develop 2016-03-03 00:00:30 +02:00
Nimetu
14f1fa63fe Added: Possibility to set text as grayed in combo box 2016-03-02 23:58:48 +02:00
Nimetu
beadf6657b Merge with develop 2016-03-01 22:39:10 +02:00
kervala
4be2a5c844 Merge with develop 2016-02-27 18:39:41 +01:00
kervala
1704030c38 Changed: New functions launchProgramArray to pass an array of strings as arguments (easier to escape) 2016-02-27 18:38:58 +01:00
kervala
bc2c147722 Changed: New functions to convert arguments string from/to an array of strings 2016-02-27 18:37:43 +01:00
Nimetu
de83ae89eb Changed: Implement multi-row select box 2016-02-23 10:52:21 +02:00
Nimetu
4d93cb8c22 Added: http-equiv refresh 2016-02-23 10:52:24 +02:00
kervala
c217f28626 Merge with develop 2016-02-20 19:29:00 +01:00
kervala
3c74803187 New function to format a timestamp to human readable 2016-02-20 18:10:17 +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
kervala
667ddd1989 Create fopen wrapper that internally uses wide characters under Windows, issue #261 2016-02-20 17:46:11 +01:00
kaetemi
8bd8b3ea3e Move some stuff for easier debug 2016-02-18 11:55:58 +01:00
Gary Preston
cb44c01ad4 Add vector include and remove extra qualification on s_InitFlags. 2016-02-16 19:01:14 +00:00
kaetemi
db5c59d607 Centralized project directory configuration mechanism 2016-02-16 02:28:03 +01:00
kaetemi
9815393c27 Move pipeline utilities into new pipeline library 2016-02-16 00:28:24 +01:00
kervala
5d9d57d541 Merge with develop 2016-02-14 18:21:41 +01:00
kervala
c63e211cab Fixed: Implements IPv6 in CInetAddress 2016-02-14 18:21:09 +01:00
kervala
24081ab894 Merge with develop 2016-02-13 23:43:04 +01:00
kervala
b577182adb Changed: Remember startup path (the initial current directory) 2016-02-13 23:29:00 +01:00
kervala
462e89efe8 Merge with develop 2016-02-04 14:33:30 +01:00
kaetemi
b171323b91 Also support AppData/Local to allow a non-roaming config 2016-02-04 13:02:32 +01:00
kervala
8d21f350b4 Merge with develop 2016-02-02 12:37:59 +01:00
kervala
6679aa7621 Changed: New function bytesToHumanReadableUnits to use specific strings for units 2016-02-02 12:37:06 +01:00
kervala
a82b0baa72 Changed: Support more values for fromString with a boolean 2016-02-02 11:32:20 +01:00
kervala
2583139ea9 Merge with develop 2016-01-26 22:44:40 +01:00
kervala
9bdccc82d1 Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...) 2016-01-26 22:41:58 +01:00
kervala
237b6767b0 Fixed: Remove inherited dependency on libxml2 for all projects 2016-01-26 22:30:13 +01:00
kervala
b7c65ae7df Merge with develop 2016-01-23 10:19:01 +01:00
kervala
9d319a5688 Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs 2016-01-23 10:18:09 +01:00
kervala
94b033caf9 Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..) 2016-01-23 09:44:41 +01:00
kervala
4bcb41896e Merge with develop 2016-01-21 10:08:56 +01:00
kervala
05ce879469 Changed: Improve toString(const bool &val)... 2016-01-21 10:06:35 +01:00
Nimetu
6a01e0c28b Merge with develop 2016-01-20 19:15:45 +02:00
Nimetu
5c3e84cf1b Changed: Use url from <base> element for relative urls 2016-01-20 19:15:20 +02:00