Commit graph

6148 commits

Author SHA1 Message Date
kervala
346a0297f6 Merge with develop
--HG--
branch : compatibility-develop
2016-04-12 15:43:47 +02:00
kervala
7ff21f975d Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6
--HG--
branch : develop
2016-04-12 15:43:13 +02:00
kervala
6e05750fa3 Changed: Removed extraneous spaces at the end of lines
--HG--
branch : develop
2016-04-12 15:42:53 +02:00
kervala
28f66549a0 Fixed: CURLE_NOT_BUILT_IN undefined with some CURL versions
--HG--
branch : develop
2016-04-12 15:42:43 +02:00
kervala
6cd73cca03 Merge with develop
--HG--
branch : compatibility-develop
2016-04-09 13:02:40 +02:00
kervala
0a110eff4f Fixed: Wrong display of max resist levels
--HG--
branch : develop
2016-04-09 13:02:12 +02:00
kervala
ef5b22045c Changed: Version 3.0.0
--HG--
branch : compatibility-develop
2016-04-09 12:53:30 +02:00
kervala
5b93785499 Merge with develop
--HG--
branch : compatibility-develop
2016-04-06 09:36:35 +02:00
kervala
c5e57273a9 Changed: Give priority to login specified as argument
--HG--
branch : develop
2016-04-06 09:36:06 +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
435573b305 Merge with develop
--HG--
branch : compatibility-develop
2016-04-02 19:34:20 +02:00
kervala
bac64a0860 Changed: Reverted change, not sure it fixes anything
--HG--
branch : develop
2016-04-02 19:33:53 +02:00
kervala
b33a9f7651 Changed: Pass LoginCustomParameters to different login URLs if defined
--HG--
branch : compatibility-develop
2016-04-02 19:09:21 +02:00
kervala
6862a48c47 Changed: If only login is passed as parameter, neither use auto login nor alt login
--HG--
branch : compatibility-develop
2016-04-02 19:08:13 +02:00
kervala
e42d3a3f74 Merge with develop
--HG--
branch : compatibility-develop
2016-04-02 13:32:28 +02:00
kervala
3219ce959b Changed: Use booleans to know if we already added a loopback address
--HG--
branch : develop
2016-04-02 13:31:59 +02:00
kervala
3c8228df15 Fixed: Empty const char* because std::string destructor called
--HG--
branch : develop
2016-04-02 13:31:04 +02:00
kervala
7dd635960a Changed: Use toString for formatting
--HG--
branch : develop
2016-04-02 13:30:08 +02:00
kervala
c30bf20ccc Changed: Minor changes
--HG--
branch : develop
2016-04-02 13:29:42 +02:00
kervala
a410f2fcc1 Changed: Better camel case syntax
--HG--
branch : develop
2016-04-02 13:28:42 +02:00
kervala
53f2292613 Merge with develop
--HG--
branch : compatibility-develop
2016-04-02 11:34:39 +02:00
kervala
19c149b5f3 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-04-02 11:26:07 +02:00
Nimetu
d4c8f5760b Fixed: Typo in translation key
--HG--
branch : compatibility-develop
2016-03-30 10:44:52 +03:00
kervala
8f6a72e86f Merge with develop
--HG--
branch : compatibility-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
7ed352ca8c Fixed: Wrong locale under Linux
--HG--
branch : develop
2016-03-29 13:58:57 +02:00
kervala
5837c14e64 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-29 13:58:29 +02:00
depyraken
96fd182335 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]

--HG--
branch : develop
2016-03-29 02:29:35 +02:00
Nimetu
37ea9de8ad Added: AppZone translations
--HG--
branch : compatibility-develop
2016-03-22 12:17:57 +02:00
Nimetu
e2d1213708 Merge with develop
--HG--
branch : compatibility-develop
2016-03-22 12:23:04 +02:00
Nimetu
2eb1d7b293 Added: AppZone and WebBrowser components
--HG--
branch : develop
2016-03-22 11:11:47 +02:00
kervala
05ca6f74c6 Merge with develop
--HG--
branch : compatibility-develop
2016-03-20 17:28:00 +01:00
kervala
89532b2afb Fixed: Compilation (missing NLMISC namespaces for nlfopen)
--HG--
branch : develop
2016-03-20 17:27:25 +01:00
kervala
7bcde43a63 Merge with develop
--HG--
branch : compatibility-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
kaetemi
f767e7a488 Merge with develop
--HG--
branch : compatibility-develop
2016-03-19 22:34:32 +01:00
kaetemi
bbec2c5b33 Fix random thunder activation caused by rounding error in setup interpolation
--HG--
branch : develop
2016-03-19 22:13:38 +01:00
kaetemi
198323b9b5 Compile fix
--HG--
branch : develop
2016-03-19 22:13:38 +01:00
kervala
6b2e47e59e Merge with develop
--HG--
branch : compatibility-develop
2016-03-19 19:30:06 +01:00
kervala
89be3e39de Fixed: Clang warnings
--HG--
branch : develop
2016-03-19 19:29:03 +01:00
kervala
dadfb51257 Fixed: Use presets from client_default.cfg for client_config_qt
--HG--
branch : develop
2016-03-19 19:27:00 +01:00
kervala
264e8be1a2 Changed: Try to load Steam DLL without path if fails
--HG--
branch : compatibility-develop
2016-03-19 18:29:14 +01:00
kervala
833976be5b Merge with develop
--HG--
branch : compatibility-develop
2016-03-19 16:21:46 +01:00
kervala
0d773e3e79 Fixed: Use nlfopen in tools and servers
--HG--
branch : develop
2016-03-19 16:21:06 +01:00
kervala
e191e1675b Fixed: Define _DARWIN_UNLIMITED_STREAMS to fix setrlimit under OS X
--HG--
branch : develop
2016-03-19 15:34:00 +01:00
kervala
1eddef3c93 Merge with develop
--HG--
branch : compatibility-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
f376317f10 Fixed: Compilation
--HG--
branch : develop
2016-03-18 22:26:43 +01:00
kervala
bbaaa17d7a Changed: Load Steam DLL just after initializing logs and before loading config
--HG--
branch : compatibility-develop
2016-03-18 22:21:01 +01:00