Commit graph

6154 commits

Author SHA1 Message Date
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
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
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
Nimetu
5c7eeb6d32 Merge with develop
--HG--
branch : compatibility-develop
2016-03-01 22:39:10 +02:00
Nimetu
bc8fd9fe2b Added: Horizontal mode to second action bar
--HG--
branch : develop
2016-03-01 22:30:05 +02:00
kervala
31bdbb1fdc Merge with develop
--HG--
branch : compatibility-develop
2016-03-01 14:02:18 +01:00
kervala
81408bbc5a Fixed: Missing translation for bytes in patcher
--HG--
branch : develop
2016-03-01 14:01:47 +01:00
kervala
d382cc2cc3 Merge with develop
--HG--
branch : compatibility-develop
2016-03-01 13:46:49 +01:00
kervala
c182708cd0 Changed: Escape Linux upgrade script as well
--HG--
branch : develop
2016-03-01 13:46:04 +01:00
kervala
4519893d78 Fixed: Loading PEM file
--HG--
branch : develop
2016-03-01 13:45:45 +01:00
kervala
f23c05c848 Merge with develop
--HG--
branch : compatibility-develop
2016-02-29 09:33:00 +01:00
kervala
22b582fe46 Fixed: Escape paths with quotes under OS X
--HG--
branch : develop
2016-02-29 09:32:27 +01:00
kervala
0ee75e810a Changed: Updated translations
--HG--
branch : compatibility-develop
2016-02-28 18:58:10 +01:00
kervala
29b03a445a Changed: Try to load Steam DLL using absolute path
--HG--
branch : compatibility-develop
2016-02-28 18:56:19 +01:00
kervala
26722fb579 Merge with develop
--HG--
branch : compatibility-develop
2016-02-28 16:46:11 +01:00
kervala
d39911345e Fixed: Only use "open" if extension is app
--HG--
branch : develop
2016-02-28 16:44:08 +01:00
kervala
3ddefec294 Changed: Delete updt_nl.bat/sh only when patch enabled and after determining ClientRootPath
--HG--
branch : develop
2016-02-28 16:41:53 +01:00
kervala
eac2cec783 Fixed: Wrong check for OS X
--HG--
branch : develop
2016-02-28 16:38:12 +01:00
kervala
3f2d1da933 Added: Scripts launched after patch
--HG--
branch : develop
2016-02-28 16:36:46 +01:00
kervala
12f3abbaaf Merge with develop
--HG--
branch : compatibility-develop
2016-02-28 12:46:34 +01:00
kervala
0040fa888e Fixed: Compilation under OS X
--HG--
branch : develop
2016-02-28 12:45:31 +01:00
kervala
62104e31b1 Merge with develop
--HG--
branch : compatibility-develop
2016-02-27 19:22:53 +01:00
kervala
a47d3845bd Fixed: Compilation
--HG--
branch : develop
2016-02-27 19:22:23 +01:00
kervala
f481a12799 Merge with develop
--HG--
branch : compatibility-develop
2016-02-27 18:39:41 +01:00
kervala
6104011d11 Changed: New functions launchProgramArray to pass an array of strings as arguments (easier to escape)
--HG--
branch : develop
2016-02-27 18:38:58 +01:00
kervala
b3b48a3ae3 Changed: New functions to convert arguments string from/to an array of strings
--HG--
branch : develop
2016-02-27 18:37:43 +01:00
kervala
76674c4fd4 Changed: Improve formatting of UNIX script
--HG--
branch : develop
2016-02-27 18:35:59 +01:00
kervala
58d9ba6c50 Fixed: Use / instead of \ under UNIX
--HG--
branch : develop
2016-02-27 18:34:50 +01:00
kervala
98bd20967d Fixed: Use export under UNIX to make variables available in upgd_nl.sh too
--HG--
branch : develop
2016-02-27 18:33:59 +01:00
kervala
b897d9fe74 Fixed: Wrong patch categories
--HG--
branch : develop
2016-02-27 18:32:45 +01:00
kervala
36ed03aa5a Fixed: Typos in french translations
--HG--
branch : compatibility-develop
2016-02-24 12:22:33 +01:00
kervala
f8e46962e2 Merge with develop
--HG--
branch : compatibility-develop
2016-02-23 19:42:49 +01:00
kervala
2b64e30aa2 Changed: Minor changes
--HG--
branch : develop
2016-02-23 19:42:15 +01:00
kervala
c0fe37ab8e Fixed: Memory leak
--HG--
branch : develop
2016-02-23 19:41:49 +01:00
kervala
5123c48885 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-02-23 17:27:01 +01:00
kervala
e23f32e902 Merge with develop
--HG--
branch : compatibility-develop
2016-02-23 17:05:57 +01:00
kervala
79be594f54 Changed: Trim URL before to display it
--HG--
branch : develop
2016-02-23 17:05:04 +01:00
kervala
dc042a3739 Fixed: Implement alternate login system with LoginCustomParameters
--HG--
branch : compatibility-develop
2016-02-23 17:03:40 +01:00
kervala
e7645739a6 Fixed: Don't append empty login, password or shard ID to batch
--HG--
branch : develop
2016-02-23 16:58:57 +01:00
kervala
89d1c51408 Fixed: Use full path for client_default.cfg
--HG--
branch : develop
2016-02-23 16:58:07 +01:00
kervala
ad4857cfaa Changed: Minor changes
--HG--
branch : develop
2016-02-23 16:57:34 +01:00
kervala
d01204e972 Changed: Updated german translations
--HG--
branch : compatibility-develop
2016-02-23 12:36:47 +01:00
Nimetu
a95c887534 Changed: Implement multi-row select box
--HG--
branch : develop
2016-02-23 10:52:21 +02:00
Nimetu
e2fca3a8f3 Added: http-equiv refresh
--HG--
branch : develop
2016-02-23 10:52:24 +02:00
Nimetu
a50689a885 Changed: Use multiline text for http errors
--HG--
branch : develop
2016-03-01 22:30:05 +02:00
kervala
c54cdb7543 Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 20:30:16 +01:00
kervala
dd15287d6c Changed: Use a wchar_t buffer for registry
--HG--
branch : develop
2016-02-21 20:29:14 +01:00
kervala
bca35ec6e1 Changed: Updated world_editor_classes.xml
--HG--
branch : compatibility-develop
2016-02-21 17:28:43 +01:00
kervala
4985d4d724 Changed: PatchServer not used anymore, use PatchUrl instead
--HG--
branch : compatibility-develop
2016-02-21 17:26:48 +01:00
kervala
14f46e884b Changed: Updated world_editor_classes.xml
--HG--
branch : develop
2016-02-21 17:10:28 +01:00
kervala
89f4131e8d Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 17:06:38 +01:00
kervala
3dfcdb758a Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!)
--HG--
branch : develop
2016-02-21 17:05:54 +01:00
kervala
91f995b259 Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 14:22:18 +01:00
kervala
baf9f6c7f9 Changed: Make OpenSSL required
--HG--
branch : develop
2016-02-21 14:21:49 +01:00
kervala
537f6ab83e Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 13:57:35 +01:00
kervala
18c5193fb9 Fixed: Compilation under Linux
--HG--
branch : develop
2016-02-21 13:55:58 +01:00
kervala
776542be27 Changed: Updated world_editor_classes.xml
--HG--
branch : compatibility-develop
2016-02-21 13:52:20 +01:00
kervala
3728c5d00e Changed: Guild missions
--HG--
branch : compatibility-develop
2016-02-21 13:51:09 +01:00
kervala
e2d437e846 Changed: Minor changes
--HG--
branch : compatibility-develop
2016-02-21 13:50:44 +01:00
kervala
35e3ef1d68 Changed: Minor changes (replaced l: by L:)
--HG--
branch : develop
2016-02-21 13:30:48 +01:00
kervala
5284bd37f1 Merge with develop
--HG--
branch : compatibility-develop
2016-02-21 13:22:22 +01:00
kervala
f698c31aa1 Changed: Allow to compile WITH_NEL_TESTS without compiling tools
--HG--
branch : develop
2016-02-21 13:20:49 +01:00
kervala
3e14025cf8 Changed: Include wang_hash.h in NLMISC files
--HG--
branch : develop
2016-02-21 13:19:41 +01:00
kervala
d18c7b24f5 Changed: Don't look for Qt5WinExtras in root CmakeLists.txt
--HG--
branch : develop
2016-02-21 13:19:23 +01:00
kervala
901759d039 Changed: Don't use DOS path under UNIX
--HG--
branch : develop
2016-02-21 13:17:10 +01:00
kervala
9a4156d9cf Changed: Launch upgrade script even if we don't want to launch client
--HG--
branch : develop
2016-02-21 13:16:50 +01:00
kervala
bfe817f92c Changed: Minor changes
--HG--
branch : develop
2016-02-21 13:16:04 +01:00
kervala
24dda2e7b9 Changed: Don't use SrcPath and DstPath anymore (ClientPatchPath and ClientRootPath are more explicit)
--HG--
branch : develop
2016-02-21 13:15:29 +01:00
kervala
4b023d1ace Changed: Renamed DSTPATH to ROOTPATH and SRCPATH to UNPACKPATH and fixed paths with spaces
--HG--
branch : develop
2016-02-21 13:13:28 +01:00
kervala
aa15b96187 Changed: Add a 7 seconds pause under UNIX
--HG--
branch : develop
2016-02-21 13:10:48 +01:00
kervala
460708a015 Changed: Use L:/ path instead of R:/ for leveldesign
--HG--
branch : develop
2016-02-21 13:10:16 +01:00
kervala
291d37a3e5 Changed: Added NamingPolicyURL in client_default.cfg
--HG--
branch : compatibility-develop
2016-02-21 12:33:15 +01:00
kervala
ece1809a70 Merge with develop
--HG--
branch : compatibility-develop
2016-02-20 20:44:23 +01:00
kervala
ce382f87dc Fixed: Compilation
--HG--
branch : develop
2016-02-20 20:42:43 +01:00
kervala
c6ac53598b Changed: Renamed uiCP_Surame and uiCP_Name to uiCP_FirstName and uiCP_LastName
--HG--
branch : develop
2016-02-20 20:42:29 +01:00
kervala
ae100981d7 Changed: Removed extraenous spaces at the end of lines
--HG--
branch : develop
2016-02-20 20:41:34 +01:00
kervala
0f8401a241 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-02-20 20:11:52 +01:00
kervala
c652fa8e37 Merge with develop
--HG--
branch : compatibility-develop
2016-02-20 19:57:43 +01:00
kervala
087ee9b76b Changed: Added IG Name Generator by Osquallo (thanks a lot for your amazing work!)
--HG--
branch : develop
2016-02-20 19:48:13 +01:00
kervala
3161ec2a77 Merge with develop
--HG--
branch : compatibility-develop
2016-02-20 19:29:00 +01:00
kervala
db92fc81f1 Changed: Minor changes
--HG--
branch : develop
2016-02-20 19:26:43 +01:00
kervala
3f0e6f3757 Fixed: Compilation under Linux (thanks Kishan for the patch!), fixes #260
--HG--
branch : develop
2016-02-20 19:26:34 +01:00
kervala
fad63280db Try to open certificate using cURL callback (allow to load it from BNP and support UTF-8 pathes), issue #261
--HG--
branch : develop
2016-02-20 19:25:31 +01:00
kervala
0575a51632 Last changes for Unicode support under Windows, fixes #261
--HG--
branch : develop
2016-02-20 19:21:39 +01:00
kervala
2b7ce14a57 Changed: Minor changes
--HG--
branch : develop
2016-02-20 19:20:49 +01:00
kervala
9322fa87b3 Music player can now handle unicode filenames and m3u8 playlists, issue #261
--HG--
branch : develop
2016-02-20 19:12:55 +01:00
kervala
a0f8660d0d Changed: Removed useless commented code
--HG--
branch : develop
2016-02-20 19:11:43 +01:00
kervala
e583a7a970 Huge refactoring of batch creation process, because .bat files don't support unicode at all, we can pass Unicode paths on command-line though, issue #261
--HG--
branch : develop
2016-02-20 19:11:05 +01:00
kervala
3c1a41d2b3 Changed: Use ClientCfg.getDefaultConfigLocation to get location of client root
--HG--
branch : develop
2016-02-20 19:07:34 +01:00
kervala
3487bf16ff Fixed: Display human readable version of file timestamps
--HG--
branch : develop
2016-02-20 19:06:15 +01:00
kervala
0c7aeaaac7 Changed: Display only filename in patch screen
--HG--
branch : develop
2016-02-20 19:05:39 +01:00
kervala
83090fc2f5 Changed: Use uiByte translation
--HG--
branch : develop
2016-02-20 19:04:34 +01:00
kervala
872bb2e697 Changed: Don't put spaces in front of percent value
--HG--
branch : develop
2016-02-20 19:04:18 +01:00
kervala
1bfc12bd6c Changed: Use upgrade script if present
--HG--
branch : develop
2016-02-20 19:03:31 +01:00
kervala
d3ad91923d Changed: Use --profile instead of --config for client profile expression
--HG--
branch : develop
2016-02-20 19:02:35 +01:00
kervala
591c7ed0bf Fixed: Display an error if unable to open a ogg file
--HG--
branch : develop
2016-02-20 19:01:31 +01:00
kervala
dba1ff8cf9 Changed: Added NamingPolicyURL variable in cfg
--HG--
branch : develop
2016-02-20 19:00:25 +01:00
kervala
6e54ba6420 Display patch errors/warnings in UTF-8, issue #261
--HG--
branch : develop
2016-02-20 18:59:03 +01:00
kervala
baecfcf944 Adapt CSTLoader to use nlfopen and some simplifications, issue #261
--HG--
branch : develop
2016-02-20 18:56:21 +01:00
kervala
33a30d186c Use Unicode of CreateProcess, issue #261
--HG--
branch : develop
2016-02-20 18:54:32 +01:00
kervala
e68d6e3617 Changed: Minor changes
--HG--
branch : develop
2016-02-20 18:53:39 +01:00
kervala
ba077aaab8 Use right versions of Win32 functions, issue #261
--HG--
branch : develop
2016-02-20 18:52:57 +01:00
kervala
4d48beeaa4 Use ANSI versions of Win32 functions when not using Unicode text, issue #261
--HG--
branch : develop
2016-02-20 18:38:17 +01:00
kervala
ac51d16583 Use Unicode versions of Win32 functions, issue #261
--HG--
branch : develop
2016-02-20 18:30:51 +01:00
kervala
f644805ff7 Replace ifstream and ofstream to manage UTF-8 filenames, issue #261
--HG--
branch : develop
2016-02-20 18:15:04 +01:00
kervala
69547db6ce New function to format a timestamp to human readable
--HG--
branch : develop
2016-02-20 18:10:17 +01:00
kervala
9370e93dd6 Removed useless comments/commented code
--HG--
branch : develop
2016-02-20 18:09:24 +01:00
kervala
6d21e22905 Use CIFile to load font instead of internal Freetype functions, issue #261
--HG--
branch : develop
2016-02-20 18:01:57 +01:00
kervala
aaecf96b67 Use new wrapper insteaf of fopen, issue #261
--HG--
branch : develop
2016-02-20 17:56:25 +01:00
kervala
e69090c457 Create fopen wrapper that internally uses wide characters under Windows, issue #261
--HG--
branch : develop
2016-02-20 17:46:11 +01:00
kaetemi
871093d4ce Merge
--HG--
branch : develop
2016-02-18 11:58:56 +01:00
kaetemi
e28b6deaf9 Fix gl context not being deleted with custom window
--HG--
branch : develop
2016-02-18 11:56:44 +01:00
kaetemi
30077f3977 Move some stuff for easier debug
--HG--
branch : develop
2016-02-18 11:55:58 +01:00
Gary Preston
c2084480c8 libxml include/lib related build errors for studio.
--HG--
branch : develop
2016-02-17 14:52:01 +00:00
Gary Preston
7281c40577 Update indentation of tiles_model::data to match coding standard use of tabs.
--HG--
branch : develop
2016-02-17 14:07:19 +00:00
Gary Preston
48e86eedee Fix qt4 build error.
--HG--
branch : develop
2016-02-17 14:03:57 +00:00
Gary Preston
b4a7ab66ab Add vector include and remove extra qualification on s_InitFlags.
--HG--
branch : develop
2016-02-16 19:01:14 +00:00
kervala
b555303a14 Fixed: Reverted removed translation
--HG--
branch : compatibility-develop
2016-02-16 15:26:41 +01:00
kervala
d1e0ec8e1b Changed: Minor changes in translations
--HG--
branch : compatibility-develop
2016-02-16 15:26:14 +01:00
kervala
6eebd478ee Changed: Updated hash
--HG--
branch : compatibility-develop
2016-02-16 15:22:06 +01:00
kervala
abfa371561 Fixed: Wrong indices
--HG--
branch : compatibility-develop
2016-02-16 15:10:07 +01:00
kervala
848c660aef Changed: Symbol for byte unit
--HG--
branch : compatibility-develop
2016-02-16 15:07:24 +01:00
kaetemi
1fbc179bc3 Centralized project directory configuration mechanism
--HG--
branch : feature-material-editor
2016-02-16 02:28:03 +01:00
kaetemi
874ac2c921 Move pipeline utilities into new pipeline library
--HG--
branch : feature-material-editor
2016-02-16 00:28:24 +01:00