Commit graph

5706 commits

Author SHA1 Message Date
kervala
4ca5d07360 Merge with develop
--HG--
branch : compatibility-develop
2016-01-09 19:32:59 +01:00
kervala
93c6f521c5 Fixed: Compilation
--HG--
branch : develop
2016-01-09 19:32:20 +01:00
kervala
b1b5e87fe1 Merge with develop
--HG--
branch : compatibility-develop
2016-01-09 18:10:49 +01:00
kervala
f10060eaa1 Fixed: Compilation
--HG--
branch : develop
2016-01-09 18:10:16 +01:00
kervala
343278c586 Merge with develop
--HG--
branch : compatibility-develop
2016-01-09 17:17:59 +01:00
kervala
688076e056 Changed: Enable new LZMA SDK code
--HG--
branch : develop
2016-01-09 17:17:24 +01:00
kervala
1a3f5729fe Changed: Update LZMA SDK to latest version
--HG--
branch : develop
2016-01-09 17:15:31 +01:00
kervala
ef8c8d0401 Merge with develop
--HG--
branch : compatibility-develop
2016-01-09 16:32:59 +01:00
kervala
c81301ca30 Changed: Don't need to extract the original filename
--HG--
branch : develop
2016-01-09 16:31:36 +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
4e4f19f809 Changed: Replace strlwr by toLower
--HG--
branch : develop
2016-01-09 16:07:38 +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
cc0174e800 Changed: Moved 7z/lzma code in login_patch_seven_zip.cpp
Fixed: Updated code to work with new versions of LZMA SDK

--HG--
branch : develop
2016-01-09 15:53:25 +01:00
kervala
3f4a5010f6 Merge with develop
--HG--
branch : compatibility-develop
2016-01-07 17:41:02 +01:00
kervala
54ee3d79e9 Changed: Minor change
--HG--
branch : develop
2016-01-07 17:40:19 +01:00
kervala
9e8cd07e4b Changed: HAVE_X86_64 is defined or not
--HG--
branch : develop
2016-01-07 17:39:53 +01:00
kervala
51ec04b761 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)
--HG--
branch : develop
2016-01-07 17:39:11 +01:00
kervala
b3a392d559 Changed: Minor changes
--HG--
branch : develop
2016-01-07 17:36:17 +01:00
kervala
45367135d5 Changed: Entraîneur instead of Moniteur
--HG--
branch : compatibility-develop
2016-01-07 15:33:46 +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
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
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
kervala
79e3ec61b1 Changed: Convert masks to 8 bits grayscale instead of using only Red component of RGBA bitmaps
--HG--
branch : develop
2016-01-03 18:14:46 +01:00
kervala
494ab2ce20 Changed: Cast to CRGBA* is faster than set8888
--HG--
branch : develop
2016-01-03 17:51:49 +01:00
kervala
96fab4210b Changed: Use LD_LIBRARY_PATH only when opening a document or URL
--HG--
branch : develop
2016-01-03 17:51:09 +01:00
kervala
82acfb3bf2 Changed: Only use filename in setProcessName
--HG--
branch : develop
2016-01-03 17:50:21 +01:00
kervala
ea937ba4f3 Changed: Remove SIGPIPE signal listener (hack for libwww)
--HG--
branch : develop
2016-01-03 17:49:02 +01:00
kervala
47bc397a30 Fixed: Don't force 1024x768 windowed if desktop resolution is already 1024x768 or less
--HG--
branch : develop
2016-01-03 17:48:23 +01:00
kervala
33e701192d Fixed: Sign OS X binaries needed by client and copy them in Ryzom bundle
--HG--
branch : develop
2016-01-03 17:47:31 +01:00
kervala
06b83f85f7 Changed: Add an icon for crash_report under Windows
--HG--
branch : develop
2016-01-03 17:46:27 +01:00
kervala
a1ee429b92 Merge with develop
--HG--
branch : compatibility-develop
2016-01-02 22:36:05 +01:00
kervala
697ac2221c Changed: Allow to specify CPUMask in client.cfg to force the use of some cores
--HG--
branch : develop
2016-01-02 22:28:49 +01:00
kervala
12c4adf943 Changed: Minor changes
--HG--
branch : develop
2016-01-02 22:24:16 +01:00
kervala
de0df1645b Changed: Don't create bundle for Ryzom client tools (we will try to package them in same bundle)
--HG--
branch : develop
2016-01-02 22:23:49 +01:00
kervala
1a00dec5c3 Changed: Unused code
--HG--
branch : develop
2016-01-02 22:23:04 +01:00
kervala
47364c47c3 Merge with develop
--HG--
branch : compatibility-develop
2016-01-02 20:29:55 +01:00
kervala
8087b76397 Fixed: Load 8bits textures as grayscale instead of alpha in textures_optimizer
--HG--
branch : develop
2016-01-02 20:29:24 +01:00
kervala
844b1e3d02 Fixed: Warnings with GCC
--HG--
branch : develop
2016-01-02 19:19:39 +01:00
kervala
b50ca03e92 Fixed: Use --args only with open
--HG--
branch : develop
2016-01-02 19:16:33 +01:00
kervala
046c69066d Fixed: Don't use system() under Windows, because it'll open a console window, use launchProgramAndWaitForResult instead
--HG--
branch : develop
2016-01-02 19:15:21 +01:00
kervala
266a32ea19 Fixed: Implements launchProgramAndWaitForResult to launch a command synchronously
--HG--
branch : develop
2016-01-02 19:14:13 +01:00
kervala
11c0a073ed Merge with develop
--HG--
branch : compatibility-develop
2016-01-02 17:11:59 +01:00
kervala
de77bb634d Changed: Don't need to cast since it's already a sint32
--HG--
branch : develop
2016-01-02 17:10:50 +01:00
kervala
0c98a86e4b Fixed: Display alpha as an integer
--HG--
branch : develop
2016-01-02 17:10:23 +01:00
kervala
958ccb9b58 Changed: Add CPUMask variable
--HG--
branch : develop
2016-01-02 17:08:25 +01:00
kervala
20711e24e3 Fixed: Typos
--HG--
branch : develop
2016-01-02 17:04:45 +01:00
kervala
25a7caf341 Fixed: Use SaveShardRoot from game_share
--HG--
branch : develop
2016-01-02 17:02:07 +01:00
kervala
295818e9a8 Merge with develop
--HG--
branch : compatibility-develop
2016-01-02 11:35:26 +01:00
kervala
6e36d06f76 Changed: Minor changes
--HG--
branch : develop
2016-01-02 11:34:17 +01:00
kervala
71f7cb28dc Changed: Remove X11 code for OS X (we support Cocoa now)
--HG--
branch : develop
2016-01-02 11:34:04 +01:00
kervala
8e57f2ed2e Fixed: Dead keys under Linux (Ubuntu was using ibus input method)
--HG--
branch : develop
2016-01-02 11:33:18 +01:00
kervala
bcfdd36844 Merge with develop
--HG--
branch : compatibility-develop
2016-01-01 16:27:45 +01:00
kervala
860a4d99ba Changed: Replaced substr == by compare, because more optimized (thanks to Kaetemi for the hint!)
--HG--
branch : develop
2016-01-01 16:26:12 +01:00
kervala
03eaa9181a Changed: Minor changes
--HG--
branch : develop
2016-01-01 16:08:11 +01:00
kervala
cf8ed540a7 Changed: Use new methods in panoply_maker
--HG--
branch : develop
2016-01-01 16:07:27 +01:00
kervala
80759eafb4 Changed: Minor changes
--HG--
branch : develop
2016-01-01 16:04:57 +01:00
kervala
e995b7221f Added: Textures optimizer tool
--HG--
branch : develop
2016-01-01 16:04:45 +01:00
kervala
d34e3d120d Changed: Parse nvidia-smi output to determine video memory
--HG--
branch : develop
2016-01-01 16:04:06 +01:00
kervala
ee26c7377b Changed: Minor change
--HG--
branch : develop
2016-01-01 16:03:06 +01:00
kervala
437aa5b939 Changed: Added helpers methods to CBitmap
--HG--
branch : develop
2016-01-01 16:02:54 +01:00
kervala
27a2263bd6 Changed: Added set8888() method to CGRBA
--HG--
branch : develop
2016-01-01 16:01:03 +01:00
kervala
2ed7c0be88 Changed: Added isGray() method to CGRBA
--HG--
branch : develop
2016-01-01 16:00:17 +01:00
kervala
3984309945 Changed: Useless code because all clients will be able to patch themselve
--HG--
branch : develop
2016-01-01 15:59:32 +01:00
kervala
149adc351a Fixed: Path when UnpackTo doesn't have a trailing /
--HG--
branch : develop
2016-01-01 15:58:31 +01:00
kervala
aebc890f9c Fixed: Define RZ_USE_CUSTOM_PATCH_SERVER for ryzom_client_patcher
--HG--
branch : develop
2016-01-01 15:57:10 +01:00
kervala
46ce493ccb Fixed: Replaced Mage and Magene (???) by Magicien and Magicienne
--HG--
branch : compatibility-develop
2015-12-30 10:12:27 +01:00
kervala
9bc9c8585b Merge with develop
--HG--
branch : compatibility-develop
2015-12-30 00:46:50 +01:00
kervala
ef6b8fb501 Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:46:22 +01:00
kervala
df308276ed Merge with develop
--HG--
branch : compatibility-develop
2015-12-30 00:14:27 +01:00
kervala
17090524b1 Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:13:58 +01:00
kervala
7247cba9eb Merge with develop
--HG--
branch : compatibility-develop
2015-12-30 00:10:51 +01:00
kervala
424e9ba99f Fixed: Compilation
--HG--
branch : develop
2015-12-30 00:10:08 +01:00
kervala
2f45ff1ebe Merge with develop
--HG--
branch : compatibility-develop
2015-12-29 22:36:04 +01:00
kervala
c032446549 Changed: Use WITH_UNIX_STRUCTURE for client icons
--HG--
branch : develop
2015-12-29 22:07:30 +01:00
kervala
130ca08bc7 Changed: Minor change
--HG--
branch : develop
2015-12-29 22:07:10 +01:00
kervala
ab4dc8ec01 Changed: Merge code from private repository
--HG--
branch : develop
2015-12-29 22:06:49 +01:00