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 |
|
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
|
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
|
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 |
|