Commit graph

5613 commits

Author SHA1 Message Date
kervala
a53f1e4a19 Merge with develop 2015-12-30 00:10:51 +01:00
kervala
7fc2edd38e Fixed: Compilation 2015-12-30 00:10:08 +01:00
kervala
3d988133b4 Merge with develop 2015-12-29 22:36:04 +01:00
kervala
d8e299ad4d Changed: Use WITH_UNIX_STRUCTURE for client icons 2015-12-29 22:07:30 +01:00
kervala
301c3b2b8a Changed: Minor change 2015-12-29 22:07:10 +01:00
kervala
a5e23cb0f9 Changed: Merge code from private repository 2015-12-29 22:06:49 +01:00
kervala
556333ca38 Merge with develop 2015-12-29 18:03:21 +01:00
kervala
cf3dec5af6 Fixed: Wrong check (if c is NULL, nothing is happening) 2015-12-29 17:59:18 +01:00
kervala
64145a8a70 Changed: Minor changes 2015-12-29 16:39:37 +01:00
kervala
4275af8038 Changed: Merge code from private repository 2015-12-29 16:35:47 +01:00
kervala
0e71d30714 Changed: Minor changes 2015-12-29 16:19:46 +01:00
kervala
d0b766e983 Fixed: Wrong bitmap size 2015-12-29 16:15:07 +01:00
Nimetu
8fc543d843 Merge with develop 2015-12-29 15:03:12 +02:00
Nimetu
f7416f46bd Changed: Save screenshots with year-month-day info in filename 2015-12-29 14:34:24 +02: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
37caaac787 Fixed: Set process name (fixes the <Unknown> under Linux and OS X) 2015-12-28 18:13:37 +01:00
kervala
a13d92c87a Changed: Don't create log.log anymore 2015-12-28 18:12:45 +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
a086437a6e Changed: Updated translations 2015-12-28 10:32:15 +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
kervala
d9bd4e3076 Merge with develop 2015-12-26 18:00:04 +01:00
kervala
afa53e242e Changed: Support for GLX_MESA_query_renderer to detect video memory 2015-12-26 17:51:36 +01:00
kervala
0a671f2d73 Changed: Minor changes 2015-12-26 17:49:54 +01:00
kervala
3b0dbfed4c Fixed: Universe channel tab close 2015-12-26 17:49:06 +01:00
kervala
aa294a79fa Merge with develop 2015-12-26 15:13:08 +01:00
kervala
03d2836785 Fixed: GCC warnings 2015-12-26 15:12:41 +01:00
kervala
ae23dc32b3 Fixed: Forgot to link to PlatformSupport under other platforms 2015-12-26 15:12:29 +01:00
kervala
b29d523177 Merge with develop 2015-12-26 14:38:37 +01:00
kervala
f4238a49d3 Changed: Use entity textures cache size depending on video memory 2015-12-26 14:37:53 +01:00
kervala
d8ac1ece84 Fixed: GCC warnings 2015-12-26 14:10:27 +01:00
kervala
1b7bdfd485 Fixed: GCC warnings 2015-12-26 14:09:15 +01:00
kervala
584bb6cc99 Changed: Renamed screenH and screenW to _ScreenH and _ScreenW 2015-12-26 14:02:01 +01:00
kervala
80ec8e4321 Changed: Minor changes 2015-12-26 14:00:39 +01:00
kervala
0286ac2270 Changed: Force 32 bits depth with XRandr 2015-12-26 13:38:09 +01:00
kervala
e1060b8923 Changed: Implement CSystemUtils::getTotalVideoMemory() under Linux (Xorg log and lspci parsing) 2015-12-26 13:28:09 +01:00
kervala
fd9a6820f7 Fixed: GCC warnings 2015-12-26 13:26:51 +01:00
kervala
85be54738f Merged with develop 2015-12-25 20:52:18 +01:00
kervala
5708a3997c Fixed: Warnings with GCC 2015-12-25 20:49:59 +01:00
kervala
6724e38a65 Merge with develop 2015-12-25 18:02:13 +01:00
kervala
007e47120a Fixed: Warnings compiling with Qt 5 2015-12-25 18:00:37 +01:00
kervala
f44f646d6a Fixed: Link errors under Linux 2015-12-25 17:59:41 +01:00
kervala
cb1cd569c2 Merge with develop 2015-12-25 15:37:07 +01:00
kervala
77d60be443 Changed: Use shared libs for X11 because API doesn't change 2015-12-25 15:35:04 +01:00
kervala
ce663a15d2 Fixed: Link order with Qt 5 static under Linux 2015-12-25 15:33:03 +01:00
kervala
501f31e03b Fixed: Define QT_NO_DEBUG in Release with Qt 5 also in PCH 2015-12-25 15:31:34 +01:00
kervala
3b32412d2a Changed: Display a warning when calling getModes if Display is NULL 2015-12-25 15:30:14 +01:00
kervala
ba706b46f7 Changed: Added new function getCommandOutput 2015-12-25 15:29:23 +01:00
kervala
36fc5a3839 Fixed: client_config_qt needs QXcbGlxIntegrationPlugin in static 2015-12-25 15:28:11 +01:00
kervala
0b24fa4dd4 Fixed: Frequency checks useless because it can be 0 or a wrong value, 16 bits depth requirement 2015-12-25 15:26:32 +01:00
kervala
328ad17bc4 Fixed: Need to initialize OpenGL driver 2015-12-25 15:25:08 +01:00
kervala
e152839c52 Changed: Updated translations 2015-12-23 23:11:59 +01:00
kervala
4c0365287b Merge with develop 2015-12-23 15:31:37 +01:00
kervala
1b136d55aa Fixed: Warning when $json was empty (but perhaps we should fix the real reason...) 2015-12-23 15:30:52 +01:00
kervala
590dfeebc1 Changed: Replace ~0u by std::numeric_limits<uint>::max() 2015-12-23 15:30:12 +01:00
kervala
20dac0bdf9 Fixed: Colors are on 3 bits (colors goes from 0 to 7) so 254 was converted to 6 (white) 2015-12-23 15:28:33 +01:00
kervala
f05fd1f4e2 Changed: windows.h already included in stdligo.h 2015-12-23 15:23:50 +01:00
kervala
88d45830a4 Changed: Need more checks before using getTotalVideoMemory() 2015-12-23 15:22:06 +01:00
kervala
791d73500e Fixed: Wrong units (1 KiB = 1024 B, 1 KB = 1000 B, etc...) 2015-12-23 15:11:26 +01:00
kervala
68f4628282 Changed: Use a stack size of 1 MiB under all platforms for CCoTask (default under Windows) 2015-12-23 15:10:06 +01:00
kervala
ab67c892bb Changed: Use nlSleep instead of usleep 2015-12-23 15:08:08 +01:00
kervala
7892573ab0 Changed: Use _LP64 macro instead of sizeof(long unsigned int) == 8 2015-12-23 15:04:22 +01:00
kervala
3f28932da4 Changed: Use nlwarning instead of nlerror 2015-12-23 15:03:32 +01:00
kervala
6a83ca4088 Changed: Don't need to use XDG_CURRENT_DESKTOP under OS X 2015-12-23 15:03:08 +01:00
kervala
f8862636f4 Fixed: Use Xcb plugin for Qt 5 under Linux 2015-12-23 15:00:49 +01:00
kervala
41ac92d9f2 Changed: Use toString instead of sprintf 2015-12-23 14:56:36 +01:00
kervala
d8f79ed761 Changed: Implement CSystemUtils::getTotalVideoMemory() for Windows 2015-12-23 14:48:33 +01:00
kervala
c25320a998 Fixed: Target at least Windows 2000 2015-12-23 14:47:11 +01:00
kervala
92035e59b2 Changed: Add getTotalVideoMemory to IDriver to query total video memory 2015-12-23 14:36:16 +01:00
Nimetu
bd82444d65 Merge with develop 2015-12-22 01:30:11 +02:00
Nimetu
4ec1d486df Fixed: Crash when div was following p element 2015-12-22 01:29:53 +02:00
kervala
19457b07a6 Merge with develop 2015-12-21 18:20:39 +01:00
kervala
7cf63f2b80 Changed: Forgot to change RYZOM_GAMES_PREFIX 2015-12-21 18:20:04 +01:00
kervala
dc4cefff2b Changed: Only copy installscript_osx.vdf for Steam client 2015-12-21 17:46:38 +01:00
kervala
4174e2c6a6 Merge with develop 2015-12-21 17:39:49 +01:00
kervala
330ffa860d Changed: Only copy installscript_osx.vdf in compatibility branch 2015-12-21 17:34:09 +01:00
kervala
84f8628385 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg 2015-12-21 17:33:32 +01:00
kervala
607a92dae6 Changed: Minor changes 2015-12-21 17:32:05 +01:00
kervala
90185f7682 Fixed: use PatchUrl instead of PatchServer in ryzom_client_patcher 2015-12-21 17:31:14 +01:00
kervala
575f7aa6db Changed: Minor changes 2015-12-21 17:29:34 +01:00
kervala
6cefa245d9 Changed: Add WITH_UNIX_STRUCTURE to use UNIX structure (bin, etc, share, etc...) 2015-12-21 17:05:18 +01:00
kervala
30b6d87948 Changed: Remove PatchServer because unused 2015-12-21 16:29:58 +01:00
kervala
e67aa43d49 Merge with develop 2015-12-21 14:21:08 +01:00
kervala
ec1ee961e8 Fixed: Compilation with Qt 5 static under Linux 2015-12-21 14:20:36 +01:00
kervala
525dc67767 Changed: Updated translations 2015-12-21 14:19:49 +01:00
kervala
bc5cbf4d31 Merge with develop 2015-12-20 19:26:36 +01:00
kervala
5060102810 Changed: Only display flushDebugStack messages if DisableNLDebug is not set 2015-12-20 19:10:33 +01:00
kervala
1ecdfcd6a2 Changed: Typo 2015-12-20 19:09:18 +01:00
kervala
fc7a5ad63f Changed: Preparation of future binary patching (each supported platform has its own BNP with binaries) 2015-12-20 19:08:52 +01:00
kervala
8f36a2c1e8 Changed: Some improvements (only try to fix wrong filenames if right files don't exist) 2015-12-20 19:06:38 +01:00
kervala
25110257d4 Changed: Also fix medium and heavy boots with a dress 2015-12-20 18:59:45 +01:00
kervala
392f78afe7 Changed: Revert back PreDataPath directories 2015-12-20 18:56:23 +01:00
kervala
134fb4f97d Merge with develop 2015-12-20 11:21:40 +01:00
kervala
bb98346cc4 Changed: Minor changes 2015-12-20 11:19:51 +01:00
kervala
00259ef7e7 Changed: Simplified code 2015-12-20 11:18:53 +01:00
kervala
68283bc2ed Changed: Only display this warning in debug, because occurs when underwears are equipped 2015-12-20 11:18:01 +01:00
kervala
35926ab60f Changed: There is no client_default.cfg.in anymore 2015-12-20 11:14:13 +01:00
kervala
36e392e589 Changed: Translate comment in english 2015-12-20 11:13:08 +01:00
kervala
8c74c82c75 Changed: Remove old equivalent code 2015-12-20 11:12:44 +01:00
kervala
5326a43285 Fixed: Use white color for underwears everywhere (even if it's a bug in EGS...)
Changed: Don't call applyColorSlot twice if item exists
2015-12-20 11:12:01 +01:00
kervala
8880bf0049 Fixed: Use correct shape for boots when caster dress is equipped 2015-12-20 11:09:41 +01:00
kervala
c1e02bbb8f Fixed: Wrong default shape names 2015-12-20 11:08:15 +01:00
kervala
0b5988322e Changed: Updated translations 2015-12-20 09:50:48 +01:00
Nimetu
bda8b871ae Merge with develop 2015-12-20 03:34:00 +02:00
Nimetu
77d58f4553 Fixed: Stuck scrollbar 2015-12-20 03:33:43 +02:00
Nimetu
502d6d5240 Merge with develop 2015-12-19 20:40:05 +02:00
Nimetu
fb84d534cc Fixed: Incorrect vertical spacing between block style elements 2015-12-18 21:23:18 +02:00
Nimetu
a7ec7dfcbb Changed: Render p and div as block level elements 2015-12-19 20:39:40 +02:00
Nimetu
b5f70a462d Fixed: Timestamps in chat not visible after switching characters 2015-12-19 20:39:33 +02:00
kervala
feab3124cd Merge 2015-12-18 18:09:00 +01:00
kervala
34e82238aa Merge 2015-12-18 18:07:51 +01:00
kervala
4c581963c1 Merge with develop 2015-12-18 18:07:11 +01:00
kervala
5488aa23bf Changed: Updated translations 2015-12-18 18:06:28 +01:00
Nimetu
9f936d7a3f Merge with develop 2015-12-18 14:34:48 +02:00
Nimetu
e510db5c31 Fixed: Table colspan overwrites previous row column width 2015-12-18 14:29:40 +02:00
Nimetu
4e329f0e55 Added: html TH element 2015-12-18 14:29:40 +02:00
Nimetu
5f2ab721f7 Added html HR element 2015-12-18 14:29:40 +02:00
Nimetu
7af6be7118 Added: html OL list 2015-12-18 14:29:40 +02:00
kervala
2eb90a71f7 Changed: Synchronization with private repository 2015-12-18 13:05:11 +01:00
kervala
8dae5b723c Changed: Updated translations 2015-12-18 13:02:31 +01:00
kervala
8d66d56bb6 Merge with develop 2015-12-17 14:37:24 +01:00
kervala
4fcf286b44 Changed: Minor changes 2015-12-17 14:36:51 +01:00
kervala
e7fb9df922 Changed: Replace NLMISC::strupr by NLMISC::toUpper 2015-12-17 14:36:33 +01:00
kervala
7af56ceb40 Changed: Replace more ~0 by std::numeric_limits<*>::max() some changes from private repository 2015-12-17 14:35:48 +01:00
kervala
3fbced3812 Merge with develop 2015-12-17 13:04:56 +01:00
kervala
3f561ac3f8 Changed: Replace more ~0 by std::numeric_limits<*>::max() 2015-12-17 13:03:21 +01:00
kervala
208ea556aa Changed: Improve errors reporting 2015-12-17 13:02:12 +01:00
kervala
2cf73a9c21 Fixed: Typos 2015-12-17 12:51:26 +01:00
kervala
ad3e425e3e Changed: Minor changes 2015-12-17 12:48:57 +01:00
kervala
339786af56 Changed: Updated translations 2015-12-17 08:51:45 +01:00
kervala
a2a2fa7877 Merge with develop 2015-12-16 14:51:18 +01:00
kervala
39f838a1fd Fixed: loadPNG with RGB images was returning 32 2015-12-16 14:50:40 +01:00
kervala
153fc530e2 Merge with develop 2015-12-16 08:01:00 +01:00
kervala
5b21d864a7 Fixed: Don't install libraries if WITH_INSTALL_LIBRARIES off 2015-12-16 08:00:27 +01:00
kervala
c82e1ff022 Changed: Disable useless message 2015-12-16 08:00:06 +01:00
kervala
af7d8ae34d Merge with develop 2015-12-16 00:07:51 +01:00
kervala
5971858a5d Fixed: Compilation under Linux 2015-12-16 00:07:20 +01:00
kervala
d4cc4b391d Changed: Updated translations 2015-12-15 23:16:49 +01:00
kervala
6ac8c6abdb Merge with develop 2015-12-15 22:52:28 +01:00
kervala
da367306cb Fixed: Install ryzom_configuration_qt in RYZOM_GAMES_PREFIX 2015-12-15 22:51:55 +01:00
kervala
7311a5b9b9 Changed: Include limits 2015-12-15 22:51:37 +01:00
kervala
2694b0d560 Changed: Updated translations 2015-12-15 18:50:25 +01:00
kervala
a78aebce12 Merge with develop 2015-12-15 18:46:51 +01:00
kervala
6f59be0acb Fixed: Wrong cases 2015-12-15 18:46:15 +01:00
kervala
2e9a8e882f Merge with develop 2015-12-15 18:29:39 +01:00
kervala
0943667a57 Fixed: Allow to find Windows SDK libraries in lib/amd64 too 2015-12-15 18:28:50 +01:00
kervala
4474d79282 Changed: Updated translations 2015-12-15 15:18:11 +01:00
kervala
7c5222ec52 Merge with develop 2015-12-15 15:09:50 +01:00
kervala
a9af6c7830 Fixed: Clang warning 2015-12-15 15:08:54 +01:00
kervala
dc2c80d25c Fixed: Use NELID16 macros 2015-12-15 15:05:31 +01:00
kervala
896262659c Fixed: Allow to sign OS X bundles with APPLE_CERTIFICATE 2015-12-15 15:03:42 +01:00
kervala
e382e2c781 Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max() 2015-12-15 14:33:59 +01:00
kervala
3b07ad440d Changed: Minor changes 2015-12-15 14:07:32 +01:00
kervala
c20346238a Fixed: Implement launch of executables under OS X 2015-12-15 14:06:49 +01:00
kervala
7b9050d439 Changed: Replace atoi by fromString 2015-12-15 14:05:56 +01:00
kervala
89d2034edc Changed: Updates CMake modules 2015-12-15 13:41:27 +01:00
kervala
2187bc3f1e Fixed: Include directories with Qt 5 CMake modules in PCH 2015-12-15 13:41:07 +01:00
kervala
180ef53f43 Fixed: _PatchDirectory already has a trailing slash 2015-12-15 13:40:12 +01:00
kervala
a09a5be6d1 Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord 2015-12-15 13:39:40 +01:00
kervala
076af98123 Changed: Minor changes 2015-12-15 13:39:02 +01:00
kervala
68f5cb447f Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord 2015-12-15 13:35:04 +01:00
Nimetu
9759c2e631 Added: Translation for uiRadarUseCamera option 2015-12-15 12:23:35 +02:00
Nimetu
00255a5bc1 Merge with develop 2015-12-15 12:27:11 +02:00
Nimetu
573568c702 Added: Option to set radar to follow camera 2015-12-15 12:22:47 +02:00
kervala
8fbadb2c20 Merge 2015-12-13 20:35:21 +01:00
kervala
148e734329 Merge 2015-12-13 20:34:16 +01:00
kervala
6e1dafd51c Merge with develop 2015-12-13 20:32:17 +01:00
kervala
36f6fedd4f Changed: Minor changes 2015-12-13 20:23:58 +01:00
kervala
659842651d Fixed: Wrong copyFile and moveFile syntax 2015-12-13 20:23:08 +01:00
Nimetu
d384d2e919 Added: Translation for 12-hour clock options 2015-12-13 21:08:22 +02:00
Nimetu
fbd70a924f Merge with develop 2015-12-13 21:04:37 +02:00
Nimetu
8fe317727b Changed: Attach dyn chat to main chat as default. 2015-12-13 21:02:25 +02:00
Nimetu
02b5c3e4ed Added: 12-hour clock in radar and chat 2015-12-13 21:01:56 +02:00
Nimetu
e98bc5daee Changed: Display inventory bulk with two decimal places 2015-12-13 21:01:13 +02:00
kervala
c938092faf Merge with develop 2015-12-13 15:26:37 +01:00
kervala
542c29ded7 Fixed: Clang warnings 2015-12-13 15:25:28 +01:00
kervala
ae5457d717 Fixed: Removed unneeded operator for CSString (compilation fails with VC++ 2010 without STLport) 2015-12-13 14:21:20 +01:00
kervala
0bfc783142 Fixed: New LZMA syntax under Linux 2015-12-13 13:19:55 +01:00
kervala
fd3e147574 Changed: Real executable name for client_config_qt 2015-12-13 13:11:02 +01:00
kervala
c744716973 Fixed: Compilation of some tools with Qt 5 in static 2015-12-13 13:09:25 +01:00
kervala
451823bda9 Fixed: Compile crash_report and ryzom_configuration if WITH_RYZOM_CLIENT is set 2015-12-13 13:06:23 +01:00
kervala
bf73907da1 Fixed: Homogenize CFile::moveFile with other methods (use std::string instead of const char*) 2015-12-13 13:03:16 +01:00
kervala
b6310c8c26 Merge with develop 2015-12-12 15:02:07 +01:00
kervala
4c122318f4 Fixed: Typos again 2015-12-12 15:01:36 +01:00
kervala
b6969005e6 Merge with develop 2015-12-12 14:35:05 +01:00
kervala
3bbf7cb564 Fixed: Typo 2015-12-12 14:32:08 +01:00
kervala
67e968705d Changed: Updated translations 2015-12-12 12:16:33 +01:00
kervala
e3076519a4 Merge with develop 2015-12-12 11:33:59 +01:00
kervala
a276481492 Fixed: Typo 2015-12-12 11:26:55 +01:00
kervala
a2d32e684a Changed: Added new variable DumpVisualSlotsIndex to choose if we need to dump all visual slots index in vs_index.txt 2015-12-12 11:24:01 +01:00
kervala
17bf199157 Changed: Install sheets_packer.cfg too 2015-12-12 11:13:41 +01:00
kervala
728eecc08b Changed: Check for alternative directories 2015-12-12 11:12:38 +01:00
kervala
7e6f04c343 Changed: Don't need to write absolute directories in client_default.cfg, because everything must be relocatable 2015-12-12 11:07:00 +01:00
kervala
c2fa7e4137 Merge with develop 2015-12-11 20:21:56 +01:00
kervala
0f9bd76e63 Changed: Sort dictionary keys 2015-12-11 20:21:17 +01:00