Commit graph

3080 commits

Author SHA1 Message Date
kervala
1eddef3c93 Merge with develop
--HG--
branch : compatibility-develop
2016-03-18 22:27:43 +01:00
kervala
f376317f10 Fixed: Compilation
--HG--
branch : develop
2016-03-18 22:26:43 +01:00
kervala
410b9bcf55 Merge with develop
--HG--
branch : compatibility-develop
2016-03-18 22:16:28 +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
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
114543ba07 Merge with develop
--HG--
branch : compatibility-develop
2016-03-16 19:15:11 +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
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
kaetemi
b9d366372e Merge with develop
--HG--
branch : compatibility-develop
2016-03-10 12:09:18 +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
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
0db2ed85ca Changed: Temporarily disable Spanish and Russian translations (not yet ready)
--HG--
branch : compatibility-develop
2016-03-05 12:45:49 +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
5c7eeb6d32 Merge with develop
--HG--
branch : compatibility-develop
2016-03-01 22:39:10 +02: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
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
e23f32e902 Merge with develop
--HG--
branch : compatibility-develop
2016-02-23 17:05:57 +01:00
kervala
ad4857cfaa Changed: Minor changes
--HG--
branch : develop
2016-02-23 16:57:34 +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
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
3161ec2a77 Merge with develop
--HG--
branch : compatibility-develop
2016-02-20 19:29:00 +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
591c7ed0bf Fixed: Display an error if unable to open a ogg file
--HG--
branch : develop
2016-02-20 19:01:31 +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
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
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
kervala
9a7dee4445 Merge with develop
--HG--
branch : compatibility-develop
2016-02-15 12:11:08 +01:00
kervala
2330fc26ec Fixed: Warning (wrong size)
--HG--
branch : develop
2016-02-15 11:54:28 +01:00
kervala
cb46be8051 Merge with develop
--HG--
branch : compatibility-develop
2016-02-14 19:59:16 +01:00
kervala
fdd5f69e2d Fixed: Windows XP doesn't support inet_pton and inet_ntop
--HG--
branch : develop
2016-02-14 19:58:42 +01:00
kervala
37424fdef4 Merge with develop
--HG--
branch : compatibility-develop
2016-02-14 19:16:53 +01:00
kervala
767d91ce6d Fixed: Set _WIN32_WINNT used by WinSock for IPv6
--HG--
branch : develop
2016-02-14 19:16:22 +01:00
kervala
8327d22117 Merge with develop
--HG--
branch : compatibility-develop
2016-02-14 18:21:41 +01:00
kervala
edf4331d1a Fixed: Implements IPv6 in CInetAddress
--HG--
branch : develop
2016-02-14 18:21:09 +01:00
Nimetu
b7f809c6a7 Merge with develop
--HG--
branch : compatibility-develop
2016-02-14 01:24:10 +02:00
Nimetu
6d9c9600a2 Fixed: reloading cached image with style reload:1 hint
--HG--
branch : develop
2016-02-14 01:22:44 +02:00
kervala
b873aae389 Merge with develop
--HG--
branch : compatibility-develop
2016-02-13 23:43:04 +01:00
kervala
e2271f8db3 Fixed: All files and directories names are using 8-bits locale at the moment, so don't mix with UTF-8 under Windows (we could improve that later but it'll need a lot of changes, especially for all fopen calls)
--HG--
branch : develop
2016-02-13 23:33:27 +01:00
kervala
e70a169955 Changed: Display a warning when a environment variable doesn't exist
--HG--
branch : develop
2016-02-13 23:30:18 +01:00
kervala
fc69d4cec9 Changed: Use same code as under Linux for OS X when executing sheel scripts
--HG--
branch : develop
2016-02-13 23:30:00 +01:00
kervala
a4d98fb13b Changed: Remember startup path (the initial current directory)
--HG--
branch : develop
2016-02-13 23:29:00 +01:00
kervala
e7e8832130 Merge with develop
--HG--
branch : compatibility-develop
2016-02-13 14:00:02 +01:00
kervala
9913ec7e72 Fixed: Don't try to convert next meshes if an error occurs
--HG--
branch : develop
2016-02-13 13:58:21 +01:00
kervala
c9740a9e61 Fixed: Return true when "open" succeeds under OS X
--HG--
branch : develop
2016-02-13 13:57:43 +01:00
kervala
4c31865b0e Merge with develop
--HG--
branch : compatibility-develop
2016-02-12 16:05:43 +01:00
kervala
7ed708eae8 Fixed: Display an error if unable to find database.cfg
--HG--
branch : develop
2016-02-12 16:04:55 +01:00
kervala
34282be5af Changed: Reuse NLMISC::formatErrorMessage instead of native FormatMessage
--HG--
branch : develop
2016-02-12 16:04:18 +01:00
kervala
8008b68877 Merge with develop
--HG--
branch : compatibility-develop
2016-02-11 21:01:27 +01:00
kervala
53a16257f1 Fixed: CPath::makePathAbsolute removing first /
--HG--
branch : develop
2016-02-11 21:00:54 +01:00
kervala
19dbdf4fad Merge with develop
--HG--
branch : compatibility-develop
2016-02-10 18:48:09 +01:00
kervala
df70c9a9f9 Changed: Minor changes
--HG--
branch : develop
2016-02-10 18:47:35 +01:00
kervala
ed78c7153c Merge with develop
--HG--
branch : compatibility-develop
2016-02-05 12:30:26 +01:00
kervala
fd1344a12e Fixed: NeL unit test with GCC
--HG--
branch : develop
2016-02-05 12:29:42 +01:00
kervala
ddff1b4e5e Merge with develop
--HG--
branch : compatibility-develop
2016-02-04 14:33:30 +01:00
kaetemi
9602fcc8f0 Also support AppData/Local to allow a non-roaming config
--HG--
branch : develop
2016-02-04 13:02:32 +01:00
kaetemi
8ea6f521d3 Fix for VS2008 build
--HG--
branch : develop
2016-02-04 12:07:36 +01:00
kervala
fa4fb1992d Merge with develop
--HG--
branch : compatibility-develop
2016-02-03 21:58:58 +01:00
kervala
6a7c33fa32 Changed: Updated launchProgramAndWaitForResult to support .bat files
--HG--
branch : develop
2016-02-03 21:58:29 +01:00
kervala
487aca0979 Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 19:51:11 +01:00
kervala
923434aa72 Changed: Detect .bat file in launchProgram and adapt syntax of CreateProcess
--HG--
branch : develop
2016-02-02 19:49:37 +01:00
kervala
0e0dbf688d Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 19:31:12 +01:00
kervala
9b52f6bc28 Changed: Use "open" to open other programs too under OS X
--HG--
branch : develop
2016-02-02 19:20:34 +01:00
kervala
d8ddb1fd11 Fixed: Async execution of .bat under Windows
--HG--
branch : develop
2016-02-02 19:20:02 +01:00
kervala
6459d901ef Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 12:37:59 +01:00
kervala
e5a601c109 Changed: Unit tests for bytesToHumanReadableUnits
--HG--
branch : develop
2016-02-02 12:37:20 +01:00
kervala
092a3226bd Changed: New function bytesToHumanReadableUnits to use specific strings for units
--HG--
branch : develop
2016-02-02 12:37:06 +01:00
kervala
b692b78718 Fixed: Tests for fromStringwith a boolean
--HG--
branch : develop
2016-02-02 11:38:08 +01:00
kervala
285965fe76 Added: New unit tests for common.h
--HG--
branch : develop
2016-02-02 11:37:46 +01:00
kervala
20c7c342ca Fixed: Don't display logs in console for unit tests
--HG--
branch : develop
2016-02-02 11:34:16 +01:00
kervala
7b1ab1592e Fixed: Support new ISO units (KiB, MiB, etc...) in humanReadableToBytes
--HG--
branch : develop
2016-02-02 11:33:44 +01:00
kervala
0919fc66e4 Changed: Support more values for fromString with a boolean
--HG--
branch : develop
2016-02-02 11:32:20 +01:00
kervala
ed68c612ac Merge with develop
--HG--
branch : compatibility-develop
2016-02-01 09:07:45 +01:00
Gary Preston
963ee5a66e Allow bnp_make to process "if" and "ifnot" argumenets multiple times instead of
accepting only one instance or each.

--HG--
branch : develop
2016-01-31 18:02:47 +00:00
Cédric OCHS
c2e444774e Merged in BWGaryP/ryzomcore/fix/bnp_make_call (pull request #134)
Update BnpMake arguements to output bnp files to target folder/name using -o switch.

--HG--
branch : develop
2016-01-31 14:57:54 +01:00
Gary Preston
45755dd86f Update BnpMake arguements to output bnp files to target folder/name
using -o switch.

Exclude first element from package[1] which was used to build the targetBnp file
rather than a file to be included within the bnp.

--HG--
branch : fix/bnp_make_call
2016-01-31 13:35:27 +00:00
kervala
f0d6d70b8c merge with develop
--HG--
branch : compatibility-develop
2016-01-28 13:27:35 +01:00
kervala
6e93a0d395 Fixed: Wrong return value for CCmdArgs::haveAdditionalArg
--HG--
branch : develop
2016-01-28 13:25:21 +01:00
kervala
ccfd1c9721 Merge with develop
--HG--
branch : compatibility-develop
2016-01-27 13:30:49 +01:00
kervala
63a36fc2f8 Changed: Removed libxml2 dependencies from other targets
--HG--
branch : develop
2016-01-27 12:56:16 +01:00
kervala
eae2e3fea1 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 23:43:34 +01:00
kervala
4c96c5a608 Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
2016-01-26 23:42:55 +01:00
kervala
fbed1d5854 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 23:30:48 +01:00
kervala
093ee91656 Fixed: libxml2 dependencies
--HG--
branch : develop
2016-01-26 23:26:38 +01:00
kervala
325242c2e4 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 22:44:40 +01:00
kervala
89319eb99c Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...)
--HG--
branch : develop
2016-01-26 22:41:58 +01:00
kervala
df22787f90 Changed: Added PCH for logic
--HG--
branch : develop
2016-01-26 22:41:02 +01:00
kervala
af2f38612a Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
2016-01-26 22:30:13 +01:00
kervala
700b75f44a Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 19:07:13 +01:00
kervala
7237736922 Changed: Make absolute program path (useful if launched from current directory under Linux)
Changed: Set process name for logs

--HG--
branch : develop
2016-01-23 18:50:17 +01:00
kervala
222544f902 Fixed: Display an error if adding more than once the same filename in BNP
--HG--
branch : develop
2016-01-23 18:49:10 +01:00
kervala
0505395fd1 Fixed: toLower shouldn't transform a eszett to s
--HG--
branch : develop
2016-01-23 18:48:25 +01:00
kervala
e6b2e0088b Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 13:03:27 +01:00
kervala
5892fb8c1c Fixed: -o option of tga2dds for directory output
--HG--
branch : develop
2016-01-23 13:02:29 +01:00
kervala
5adebf258d Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 12:30:33 +01:00
kervala
1ca826cda9 Changed: Use CBigFile to manage BNP and CCmdArgs for command-line in bnp_make
--HG--
branch : develop
2016-01-23 12:30:01 +01:00
kervala
f8d45d01dc Changed: Replace tabs by spaces
--HG--
branch : develop
2016-01-23 12:28:40 +01:00
kervala
9aff198d70 Fixed: Return true if a required argument is found
--HG--
branch : develop
2016-01-23 12:28:22 +01:00
kervala
a8a1e04299 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:59:56 +01:00
kervala
7f69309e39 Fixed: Link to Qt ICO plugin
--HG--
branch : develop
2016-01-23 10:59:30 +01:00
kervala
5f70be0308 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:28:00 +01:00
kervala
12d87b4914 Changed: Use CCmdArgs for tga2dds
--HG--
branch : develop
2016-01-23 10:27:34 +01:00
kervala
9aea637643 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:19:01 +01:00
kervala
e2cc9e622e Changed: Minor changes
--HG--
branch : develop
2016-01-23 10:18:23 +01:00
kervala
19aa093ea8 Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs
--HG--
branch : develop
2016-01-23 10:18:09 +01:00
kervala
93e1289a77 Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..)
--HG--
branch : develop
2016-01-23 09:44:41 +01:00
kervala
5a6580dc38 Merge with develop
--HG--
branch : compatibility-develop
2016-01-21 10:08:56 +01:00
kervala
aff9cccd0c Changed: Improve toString(const bool &val)...
--HG--
branch : develop
2016-01-21 10:06:35 +01:00
kervala
a08cdce803 Fixed: Use icon under Windows
--HG--
branch : develop
2016-01-21 10:05:26 +01:00
Nimetu
6b13fdd770 Merge with develop
--HG--
branch : compatibility-develop
2016-01-20 19:15:45 +02:00
Nimetu
52dcf1a300 Changed: Use url from <base> element for relative urls
--HG--
branch : develop
2016-01-20 19:15:20 +02:00