Commit graph

5789 commits

Author SHA1 Message Date
SIELA1915
b46f7cd0cd Merged with new things. 2016-01-17 13:36:59 +01:00
kervala
25f98dbca8 Merge with develop 2016-01-17 13:24:01 +01:00
kervala
9ff0f99cea Fixed: Compilation with static Qt 5 2016-01-17 13:23:25 +01:00
kervala
d42d285958 Fixed: Typo in Lua 5.3 module 2016-01-17 13:21:27 +01:00
kervala
0a77dfbd5a Merge with develop 2016-01-16 23:50:23 +01:00
kervala
06f72437e2 Fixed: Right directories 2016-01-16 23:49:39 +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
8124033e69 Changed: Minor changes 2016-01-16 23:47:58 +01:00
kervala
852da988fe Added: Config file for translation_tools 2016-01-16 23:47:12 +01:00
kervala
66c8dcab61 Fixed: Use lua_tointeger under Lua 5.2 and prior versions 2016-01-16 21:35:34 +01:00
SIELA1915
da926956b7 Merged 2016-01-16 17:32:22 +01:00
SIELA1915
cf9cd1c239 Changed icons for Unix and name. 2016-01-16 17:31:54 +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
12bf13239c Fixed: Link to static libxml2 under Linux 2016-01-16 15:50:17 +01:00
kervala
74722cb678 Changed: Update year in copyright automatically 2016-01-16 15:47:13 +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
fe6cc6656b Fix bad printf parameters 2016-01-15 16:42:21 +01:00
kaetemi
8b95360709 More of that VS2015 magic 2016-01-15 16:17:23 +01:00
kaetemi
c4f5b5d521 And more VS2015 fixes 2016-01-15 12:33:27 +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
eac3dc3ae1 Merge with develop 2016-01-15 10:47:37 +01:00
kervala
1c30bd835f Changed: Update WindowsSDK CMake module for VC++ 2015 2016-01-15 10:46:34 +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
4bcc9cf6e0 Fixed: Use language name in native language in config window 2016-01-14 22:42:34 +01:00
kervala
e856e59a2d Merge with develop 2016-01-14 21:28:47 +01:00
kervala
bed94fb47e Fixed: Warning with clang 2016-01-14 21:27:42 +01:00
kervala
ef6cc501e0 Fixed: Right directory under OS X 2016-01-14 21:27:10 +01:00
kervala
823818f31f Fixed: Don't display D3D page under Linux and OS X 2016-01-14 21:26: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
06353eaa43 Merge with develop 2016-01-14 10:22:22 +01:00
kervala
e5d414fc5b Fixed: Compilation under OS X 2016-01-14 10:21:50 +01:00
kervala
7b075b979f Merge with develop 2016-01-13 20:05:06 +01:00
kervala
d55b781374 Fixed: Use map for faster search for example (implemented a TODO of GUIGUI) 2016-01-13 20:04:01 +01:00
kervala
29f56159b1 Changed: Replace \\ by / 2016-01-13 20:02:24 +01:00
kervala
13ee42d521 Fixed: Remove some hardcoded paths and replaced them by LeveldesignDataPath variable 2016-01-13 20:01:36 +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
2a3e173488 Changed: Try different alternative paths for game folders 2016-01-13 19:52:58 +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
SIELA1915
cd19784bff removed ryzom.icns 2016-01-13 19:31:02 +01:00
SIELA1915
93d2b80966 Adjustments to give more options to do custom emotes, "Khanatization" for the Mac Client, changements to the key system. 2016-01-13 19:26:28 +01:00
kervala
ac2229d42c Merge with develop 2016-01-12 22:32:22 +01:00
kervala
3a009045aa Changed: Init CLoginProgressPostThread only if InstallStatsUrl is defined 2016-01-12 22:31:06 +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
acd0d6d88a Merge with develop 2016-01-11 13:53:32 +01:00
kervala
adb1cbf4bc Fixed: Wrong directory 2016-01-11 13:53:01 +01:00
kervala
9ec144c2b5 Merge with develop 2016-01-11 12:55:47 +01:00
kervala
1a56512b24 Fixed: Error when signing bundle 2016-01-11 12:55:09 +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
kervala
b76e7c938e Merge with develop 2016-01-11 10:09:58 +01:00
kervala
7bcae9dbe4 Fixed: Ryzom Configuration under OS X 2016-01-11 10:09:10 +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
686586e3df Merge with develop 2016-01-09 19:42:29 +01:00
kervala
2dc084afc3 Fixed: Compilation 2016-01-09 19:41:45 +01:00
kervala
7fc4daa0a6 Merge with develop 2016-01-09 19:32:59 +01:00
kervala
80ee4a1ea2 Fixed: Compilation 2016-01-09 19:32:20 +01:00
kervala
3119b6455a Merge with develop 2016-01-09 18:10:49 +01:00
kervala
9c7f2ba107 Fixed: Compilation 2016-01-09 18:10:16 +01:00
kervala
57d3e8afcc Merge with develop 2016-01-09 17:17:59 +01:00
kervala
7afd7b8ceb Changed: Enable new LZMA SDK code 2016-01-09 17:17:24 +01:00
kervala
75b5fc1045 Changed: Update LZMA SDK to latest version 2016-01-09 17:15:31 +01:00
kervala
91bb4037ae Merge with develop 2016-01-09 16:32:59 +01:00
kervala
de95c7b5ab Changed: Don't need to extract the original filename 2016-01-09 16:31:36 +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
c1c836a9b3 Changed: Replace strlwr by toLower 2016-01-09 16:07:38 +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
b4e7d8cc1e Changed: Moved 7z/lzma code in login_patch_seven_zip.cpp
Fixed: Updated code to work with new versions of LZMA SDK
2016-01-09 15:53:25 +01:00
kervala
b1226353c1 Merge with develop 2016-01-07 17:41:02 +01:00
kervala
078a4b1895 Changed: Minor change 2016-01-07 17:40:19 +01:00
kervala
5be17937df Changed: HAVE_X86_64 is defined or not 2016-01-07 17:39:53 +01:00
kervala
96edb81218 Changed: Added VideoMemory variable in cfg to force video memory to use (useful if Ryzom can't detect the correct amount of video memory or when using several clients at once) 2016-01-07 17:39:11 +01:00
kervala
3dad90c23f Changed: Minor changes 2016-01-07 17:36:17 +01:00
kervala
70dd9dac30 Changed: Entraîneur instead of Moniteur 2016-01-07 15:33:46 +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
771d6f7358 Fixed: Compilation with dynamic version of Qt 5 2016-01-06 23:22:01 +01:00
kervala
e67096fb60 Changed: Minor changes 2016-01-06 23:21:38 +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
cb5ffb1d05 Fixed: Servers compilation 2016-01-06 23:19:34 +01:00
kervala
f6d4804411 Merge with develop 2016-01-06 16:06:23 +01:00
kervala
913102bc7c Changed: Link to Qt5WinExtras under Windows 2016-01-06 16:05:36 +01:00
kervala
98041d381a Changed: Minor changes 2016-01-06 16:03:39 +01:00
kervala
bfc9381a6b Fixed: Compilation 2016-01-06 16:03:20 +01:00
kervala
6ac293c848 Fixed: Warnings with GCC 2016-01-06 16:03:04 +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
b7cefbabbf Fixed: Big endian number 2016-01-06 13:15:01 +01:00
kervala
23e55fe475 Fixed: Compilation 2016-01-06 13:14:29 +01:00
kervala
ef7337b511 Changed: Replace strlwr by toLower 2016-01-06 13:05:49 +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
0e4d1255b7 Changed: Allow to debug Lua in FV too 2016-01-06 12:38:10 +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
8fd5f96d83 Changed: Minor changes 2016-01-05 12:59:40 +01:00
kervala
0d0e08948e Changed: Use std::numeric_limits 2016-01-05 12:59:28 +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