Commit graph

6405 commits

Author SHA1 Message Date
kervala
ef29c2b5ef Merge with develop
--HG--
branch : compatibility-develop
2016-01-06 23:22:57 +01:00
kervala
d494f00ab6 Fixed: Compilation with dynamic version of Qt 5
--HG--
branch : develop
2016-01-06 23:22:01 +01:00
kervala
76dece0ec2 Changed: Minor changes
--HG--
branch : develop
2016-01-06 23:21:38 +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
c09476ec03 Fixed: Servers compilation
--HG--
branch : develop
2016-01-06 23:19:34 +01:00
kervala
ad3df5084a Merge with develop
--HG--
branch : compatibility-develop
2016-01-06 16:06:23 +01:00
kervala
8756ba6ebc Changed: Link to Qt5WinExtras under Windows
--HG--
branch : develop
2016-01-06 16:05:36 +01:00
kervala
834fcbe8c8 Changed: Minor changes
--HG--
branch : develop
2016-01-06 16:03:39 +01:00
kervala
0e74c167cd Fixed: Compilation
--HG--
branch : develop
2016-01-06 16:03:20 +01:00
kervala
592bb16c11 Fixed: Warnings with GCC
--HG--
branch : develop
2016-01-06 16:03:04 +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
f0bfd6264e Fixed: Big endian number
--HG--
branch : develop
2016-01-06 13:15:01 +01:00
kervala
92fe9a6554 Fixed: Compilation
--HG--
branch : develop
2016-01-06 13:14:29 +01:00
kervala
a53ff71469 Changed: Replace strlwr by toLower
--HG--
branch : develop
2016-01-06 13:05:49 +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
64428d0018 Changed: Allow to debug Lua in FV too
--HG--
branch : develop
2016-01-06 12:38:10 +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
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