Commit graph

6283 commits

Author SHA1 Message Date
kervala
69e8116333 Changed: Temporary log for a OS X 10.7 bug...
--HG--
branch : compatibility-develop
2016-04-14 18:58:54 +02:00
kervala
7d9ff0ad72 Backed out changeset: 44cd3beacab6
--HG--
branch : compatibility-develop
2016-04-14 18:56:48 +02:00
kervala
c0f51c1c5b Changed: Temporary checks for a OS X 10.7 bug...
--HG--
branch : compatibility-develop
2016-04-14 18:19:19 +02:00
kervala
465609f942 Merge with develop
--HG--
branch : compatibility-develop
2016-04-13 20:37:30 +02:00
kervala
e82ada1026 Fixed: Link to freetype when using Qt
--HG--
branch : develop
2016-04-13 20:36:43 +02:00
kervala
54ac3bd1d5 Merge with develop
--HG--
branch : compatibility-develop
2016-04-12 19:55:05 +02:00
kervala
8090ddd12f Changed: Display parameters passed to batch in log
--HG--
branch : develop
2016-04-12 19:54:38 +02:00
kervala
32ce9a47cb Fixed: Compilation with Qt 5.6
--HG--
branch : develop
2016-04-12 19:54:05 +02:00
kervala
ba1486ea48 Merge with develop
--HG--
branch : feature-ryzom-installer
2016-04-12 16:53:28 +02:00
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
kervala
d99cf4bd95 Fixed: Use language defined in Ryzom properties from Steam
--HG--
branch : compatibility-develop
2016-03-18 22:20:28 +01:00
kervala
410b9bcf55 Merge with develop
--HG--
branch : compatibility-develop
2016-03-18 22:16:28 +01:00
kervala
cf20e21f83 Changed: Use named arguments in uiFilterMenuDynamic translation
--HG--
branch : develop
2016-03-18 22:11:03 +01:00
kervala
4074f095eb Fixed: Move setrlimit after initializing logs
--HG--
branch : develop
2016-03-18 22:10:19 +01:00
kervala
40c7c82a2d Changed: Removed wrong check
--HG--
branch : develop
2016-03-18 22:09:43 +01:00
kervala
05e0500aaf Changed: Check if LC_NUMERIC is correct before loading or saving config files
--HG--
branch : develop
2016-03-18 22:09:26 +01:00
kervala
97647b2264 Fixed: Set numeric locale in CApplicationContext
--HG--
branch : develop
2016-03-18 22:08:43 +01:00
kervala
d7121b4b7a Changed: Don't need to use Windows functions with locale because the bug also occurs under Linux and OS X
--HG--
branch : develop
2016-03-18 22:07:52 +01:00
kervala
94f4e901c9 Changed: Fix clang warnings
--HG--
branch : develop
2016-03-18 22:06:20 +01:00
kervala
6e816dfaa2 Changed: Init log before calling prelogInit()
--HG--
branch : develop
2016-03-18 18:10:01 +01:00
kervala
962b43d2bd Fixed: Possible crashes if ov_info returns NULL
--HG--
branch : develop
2016-03-18 15:09:02 +01:00
kervala
a77fee685b Changed: Implement CI18N::setSystemLanguageCode, if we must force it
Fixed: CI18N::getSystemLanguageCode under Windows (use 2 different methods)

--HG--
branch : develop
2016-03-18 15:07:49 +01:00
kervala
0c0bac175f Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-17 13:51:44 +01:00
kervala
114543ba07 Merge with develop
--HG--
branch : compatibility-develop
2016-03-16 19:15:11 +01:00
kervala
1356c1d447 Fixed: Renamed ryzom_configuration to ryzom_configuration_qt under Linux
--HG--
branch : develop
2016-03-16 19:14:23 +01:00
kervala
413dd8eb93 Fixed: We need to restart client from the same startup directory as parent one
--HG--
branch : develop
2016-03-16 19:13:57 +01:00
kervala
8bc243ffe1 Changed: Removed some semicolons in Lua when useless
--HG--
branch : develop
2016-03-16 19:13:07 +01:00
kervala
c39190b38d Changed: Use same algorithm as before Windows unicodes fixes (try to open the file instead of checking its attributes)
--HG--
branch : develop
2016-03-16 19:12:34 +01:00
kervala
5121cdb7d4 Changed: Use # in Lua to get the size of an array
--HG--
branch : develop
2016-03-15 17:55:58 +01:00
kervala
182a9201c3 Merge with develop
--HG--
branch : compatibility-develop
2016-03-15 17:45:55 +01:00
kervala
d113bb7b10 Changed: Search client_default.cfg also in ETC_RYZOM_PREFIX
--HG--
branch : develop
2016-03-15 17:44:21 +01:00
kervala
b0d50dea69 Merge with develop
--HG--
branch : compatibility-develop
2016-03-15 12:37:11 +01:00
kervala
f1b882c0f3 Changed: Removed useless dependencies on DirectX
--HG--
branch : develop
2016-03-15 12:36:21 +01:00
kervala
61934be39a Fixed: Fyros and Matis are using first name first while Trykers and Zoraïs are using last name first
--HG--
branch : develop
2016-03-15 12:35:47 +01:00
kervala
c3d3024507 Changed: Remived useless semicolons
--HG--
branch : develop
2016-03-15 12:34:45 +01:00
kervala
2dd97967ff Changed: Remove Hungarian because this language is not supported by Ryzom
--HG--
branch : develop
2016-03-15 12:31:20 +01:00
kervala
011e87b3bc Changed: Updated Configuration translations
--HG--
branch : develop
2016-03-15 12:30:52 +01:00
kervala
888c21cd97 Changed: Fix typo
--HG--
branch : develop
2016-03-15 12:30:14 +01:00
kervala
27413888b3 Merge with develop
--HG--
branch : feature-ryzom-installer
2016-03-15 00:09:40 +01:00
kervala
13abb130bd Merge with develop
--HG--
branch : compatibility-develop
2016-03-15 00:08:40 +01:00
kervala
d340f00d01 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-15 00:08:12 +01:00
kervala
61c33024b6 Changed: Updated Configuration translations
--HG--
branch : develop
2016-03-15 00:06:06 +01:00
kervala
bb67a604e6 Fixed: Wrong first and last names orders and some minor bugs
--HG--
branch : develop
2016-03-15 00:03:06 +01:00
kervala
efac9c97b1 Changed: Use more explicit variable names
--HG--
branch : develop
2016-03-15 00:01:29 +01:00
kervala
7366a1f994 Changed: Minor changes (spaces replaced by tabs)
--HG--
branch : develop
2016-03-14 23:58:58 +01:00
kervala
0a16b3b8dd Changed: Sligthly changes
--HG--
branch : develop
2016-03-14 21:36:50 +01:00
kervala
0be32d3a25 Fixed: UTF-8 encoding
--HG--
branch : develop
2016-03-14 21:27:28 +01:00
kervala
7bfb43c25d Changed: Updated translations for Ryzom Configuration
--HG--
branch : develop
2016-03-14 21:07:06 +01:00
kervala
30703b5591 Changed: Update shorcuts
--HG--
branch : feature-ryzom-installer
2016-03-12 22:01:03 +01:00
kervala
95f6b154fb Changed: Save when clicking on OK
--HG--
branch : feature-ryzom-installer
2016-03-12 22:00:43 +01:00
kervala
d446dd3942 Changed: Update index in servers list
--HG--
branch : feature-ryzom-installer
2016-03-12 22:00:12 +01:00
kervala
d34b434b23 Changed: Disable widgets if no profile selected
--HG--
branch : feature-ryzom-installer
2016-03-12 21:59:29 +01:00
kervala
0d06721689 Changed: Read version from client and display it
--HG--
branch : feature-ryzom-installer
2016-03-12 21:58:53 +01:00
kervala
a1ceaf0c5e Changed: Use CServersModel
--HG--
branch : feature-ryzom-installer
2016-03-12 21:58:05 +01:00
kervala
b98f625e7a Changed: Methods to convert index from/to profile ID
--HG--
branch : feature-ryzom-installer
2016-03-12 21:57:24 +01:00
kervala
733969f148 Changed: Minor changes
--HG--
branch : feature-ryzom-installer
2016-03-12 21:56:23 +01:00
kervala
4a50cf1d3a Changed: Read/write shortcuts
--HG--
branch : feature-ryzom-installer
2016-03-12 21:54:44 +01:00
kervala
0828e1cc30 Changed: Use checkboxes for shortcuts
--HG--
branch : feature-ryzom-installer
2016-03-12 21:53:51 +01:00
kervala
61b2a3e6f2 Added: ServersModel to manage servers list
--HG--
branch : feature-ryzom-installer
2016-03-12 21:53:20 +01:00
kervala
81829bf73e Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-12 15:40:28 +01:00
kervala
9d48b2923b Merge with develop
--HG--
branch : feature-ryzom-installer
2016-03-12 14:50:10 +01:00
kervala
992b624d4c Merge with develop
--HG--
branch : compatibility-develop
2016-03-12 14:49:35 +01:00
kervala
691c8cdbd3 Changed: Use QString::number() instead of QString("%1") to convert an int to QString
--HG--
branch : develop
2016-03-12 14:49:04 +01:00
kervala
587b63e1d1 Fixed: Use full path to launch Ryzom client and pass profile argument
--HG--
branch : develop
2016-03-12 14:48:18 +01:00
kervala
21a84a3ed4 Changed: Declare CCmdArgs outside of main() to be able to use it in other files
--HG--
branch : develop
2016-03-12 14:47:13 +01:00
kervala
13851e3df5 Fixed: 0x0 is Auto mode
--HG--
branch : develop
2016-03-12 14:46:13 +01:00
kervala
f258a9695a Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-12 14:37:39 +01:00
kervala
8f82ad85db Merge with develop
--HG--
branch : compatibility-develop
2016-03-11 09:51:59 +01:00
kervala
b9231adb78 Fixed: ForceDXTC is not to disable compression but force it
--HG--
branch : develop
2016-03-11 09:50:22 +01:00
kervala
e4f8bb0e16 Changed: Use MiB for RAM
--HG--
branch : develop
2016-03-11 09:48:59 +01:00
kervala
c0958ab0b5 Fixed: Determine path of client.cfg and client_default.cfg
--HG--
branch : develop
2016-03-11 09:45:11 +01:00
kervala
e0be334456 Changed: Create new client.cfg
--HG--
branch : develop
2016-03-11 09:44:21 +01:00
kaetemi
b9d366372e Merge with develop
--HG--
branch : compatibility-develop
2016-03-10 12:09:18 +01:00
kaetemi
4762b33ac0 Fix thunder update
--HG--
branch : develop
2016-03-10 12:08:48 +01:00
kaetemi
c8646b26d1 Fix rounding error in _RyzomDay and _RyzomTime calculation
--HG--
branch : develop
2016-03-10 12:08:48 +01:00
kervala
5c3f5e841c Changed: Write a warning instead of error
--HG--
branch : develop
2016-03-09 11:24:17 +01:00
kervala
faae2973ac Fixed: With new iOS versions (and perhaps OS X), locale can contains country code
--HG--
branch : develop
2016-03-09 11:24:01 +01:00
kervala
41176a7d02 Fixed: OpenGL ES driver compilation
--HG--
branch : develop
2016-03-09 11:22:09 +01:00
kervala
8dec2fbb54 Changed: Random names generator updated by Osquallo
--HG--
branch : develop
2016-03-09 11:21:53 +01:00
kaetemi
0c2ff923b7 Merge with develop
--HG--
branch : compatibility-develop
2016-03-08 12:46:47 +01:00
kaetemi
48a120b21f Fix curl crash
--HG--
branch : develop
2016-03-08 12:46:15 +01:00
kervala
96c1328bef Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-06 19:42:06 +01:00
kervala
eedfe1471b Changed: Updated translations
--HG--
branch : compatibility-develop
2016-03-05 19:30:35 +01:00
kervala
6686503e51 Merge with develop
--HG--
branch : compatibility-develop
2016-03-05 18:44:19 +01:00
kervala
124bfac9f0 Improved Luabind CMake module, fixes #262 and fixes #263
--HG--
branch : develop
2016-03-05 18:43:25 +01:00
kervala
d6e97a9ebc Merge with develop
--HG--
branch : feature-ryzom-installer
2016-03-05 12:46:47 +01:00
kervala
2f23fabd02 Merge with develop
--HG--
branch : compatibility-develop
2016-03-05 12:46:17 +01:00
kervala
0db2ed85ca Changed: Temporarily disable Spanish and Russian translations (not yet ready)
--HG--
branch : compatibility-develop
2016-03-05 12:45:49 +01:00
kervala
846be58379 Changed: Better warning
--HG--
branch : develop
2016-03-05 12:42:32 +01:00
kervala
f445789fb0 Changed: Profiles dialog code
--HG--
branch : feature-ryzom-installer
2016-03-05 12:38:28 +01:00
kervala
5a11b80b9f Added: Profiles model class
--HG--
branch : feature-ryzom-installer
2016-03-05 12:35:32 +01:00
kervala
ae88268333 Changed: Create a typedef for lists of profiles and servers
--HG--
branch : feature-ryzom-installer
2016-03-05 12:34:02 +01:00
kervala
d4f6be1578 Changed: Use "arguments" instead of "parameters"
--HG--
branch : feature-ryzom-installer
2016-03-05 12:33:19 +01:00
kervala
46f6df3310 Merge with develop
--HG--
branch : compatibility-develop
2016-03-05 11:51:08 +01:00
kervala
76d83a5890 Improved Luabind CMake module, fixes #263
--HG--
branch : develop
2016-03-05 11:50:38 +01:00
kervala
865bece41c Changed: Random names generator updated by Osquallo
--HG--
branch : develop
2016-03-05 11:29:06 +01:00
kervala
efe7de773f Merge with develop
--HG--
branch : compatibility-develop
2016-03-03 20:50:56 +01:00
kervala
5d3796d225 Lua 5.3 support for Fedora 22+, fixes #262
--HG--
branch : develop
2016-03-03 20:50:20 +01:00
Nimetu
261d9c789b Merge with develop
--HG--
branch : compatibility-develop
2016-03-03 00:00:30 +02:00
Nimetu
1d0d1a505c Added: Possibility to set text as grayed in combo box
--HG--
branch : develop
2016-03-02 23:58:48 +02:00
Nimetu
b7a3575746 Changed: Update translations
--HG--
branch : compatibility-develop
2016-03-01 22:39:14 +02:00