Commit graph

2905 commits

Author SHA1 Message Date
kervala
0a77dfbd5a Merge with develop 2016-01-16 23:50:23 +01:00
kervala
2355f81fbd Fixed: Missing ++ 2016-01-16 23:48:44 +01:00
kervala
1cc7c18f1a Changed: Set CMP0020 NEW in root project 2016-01-16 23:48:32 +01:00
kervala
66c8dcab61 Fixed: Use lua_tointeger under Lua 5.2 and prior versions 2016-01-16 21:35:34 +01:00
kervala
c0e1abd41d Merge with develop 2016-01-16 15:58:19 +01:00
kervala
45a3bf320e Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals 2016-01-16 15:55:56 +01:00
kervala
5c0fcc5cfc Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 2016-01-16 15:54:46 +01:00
kervala
9ba7bcf720 Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 2016-01-16 15:52:51 +01:00
kervala
bdcfa10c66 Fixed: Link to X11 under Linux 2016-01-16 15:50:45 +01:00
kervala
0d8b09001a Merge with develop 2016-01-16 10:52:18 +01:00
kaetemi
7d11f82e58 Update mask pixel format in panoply preview tool 2016-01-15 17:22:27 +01:00
kaetemi
20f93996ea Add panoply preview tool 2016-01-15 17:11:10 +01:00
kaetemi
8f61c6dfa9 Separate window displayer message stringify 2016-01-15 17:10:39 +01:00
kaetemi
9c1d333924 More of the VS2015 stuff 2016-01-15 12:29:05 +01:00
kaetemi
8405248a32 VS2015 fixes for NeL Samples 2016-01-15 12:22:35 +01:00
kaetemi
b81ae23369 Fix another VS2015 warning 2016-01-15 12:07:33 +01:00
kaetemi
e9912417bf More VS2015 fixes 2016-01-15 12:04:06 +01:00
kaetemi
a6b1ac4331 Fix VS2015 warnings 2016-01-15 11:52:09 +01:00
kaetemi
6abf73a61d VS2015 compilation fixes 2016-01-15 11:34:23 +01:00
kervala
156b14e989 Merge with develop 2016-01-14 23:58:34 +01:00
kervala
13f1ddd6f3 Fixed: Compilation 2016-01-14 23:58:04 +01:00
kervala
d60244a9c5 Merge with develop 2016-01-14 23:54:26 +01:00
kervala
3d9d77484a Changed: Minor changes 2016-01-14 23:53:17 +01:00
kervala
8040a6495b Changed: Invert version and help checks 2016-01-14 23:47:24 +01:00
kervala
1720f33c53 Fixed: Compilation 2016-01-14 23:46:19 +01:00
kervala
e856e59a2d Merge with develop 2016-01-14 21:28:47 +01:00
kervala
2682f4f4af Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257 2016-01-14 21:26:10 +01:00
kervala
7b075b979f Merge with develop 2016-01-13 20:05:06 +01:00
kervala
02f6248bd4 Changed: Expand environment variables in paths read from cfg files 2016-01-13 19:59:09 +01:00
kervala
b05b865cfb Changed: Minor changes 2016-01-13 19:54:23 +01:00
kervala
2c8b51e9f9 Changed: Remove duplicate lines 2016-01-13 19:53:20 +01:00
kervala
9ab71b6c27 Fixed: Convert .bank filenames with / and use existing CFile::fileExists 2016-01-13 19:51:00 +01:00
kervala
50c796236b Fixed: getLastSeparator should return std::string::size_type instead of an integer 2016-01-13 19:47:35 +01:00
kervala
12e16e83e2 Changed: Implement CPath::isAbsolutePath 2016-01-13 19:46:27 +01:00
kervala
179499a5c1 Changed: Implement expandEnvironmentVariables function 2016-01-13 19:45:02 +01:00
kervala
b8d7b685f5 Fixed: Save filenames in .bank with / instead of system separator 2016-01-13 19:43:46 +01:00
kervala
ac2229d42c Merge with develop 2016-01-12 22:32:22 +01:00
kervala
5b01b79a4c Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0 2016-01-12 22:21:38 +01:00
kervala
15e7f957c7 Merge with develop 2016-01-11 11:44:44 +01:00
kervala
7e5c664125 Changed: Table keys are integers 2016-01-11 11:43:59 +01:00
kervala
3e10ebf773 Fixed: In Lua, all integers are numbers and numbers can be converted to integers 2016-01-11 11:34:32 +01:00
Nimetu
683a06efea Merge with develop 2016-01-10 16:34:13 +02:00
Nimetu
70673d5fb5 Fixed: Invalid image width/height on error 2016-01-10 16:33:42 +02:00
kervala
ef261f1be3 Merge with develop 2016-01-10 12:13:59 +01:00
kervala
5a01065159 Fixed: Compilation of object_viewer_widget in static under Linux 2016-01-10 12:12:50 +01:00
kervala
91bb4037ae Merge with develop 2016-01-09 16:32:59 +01:00
kervala
2ef9f7dbd9 Fixed: Compilation 2016-01-09 16:29:59 +01:00
kervala
e47fbc461b Merge with develop 2016-01-09 16:08:34 +01:00
kervala
8875d144bc Changed: Minor changes 2016-01-09 15:57:20 +01:00
kervala
d216c8610a Fixed: Compilation under Linux 2016-01-09 15:56:50 +01:00
kervala
b1226353c1 Merge with develop 2016-01-07 17:41:02 +01:00
kervala
5be17937df Changed: HAVE_X86_64 is defined or not 2016-01-07 17:39:53 +01:00
kervala
3dad90c23f Changed: Minor changes 2016-01-07 17:36:17 +01:00
Nimetu
3b828dacc5 Fixed: Wrong DD indent in nested list when tag is not closed 2016-01-07 01:00:48 +02:00
kervala
c4b512950d Merge with develop 2016-01-06 23:22:57 +01:00
kervala
546a91bb13 Changed: Added more fromString tests 2016-01-06 23:21:22 +01:00
kervala
52502537a8 Changed: Don't need to use system API, NeL already has equivalent 2016-01-06 23:20:40 +01:00
kervala
f6d4804411 Merge with develop 2016-01-06 16:06:23 +01:00
kervala
1ddbd69af1 Fixed: Compilation with Qt 4 2016-01-06 16:01:53 +01:00
kervala
f7894c58c7 Merge with develop 2016-01-06 13:22:47 +01:00
kervala
7fc5e0fa1b Changed: Remove unused variable 2016-01-06 13:21:47 +01:00
kervala
b03f60bbf2 Changed: Code simplification 2016-01-06 13:19:48 +01:00
kervala
29f297a955 Changed: Minor changes 2016-01-06 13:17:07 +01:00
kervala
cf1f3542d5 Changed: Don't fix files within panoply_maker, use textures_optimizer (but checks can be enabled) 2016-01-06 12:43:57 +01:00
kervala
8b3076ab69 Changed: Support for new key events 2016-01-06 12:42:10 +01:00
kervala
84da97851b Changed: Minor change 2016-01-06 12:39:58 +01:00
kervala
0f7afabf3f Changed: Comments to support DXTC1a for textures with one level of transparency later 2016-01-06 12:35:21 +01:00
kervala
db86bb006a Changed: Compile tile_edit_qt and object_viewer_widget if WITH_QT5 is defined 2016-01-06 12:33:58 +01:00
kervala
f1563437df Fixed: Compilation of object_viewer_qt with Qt 5 2016-01-06 12:33:05 +01:00
kervala
6852b21324 Fixed: Allow to select PNG and TGA for bitmaps 2016-01-06 12:31:53 +01:00
kervala
ab8e339b14 Fixed: Remove dependency on Pic (NeL manages TGA and PNG itself, reused code by Kaetemi) 2016-01-06 12:31:13 +01:00
kervala
6df07a9f2a Fixed: Compilation of tile_edit_qt with Qt 5 2016-01-06 12:29:34 +01:00
Nimetu
6b10613fce Merge with develop 2016-01-06 01:02:22 +02:00
Nimetu
cd60a50e8f Changed: Refactor DL 2016-01-06 00:11:17 +02:00
Nimetu
39cfbc2a7c Fixed: Align UL, LI list style type marker outside content 2016-01-06 00:08:41 +02:00
Nimetu
9140d23557 Fixed: DL list top margin 2016-01-05 23:23:19 +02:00
Nimetu
531934b3bf Fixed: DL list DD element indent 2016-01-05 23:02:21 +02:00
Nimetu
f38e5e8877 Changed: UL list style type depending on nested depth 2016-01-05 20:23:11 +02:00
Nimetu
03a821a9b9 Changed: Merge UL and OL code 2016-01-05 20:21:40 +02:00
kervala
32848f4bc1 Merge with develop 2016-01-05 17:12:29 +01:00
kervala
10e7d8d4ff Fixed: Don't load grayscale textures as alpha 2016-01-05 17:11:37 +01:00
kervala
17fbe32091 Merge with develop 2016-01-05 13:00:18 +01:00
kervala
9a2d36f684 Changed: Added default checks for textures and masks (-t and -m) 2016-01-05 12:57:26 +01:00
kervala
d910feb086 Fixed: Alpha channel with 0 is correct, don't change it 2016-01-05 12:54:47 +01:00
kervala
0336b434ae Changed: %u to format a uint 2016-01-05 12:53:57 +01:00
kervala
bfad691d56 Fixed: Instead of returning an error, convert the bitmap in RGBA 2016-01-05 12:53:32 +01:00
kervala
66dc091c20 Fixed: Alpha channel with 0 is correct, don't change it 2016-01-05 12:52:45 +01:00
kervala
001b9facbe Fixed: GCC warnings 2016-01-05 12:51:06 +01:00
kervala
ad58af8ae4 Merge with develop 2016-01-04 22:17:00 +01:00
kervala
3ef42e9bd0 Fixed: Converting AlphaLuminance to Luminance 2016-01-04 22:16:21 +01:00
kervala
c04d656021 Merge with develop 2016-01-04 19:27:21 +01:00
kervala
0f4a307e18 Fixed: __rdtsc() under old versions of GCC 2016-01-04 19:26:25 +01:00
kervala
5956441186 Changed: Define CLANG_VERSION is using clang compiler 2016-01-04 19:18:19 +01:00
kervala
c564cd4389 Merge with develop 2016-01-04 16:15:03 +01:00
kervala
d07e0d76d9 Fixed: Compilation 2016-01-04 16:14:30 +01:00
kervala
1bb74a8bb0 Merge with develop 2016-01-04 15:41:29 +01:00
kervala
8c3da3d5d7 Changed: Use same _mm_getcsr and __cpuid intrinsics everywhere 2016-01-04 15:40:45 +01:00
kervala
6dde138039 Changed: Use new code to determine free disk space 2016-01-04 15:39:31 +01:00
kervala
f2e851c6db Changed: Use __rdtsc() intrinsics everywhere for Intel CPUs 2016-01-04 15:35:02 +01:00
kervala
1a7595369a Merge with develop 2016-01-04 14:03:11 +01:00
kervala
4f92766afa Fixed: If mask is using colors, convert it to grayscale using Red value (compatible with previous algorithm) 2016-01-04 13:58:54 +01:00
kervala
f17137bb57 Changed: OutputPath is already "standardized" 2016-01-04 13:57:21 +01:00
kervala
33c6b92c43 Changed: Use lowercase instead of uppercase for extensions 2016-01-04 13:56:56 +01:00
kervala
1d7439f12a Changed: Allow to resample Luminance (grayscale) bitmaps 2016-01-04 13:54:59 +01:00
kervala
28ad88d698 Changed: Don't redefine new and delete operators if targetting x86_64 2016-01-04 13:48:57 +01:00
kervala
873ac7e727 Changed: Copy tools related to client into client bundle under OS X 2016-01-04 13:43:49 +01:00
kervala
1725f5b0e6 Merge with develop 2016-01-03 18:16:07 +01:00
kervala
fc90365c18 Changed: Convert masks to 8 bits grayscale instead of using only Red component of RGBA bitmaps 2016-01-03 18:14:46 +01:00
kervala
459d6b611b Changed: Cast to CRGBA* is faster than set8888 2016-01-03 17:51:49 +01:00
kervala
3fae0fe91f Changed: Use LD_LIBRARY_PATH only when opening a document or URL 2016-01-03 17:51:09 +01:00
kervala
d96b5d236c Changed: Only use filename in setProcessName 2016-01-03 17:50:21 +01:00
kervala
df89274053 Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle 2016-01-03 17:47:31 +01:00
kervala
2ebe33cd43 Changed: Add an icon for crash_report under Windows 2016-01-03 17:46:27 +01:00
kervala
26013094e1 Merge with develop 2016-01-02 22:36:05 +01:00
kervala
2a9c54aff7 Changed: Minor changes 2016-01-02 22:24:16 +01:00
kervala
2b30974cc2 Changed: Don't create bundle for Ryzom client tools (we will try to package them in same bundle) 2016-01-02 22:23:49 +01:00
kervala
0791aa77da Changed: Unused code 2016-01-02 22:23:04 +01:00
kervala
304297e284 Merge with develop 2016-01-02 20:29:55 +01:00
kervala
cbc896558c Fixed: Load 8bits textures as grayscale instead of alpha in textures_optimizer 2016-01-02 20:29:24 +01:00
kervala
ae43a9ce4e Fixed: Warnings with GCC 2016-01-02 19:19:39 +01:00
kervala
ec8b27f8ab Fixed: Use --args only with open 2016-01-02 19:16:33 +01:00
kervala
efedb468cc Fixed: Don't use system() under Windows, because it'll open a console window, use launchProgramAndWaitForResult instead 2016-01-02 19:15:21 +01:00
kervala
f2da4ef977 Fixed: Implements launchProgramAndWaitForResult to launch a command synchronously 2016-01-02 19:14:13 +01:00
kervala
4a45f10c75 Merge with develop 2016-01-02 17:11:59 +01:00
kervala
e1ba107545 Fixed: Display alpha as an integer 2016-01-02 17:10:23 +01:00
kervala
61457e575e Fixed: Typos 2016-01-02 17:04:45 +01:00
kervala
cd74f98728 Merge with develop 2016-01-02 11:35:26 +01:00
kervala
fc876ccd0e Changed: Minor changes 2016-01-02 11:34:17 +01:00
kervala
f372014c72 Changed: Remove X11 code for OS X (we support Cocoa now) 2016-01-02 11:34:04 +01:00
kervala
c1d8c9523b Fixed: Dead keys under Linux (Ubuntu was using ibus input method) 2016-01-02 11:33:18 +01:00
kervala
5431cd5886 Merge with develop 2016-01-01 16:27:45 +01:00
kervala
bd7c17102a Changed: Use new methods in panoply_maker 2016-01-01 16:07:27 +01:00
kervala
6980bf3089 Changed: Minor changes 2016-01-01 16:04:57 +01:00
kervala
74af93c136 Added: Textures optimizer tool 2016-01-01 16:04:45 +01:00
kervala
51dba01e7d Changed: Parse nvidia-smi output to determine video memory 2016-01-01 16:04:06 +01:00
kervala
f793077ac0 Changed: Minor change 2016-01-01 16:03:06 +01:00
kervala
c3db175157 Changed: Added helpers methods to CBitmap 2016-01-01 16:02:54 +01:00
kervala
3d051b2d6f Changed: Added set8888() method to CGRBA 2016-01-01 16:01:03 +01:00
kervala
b71fad84c6 Changed: Added isGray() method to CGRBA 2016-01-01 16:00:17 +01:00
kervala
556333ca38 Merge with develop 2015-12-29 18:03:21 +01:00
kervala
d0b766e983 Fixed: Wrong bitmap size 2015-12-29 16:15:07 +01:00
kervala
9d56b2c15c Merge with develop 2015-12-28 18:21:56 +01:00
kervala
b972dbaa0f Fixed: Install readme.txt in same directory if not using WITH_UNIX_STRUCTURE 2015-12-28 18:16:07 +01:00
kervala
ffa7751b7c Changed: Don't need to use std::stringstream 2015-12-28 18:15:28 +01:00
kervala
94cf3ba03e Merge with develop 2015-12-28 16:44:35 +01:00
kervala
fdeee6622b Changed: Minor change 2015-12-28 16:43:20 +01:00
kervala
8b74943e6e Fixed: Warning when DDS_HEADER is not initialized 2015-12-28 16:41:26 +01:00
kervala
50a7977d5e Changed: Allow panoply_maker to optimize textures and masks (remove alpha channel if useless) 2015-12-28 16:37:32 +01:00
kervala
10e585014b Merge with develop 2015-12-27 16:07:11 +01:00
kervala
d9265f36cf Fixed: Don't crash if GL_VERSION returns NULL (it should never happen) 2015-12-27 16:06:35 +01:00