Commit graph

6231 commits

Author SHA1 Message Date
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
478371a666 Changed: Minor changes
--HG--
branch : develop
2016-01-05 12:59:40 +01:00
kervala
aa3993681b Changed: Use std::numeric_limits
--HG--
branch : develop
2016-01-05 12:59:28 +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
kervala
798cb1c7ce Fixed: Alpha channel with 0 is correct, don't change it
--HG--
branch : develop
2016-01-05 12:52:45 +01:00
kervala
f482f77179 Fixed: GCC warnings
--HG--
branch : develop
2016-01-05 12:51:06 +01:00
kervala
5ee0b484da Merge with develop
--HG--
branch : compatibility-develop
2016-01-04 22:17:00 +01:00
kervala
ac57a464d4 Fixed: Converting AlphaLuminance to Luminance
--HG--
branch : develop
2016-01-04 22:16:21 +01:00
kervala
e91c529a98 Merge with develop
--HG--
branch : compatibility-develop
2016-01-04 19:27:21 +01:00
kervala
0dc70105d5 Fixed: __rdtsc() under old versions of GCC
--HG--
branch : develop
2016-01-04 19:26:25 +01:00
kervala
ae752f72d8 Changed: Define CLANG_VERSION is using clang compiler
--HG--
branch : develop
2016-01-04 19:18:19 +01:00
kervala
9b4127311b Merge with develop
--HG--
branch : compatibility-develop
2016-01-04 16:15:03 +01:00
kervala
0fe6ec67ba Fixed: Compilation
--HG--
branch : develop
2016-01-04 16:14:30 +01:00
kervala
91c559d48a Merge with develop
--HG--
branch : compatibility-develop
2016-01-04 15:41:29 +01:00
kervala
4d5be82f19 Changed: Minor changes
--HG--
branch : develop
2016-01-04 15:40:56 +01:00
kervala
9b8cdc2821 Changed: Use same _mm_getcsr and __cpuid intrinsics everywhere
--HG--
branch : develop
2016-01-04 15:40:45 +01:00
kervala
68aa20257f Changed: Use new code to determine free disk space
--HG--
branch : develop
2016-01-04 15:39:31 +01:00
kervala
b11fabe867 Changed: Use __rdtsc() intrinsics everywhere for Intel CPUs
--HG--
branch : develop
2016-01-04 15:35:02 +01:00
kervala
9fc317bd20 Changed: Compile tools first because client needs some of them
--HG--
branch : develop
2016-01-04 15:33:55 +01:00
kervala
b78afa1c4d Merge with develop
--HG--
branch : compatibility-develop
2016-01-04 14:03:11 +01:00
kervala
aaa9c394d7 Fixed: If mask is using colors, convert it to grayscale using Red value (compatible with previous algorithm)
--HG--
branch : develop
2016-01-04 13:58:54 +01:00
kervala
ed98662de3 Changed: OutputPath is already "standardized"
--HG--
branch : develop
2016-01-04 13:57:21 +01:00
kervala
fe018c959b Changed: Use lowercase instead of uppercase for extensions
--HG--
branch : develop
2016-01-04 13:56:56 +01:00
kervala
47bde9ccc7 Changed: Allow to resample Luminance (grayscale) bitmaps
--HG--
branch : develop
2016-01-04 13:54:59 +01:00
kervala
c263e4dffb Changed: Don't redefine new and delete operators if targetting x86_64
--HG--
branch : develop
2016-01-04 13:48:57 +01:00
kervala
6627c04a97 Changed: Copy tools related to client into client bundle under OS X
--HG--
branch : develop
2016-01-04 13:43:49 +01:00
kervala
738c28dae8 Merge with develop
--HG--
branch : compatibility-develop
2016-01-03 20:13:53 +01:00
kervala
23e4517baa Fixed: Compilation with clang
--HG--
branch : develop
2016-01-03 20:13:21 +01:00
kervala
9a7d4d3684 Merge with develop
--HG--
branch : compatibility-develop
2016-01-03 19:36:10 +01:00
kervala
873f4995ce Fixed: Missing PATHS in MySQL CMake module
--HG--
branch : develop
2016-01-03 19:35:44 +01:00
kervala
c9262b01c2 Merge with develop
--HG--
branch : compatibility-develop
2016-01-03 19:18:32 +01:00
kervala
bf19a4c61c Fixed: MySQL client under OS X
--HG--
branch : develop
2016-01-03 19:17:44 +01:00
kervala
cf89d60682 Merge with develop
--HG--
branch : compatibility-develop
2016-01-03 18:16:07 +01:00