Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity
7704 commits 14 branches 1 tag 255 MiB
Commit graph

3378 commits

Author SHA1 Message Date
Nimetu
869e8572cf Merge with develop 
--HG--
branch : compatibility-develop
 2016-07-25 19:27:04 +03:00
Nimetu
7aeedf7ad4 Fixed: Bad typo 
--HG--
branch : develop
 2016-07-25 19:26:49 +03:00
Nimetu
16eeb70f61 Merge with develop 
--HG--
branch : compatibility-develop
 2016-07-24 16:09:25 +03:00
Nimetu
357973aa10 Added: font style to <pre> element 
--HG--
branch : develop
 2016-07-24 16:07:36 +03:00
Nimetu
fe3601d664 Added: font-family style option 
--HG--
branch : develop
 2016-07-24 16:07:31 +03:00
Nimetu
9fb14c42d8 Added: Monospace font options 
--HG--
branch : develop
 2016-07-24 16:07:18 +03:00
Nimetu
58bf225891 Changed: Support custom font 
--HG--
branch : develop
 2016-07-24 16:05:04 +03:00
Nimetu
afc08d2efd Added: Possible to use multiple fonts at the same time 
--HG--
branch : develop
 2016-07-24 16:03:37 +03:00
Nimetu
705d3a6168 Merge with develop 
--HG--
branch : compatibility-develop
 2016-07-23 11:28:22 +03:00
Nimetu
ef703ed6de Fixed: Double tooltip on web image links 
--HG--
branch : develop
 2016-07-20 14:31:44 +03:00
kervala
90362c3609 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-26 19:43:53 +02:00
kervala
8d3ca27424 Changed: Don't need to hardcode a text offset because the old font was not aligned 
--HG--
branch : develop
 2016-06-26 19:40:10 +02:00
kervala
58f0ee5e9e Fixed: The height of a CViewText was wrong in some cases because "|" is not the tallest character of the current font (ryzom.ttf) 
--HG--
branch : develop
 2016-06-26 15:17:32 +02:00
Nimetu
8f9ab3c024 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-25 22:30:51 +03:00
Nimetu
69f956583a Added: HTML css hsl(), hsla() color 
--HG--
branch : develop
 2016-06-25 22:28:48 +03:00
Nimetu
c05fcd9b34 Added: HTML css rgb() and rgba() color 
--HG--
branch : develop
 2016-06-25 19:32:43 +03:00
Nimetu
5db76bfe99 Added: HTML #RGBA color 
--HG--
branch : develop
 2016-06-25 18:17:53 +03:00
Nimetu
07a68281a5 Fixed: Inconsistent html color parsing 
--HG--
branch : develop
 2016-06-25 17:45:21 +03:00
kervala
1553937124 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-19 21:10:23 +02:00
kervala
83c97c6c36 Changed: Init CSystemUtils in INelContext 
--HG--
branch : develop
 2016-06-19 20:48:30 +02:00
kervala
3386ee874e Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-18 22:41:12 +02:00
kervala
a8fac8f8e9 Changed: Under Linux, it's recommended to put user application data in ~/.local/share 
--HG--
branch : develop
 2016-06-18 19:47:05 +02:00
kervala
c9ad23a812 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-16 17:16:27 +02:00
kervala
306aae7af9 Changed: Only display virtual screen size if DISPLAY_DEVICE_ATTACHED_TO_DESKTOP flag is defined 
--HG--
branch : develop
 2016-06-16 17:15:45 +02:00
kervala
d80371d459 Changed: Only display this message in debug 
--HG--
branch : develop
 2016-06-16 17:14:48 +02:00
kervala
1aea0f981c Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-14 20:18:10 +02:00
kervala
995120317d Fixed: Usage of wglEnumGpuDevicesNV 
--HG--
branch : develop
 2016-06-14 19:34:43 +02:00
kervala
2ab16f61ef Changed: Updated OpenGL headers 
--HG--
branch : develop
 2016-06-14 19:33:41 +02:00
kervala
fa01980634 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-12 15:44:48 +02:00
kervala
bd766614bc Changed: Replaced spaces by tabs 
--HG--
branch : develop
 2016-06-12 14:17:36 +02:00
Nimetu
f90fa23206 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-12 12:49:14 +03:00
Nimetu
b5a4ba313d Fixed: Keep \n inside <textarea> 
--HG--
branch : develop
 2016-06-12 12:46:44 +03:00
Nimetu
69728b9a2e Changed: CSS inherit value for some properties 
--HG--
branch : develop
 2016-06-12 12:46:42 +03:00
Nimetu
f201abe6db Changed: Set <textarea>, <input> font style 
--HG--
branch : develop
 2016-06-12 10:30:16 +03:00
Nimetu
caf8c5195c Added: Rows attribute to <textarea> element 
--HG--
branch : develop
 2016-06-12 10:22:22 +03:00
Nimetu
e8c7cdbb32 Added: Minimum lines option to multiline text 
--HG--
branch : develop
 2016-06-12 10:22:22 +03:00
kervala
7ebc0ae072 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-07 20:01:47 +02:00
kervala
4a2fe97f95 Fixed: Support for all Windows 10 products types 
--HG--
branch : develop
 2016-06-07 20:01:18 +02:00
kervala
88f5c244d3 Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-04 17:05:41 +02:00
kervala
2e02f20c83 Fixed: Error 18 when moving a file between different file systems 
--HG--
branch : develop
 2016-06-04 17:00:40 +02:00
Nimetu
52f81ca56d Merge with develop 
--HG--
branch : compatibility-develop
 2016-06-04 10:36:21 +03:00
kervala
b9ade7142a Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-30 17:51:54 +02:00
kervala
4b46b9f18f Fixed: Read NeL crash reports as UTF-8 files 
--HG--
branch : develop
 2016-05-30 17:51:19 +02:00
kervala
ec7cc189df Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-27 22:24:20 +02:00
kervala
cb8bb5f6f4 Changed: No need to change VSync if same value 
--HG--
branch : develop
 2016-05-27 22:16:44 +02:00
kervala
b29441f22e Changed: Display a warning if setSwapVBLInterval is called before OpenGL initialization 
--HG--
branch : develop
 2016-05-27 22:16:29 +02:00
kervala
ae7fa4da2e Changed: Instead of forcing VSYNC, get initial value 
--HG--
branch : develop
 2016-05-27 22:15:58 +02:00
kervala
eea1bbb0e2 Fixed: VSync inverted under Windows and in OpenGL ES 
--HG--
branch : develop
 2016-05-27 22:15:14 +02:00
kervala
86084649a2 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-26 19:36:25 +02:00
kervala
ee2938e3cb Changed: Use uint instead of unsigned 
--HG--
branch : develop
 2016-05-25 23:19:46 +02:00
kervala
4b1959a560 Changed: Replace size() comparisons by empty() 
--HG--
branch : develop
 2016-05-25 23:18:11 +02:00
Nimetu
9ba0ac65ea Fixed: Send user-agent string and cookies with image request. 
--HG--
branch : develop
 2016-05-25 12:08:12 +03:00
Nimetu
85051340e1 Changed: Move addLink code to beginElement 
--HG--
branch : develop
 2016-05-25 12:08:08 +03:00
Nimetu
250a94e186 Changed: minor changes 
--HG--
branch : develop
 2016-05-25 12:08:06 +03:00
Nimetu
60a739955b Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-14 13:47:03 +03:00
Nimetu
f15926dd7e Changed: Remove legacy HTTPCurrentDomain variable 
--HG--
branch : develop
 2016-05-14 12:53:09 +03:00
Nimetu
ae46d76d88 Fixed: Parsing url authority when path is empty 
--HG--
branch : develop
 2016-05-14 12:53:09 +03:00
Nimetu
8aa2a3ced6 Changed: Rename CUrlParser domain variable 
--HG--
branch : develop
 2016-05-14 12:53:09 +03:00
kervala
bd69c167d3 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-13 20:55:24 +02:00
kervala
9fd00d8505 Fixed: Missing to include PCH 
--HG--
branch : develop
 2016-05-13 20:55:00 +02:00
Nimetu
f02b388d06 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-13 13:58:33 +03:00
Nimetu
131f3814a3 Fixed: Resolve http-equiv refresh url 
--HG--
branch : develop
 2016-05-13 13:57:28 +03:00
Nimetu
5a2dc969cb Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-09 20:14:15 +03:00
Nimetu
cdfecc8d69 Fixed: url inheriting for defined empty query component 
--HG--
branch : develop
 2016-05-09 20:05:06 +03:00
kervala
9e33df4532 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-08 19:24:04 +02:00
kervala
583db43e71 Changed: Disable too verbose message for sound sheets 
--HG--
branch : develop
 2016-05-08 19:23:27 +02:00
kervala
a9685ac366 Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-08 13:42:53 +02:00
kervala
1e0283d38c Fixed: Use %p to display pointer 
--HG--
branch : develop
 2016-05-08 13:22:32 +02:00
Nimetu
f7f275671f Merge with develop 
--HG--
branch : compatibility-develop
 2016-05-05 15:01:10 +03:00
Nimetu
6f8a9b8108 Changed: Increase default request timeout for web browsers 
--HG--
branch : develop
 2016-05-05 15:00:28 +03:00
Nimetu
edd16d9a82 Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-23 18:49:52 +03:00
Nimetu
a1e8408be0 Fixed: Tooltip position related to parent window 
--HG--
branch : develop
 2016-04-23 18:49:36 +03:00
kervala
51e4d2a53c Merge with develop 
--HG--
branch : compatibility-develop
 2016-04-15 16:12:32 +02:00
kervala
ccb69f8b27 Changed: Signed/unsigned comparison 
--HG--
branch : develop
 2016-04-15 16:11:37 +02:00
kervala
d1d6f6da41 Fixed: Creation of sn_0_* folders under OS X 10.7 
--HG--
branch : develop
 2016-04-15 16:11:14 +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
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
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
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
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
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
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
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
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
kervala
f50c9c0866 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-19 20:42:11 +01:00
kervala
fa22852adb Changed: Removed fromString(const char *, ...) because useless 
--HG--
branch : develop
 2016-01-19 20:41:41 +01:00
kervala
5cc2b2865f Changed: Local includes against system includes 
--HG--
branch : develop
 2016-01-19 20:38:05 +01:00
kervala
00395d6b2e Fixed: Compilation without PCH 
--HG--
branch : develop
 2016-01-19 20:37:03 +01:00
kervala
5fb0c5d279 Removed: Binary file generated by VC++ 
--HG--
branch : develop
 2016-01-19 20:35:59 +01:00
kervala
1864ad70db Fixed: Some unit tests with fromString 
--HG--
branch : develop
 2016-01-19 13:12:53 +01:00
kervala
d96e1da521 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-18 21:48:31 +01:00
kervala
e01f706ccc Fixed: Updated with new changes 
--HG--
branch : develop
 2016-01-18 21:48:00 +01:00
kervala
d54e569b3f Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-18 21:32:01 +01:00
kervala
b91e3bdf0e Changed: Improved CCmdArgs 
--HG--
branch : develop
 2016-01-18 21:22:57 +01:00
kervala
c379c61ab7 Changed: Don't need to create it on heap 
--HG--
branch : develop
 2016-01-18 13:27:48 +01:00
kervala
fc645a5668 Fixed: Import static platform plugin 
--HG--
branch : develop
 2016-01-18 13:27:23 +01:00
kaetemi
fd950a692b Faster Qt startup 
--HG--
branch : develop
 2016-01-18 11:27:14 +01:00
Tobias Peters
48c7404c74 Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests 
--HG--
branch : issue/fix-failing-unit-tests
 2016-01-17 20:05:02 +01:00
kervala
6ea1421fd3 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-17 13:24:01 +01:00
kervala
58d23bbe97 Fixed: Compilation with static Qt 5 
--HG--
branch : develop
 2016-01-17 13:23:25 +01:00
kervala
cc282fd3d5 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-16 23:50:23 +01:00
kervala
c5fbf56984 Fixed: Missing ++ 
--HG--
branch : develop
 2016-01-16 23:48:44 +01:00
kervala
bb9ac688f6 Changed: Set CMP0020 NEW in root project 
--HG--
branch : develop
 2016-01-16 23:48:32 +01:00
kervala
b3cfd5f6bb Fixed: Use lua_tointeger under Lua 5.2 and prior versions 
--HG--
branch : develop
 2016-01-16 21:35:34 +01:00
kervala
b149c94a26 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-16 15:58:19 +01:00
kervala
4886da5855 Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals 
--HG--
branch : develop
 2016-01-16 15:55:56 +01:00
kervala
cd021fc4ef Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 
--HG--
branch : develop
 2016-01-16 15:54:46 +01:00
kervala
c427bb216b Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 
--HG--
branch : develop
 2016-01-16 15:52:51 +01:00
kervala
8b5dcc345d Fixed: Link to X11 under Linux 
--HG--
branch : develop
 2016-01-16 15:50:45 +01:00
kervala
cca0dd450e Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-16 10:52:18 +01:00
kaetemi
9c687430c8 Update mask pixel format in panoply preview tool 
--HG--
branch : develop
 2016-01-15 17:22:27 +01:00
kaetemi
8673d27a13 Add panoply preview tool 
--HG--
branch : develop
 2016-01-15 17:11:10 +01:00
kaetemi
8cfaa89620 Separate window displayer message stringify 
--HG--
branch : develop
 2016-01-15 17:10:39 +01:00
kaetemi
e4b72e63a1 More of the VS2015 stuff 
--HG--
branch : develop
 2016-01-15 12:29:05 +01:00
kaetemi
f7d05ea8e4 VS2015 fixes for NeL Samples 
--HG--
branch : develop
 2016-01-15 12:22:35 +01:00
kaetemi
9a0c6290a2 Fix another VS2015 warning 
--HG--
branch : develop
 2016-01-15 12:07:33 +01:00
kaetemi
da02779588 More VS2015 fixes 
--HG--
branch : develop
 2016-01-15 12:04:06 +01:00
kaetemi
3632ae4e64 Fix VS2015 warnings 
--HG--
branch : develop
 2016-01-15 11:52:09 +01:00
kaetemi
9a477d976b VS2015 compilation fixes 
--HG--
branch : develop
 2016-01-15 11:34:23 +01:00
kervala
72c70dee6a Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-14 23:58:34 +01:00
kervala
9a34434cf8 Fixed: Compilation 
--HG--
branch : develop
 2016-01-14 23:58:04 +01:00
kervala
f54b41f5cc Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-14 23:54:26 +01:00
kervala
875224d277 Changed: Minor changes 
--HG--
branch : develop
 2016-01-14 23:53:17 +01:00
kervala
c1d8d4e400 Changed: Invert version and help checks 
--HG--
branch : develop
 2016-01-14 23:47:24 +01:00
kervala
c844a0bdd1 Fixed: Compilation 
--HG--
branch : develop
 2016-01-14 23:46:19 +01:00
kervala
f820e7b703 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-14 21:28:47 +01:00
kervala
b7fe07d781 Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257 
--HG--
branch : develop
 2016-01-14 21:26:10 +01:00
kervala
3c4f324bfe Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-13 20:05:06 +01:00
kervala
57f216dc3e Changed: Expand environment variables in paths read from cfg files 
--HG--
branch : develop
 2016-01-13 19:59:09 +01:00
kervala
bd5f838d6d Changed: Minor changes 
--HG--
branch : develop
 2016-01-13 19:54:23 +01:00
kervala
d0c587e445 Changed: Remove duplicate lines 
--HG--
branch : develop
 2016-01-13 19:53:20 +01:00
kervala
6a3292c600 Fixed: Convert .bank filenames with / and use existing CFile::fileExists 
--HG--
branch : develop
 2016-01-13 19:51:00 +01:00
kervala
e1c14db5a0 Fixed: getLastSeparator should return std::string::size_type instead of an integer 
--HG--
branch : develop
 2016-01-13 19:47:35 +01:00
kervala
a66fa8cc9c Changed: Implement CPath::isAbsolutePath 
--HG--
branch : develop
 2016-01-13 19:46:27 +01:00
kervala
af9610328f Changed: Implement expandEnvironmentVariables function 
--HG--
branch : develop
 2016-01-13 19:45:02 +01:00
kervala
ad36e59a71 Fixed: Save filenames in .bank with / instead of system separator 
--HG--
branch : develop
 2016-01-13 19:43:46 +01:00
kervala
df816b2a5d Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-12 22:32:22 +01:00
kervala
49ef5a1ed7 Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0 
--HG--
branch : develop
 2016-01-12 22:21:38 +01:00
kervala
6471fada97 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-11 11:44:44 +01:00
kervala
59c06630cd Changed: Table keys are integers 
--HG--
branch : develop
 2016-01-11 11:43:59 +01:00
kervala
839928a57a Fixed: In Lua, all integers are numbers and numbers can be converted to integers 
--HG--
branch : develop
 2016-01-11 11:34:32 +01:00
Nimetu
e44e131365 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-10 16:34:13 +02:00
Nimetu
ad8059c345 Fixed: Invalid image width/height on error 
--HG--
branch : develop
 2016-01-10 16:33:42 +02:00
kervala
63983cd5ac Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-10 12:13:59 +01:00
kervala
bb3726fd46 Fixed: Compilation of object_viewer_widget in static under Linux 
--HG--
branch : develop
 2016-01-10 12:12:50 +01:00
kervala
ef8c8d0401 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-09 16:32:59 +01:00
kervala
3af2813fbf Fixed: Compilation 
--HG--
branch : develop
 2016-01-09 16:29:59 +01:00
kervala
9dc7f5102b Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-09 16:08:34 +01:00
kervala
14f48d821a Changed: Minor changes 
--HG--
branch : develop
 2016-01-09 15:57:20 +01:00
kervala
9ee32071d8 Fixed: Compilation under Linux 
--HG--
branch : develop
 2016-01-09 15:56:50 +01:00
kervala
3f4a5010f6 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-07 17:41:02 +01:00
kervala
9e8cd07e4b Changed: HAVE_X86_64 is defined or not 
--HG--
branch : develop
 2016-01-07 17:39:53 +01:00
kervala
b3a392d559 Changed: Minor changes 
--HG--
branch : develop
 2016-01-07 17:36:17 +01:00
Nimetu
511a004827 Fixed: Wrong DD indent in nested list when tag is not closed 
--HG--
branch : develop
 2016-01-07 01:00:48 +02:00
kervala
ef29c2b5ef Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-06 23:22:57 +01:00
kervala
59aff6a4bc Changed: Added more fromString tests 
--HG--
branch : develop
 2016-01-06 23:21:22 +01:00
kervala
245726f347 Changed: Don't need to use system API, NeL already has equivalent 
--HG--
branch : develop
 2016-01-06 23:20:40 +01:00
kervala
ad3df5084a Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-06 16:06:23 +01:00
kervala
ea5b041844 Fixed: Compilation with Qt 4 
--HG--
branch : develop
 2016-01-06 16:01:53 +01:00
kervala
ddba3e583c Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-06 13:22:47 +01:00
kervala
ecb47bc2dc Changed: Remove unused variable 
--HG--
branch : develop
 2016-01-06 13:21:47 +01:00
kervala
0ef79083a0 Changed: Code simplification 
--HG--
branch : develop
 2016-01-06 13:19:48 +01:00
kervala
80ae07c8b3 Changed: Minor changes 
--HG--
branch : develop
 2016-01-06 13:17:07 +01:00
kervala
f323974dba Changed: Don't fix files within panoply_maker, use textures_optimizer (but checks can be enabled) 
--HG--
branch : develop
 2016-01-06 12:43:57 +01:00
kervala
6efce5ba59 Changed: Support for new key events 
--HG--
branch : develop
 2016-01-06 12:42:10 +01:00
kervala
76744b18c7 Changed: Minor change 
--HG--
branch : develop
 2016-01-06 12:39:58 +01:00
kervala
03c9c93fc1 Changed: Comments to support DXTC1a for textures with one level of transparency later 
--HG--
branch : develop
 2016-01-06 12:35:21 +01:00
kervala
75eb7cb922 Changed: Compile tile_edit_qt and object_viewer_widget if WITH_QT5 is defined 
--HG--
branch : develop
 2016-01-06 12:33:58 +01:00
kervala
ec7699aca9 Fixed: Compilation of object_viewer_qt with Qt 5 
--HG--
branch : develop
 2016-01-06 12:33:05 +01:00
kervala
af14cbe3aa Fixed: Allow to select PNG and TGA for bitmaps 
--HG--
branch : develop
 2016-01-06 12:31:53 +01:00
kervala
2923fe7c89 Fixed: Remove dependency on Pic (NeL manages TGA and PNG itself, reused code by Kaetemi) 
--HG--
branch : develop
 2016-01-06 12:31:13 +01:00
kervala
fad179731a Fixed: Compilation of tile_edit_qt with Qt 5 
--HG--
branch : develop
 2016-01-06 12:29:34 +01:00
Nimetu
410ddea49d Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-06 01:02:22 +02:00
Nimetu
8475f25e75 Changed: Refactor DL 
--HG--
branch : develop
 2016-01-06 00:11:17 +02:00
Nimetu
639ce91e61 Fixed: Align UL, LI list style type marker outside content 
--HG--
branch : develop
 2016-01-06 00:08:41 +02:00
Nimetu
6bcb153930 Fixed: DL list top margin 
--HG--
branch : develop
 2016-01-05 23:23:19 +02:00
Nimetu
f95d445839 Fixed: DL list DD element indent 
--HG--
branch : develop
 2016-01-05 23:02:21 +02:00
Nimetu
bbe9ca2b67 Changed: UL list style type depending on nested depth 
--HG--
branch : develop
 2016-01-05 20:23:11 +02:00
Nimetu
298a659c6f Changed: Merge UL and OL code 
--HG--
branch : develop
 2016-01-05 20:21:40 +02:00
kervala
4785b88068 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-05 17:12:29 +01:00
kervala
95404bd724 Fixed: Don't load grayscale textures as alpha 
--HG--
branch : develop
 2016-01-05 17:11:37 +01:00
kervala
ad6e10df76 Merge with develop 
--HG--
branch : compatibility-develop
 2016-01-05 13:00:18 +01:00
kervala
f2b43c2d7e Changed: Added default checks for textures and masks (-t and -m) 
--HG--
branch : develop
 2016-01-05 12:57:26 +01:00
kervala
dc5ddadcbb Fixed: Alpha channel with 0 is correct, don't change it 
--HG--
branch : develop
 2016-01-05 12:54:47 +01:00
kervala
9f761780f1 Changed: %u to format a uint 
--HG--
branch : develop
 2016-01-05 12:53:57 +01:00
kervala
687301377e Fixed: Instead of returning an error, convert the bitmap in RGBA 
--HG--
branch : develop
 2016-01-05 12:53:32 +01:00