Commit graph

5532 commits

Author SHA1 Message Date
kervala
7a0c06a845 Merge with develop
--HG--
branch : compatibility-develop
2015-12-26 15:13:08 +01:00
kervala
478a2102b8 Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 15:12:41 +01:00
kervala
28df949870 Fixed: Forgot to link to PlatformSupport under other platforms
--HG--
branch : develop
2015-12-26 15:12:29 +01:00
kervala
4806693f49 Merge with develop
--HG--
branch : compatibility-develop
2015-12-26 14:38:37 +01:00
kervala
a8383e8f0f Changed: Use entity textures cache size depending on video memory
--HG--
branch : develop
2015-12-26 14:37:53 +01:00
kervala
ba6f66d310 Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 14:10:27 +01:00
kervala
af0eabbdea Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 14:09:15 +01:00
kervala
83ef24dab7 Changed: Renamed screenH and screenW to _ScreenH and _ScreenW
--HG--
branch : develop
2015-12-26 14:02:01 +01:00
kervala
d7255a63d8 Changed: Minor changes
--HG--
branch : develop
2015-12-26 14:00:39 +01:00
kervala
ec86bdcf96 Changed: Force 32 bits depth with XRandr
--HG--
branch : develop
2015-12-26 13:38:09 +01:00
kervala
cbea85c105 Changed: Implement CSystemUtils::getTotalVideoMemory() under Linux (Xorg log and lspci parsing)
--HG--
branch : develop
2015-12-26 13:28:09 +01:00
kervala
2006f1a866 Fixed: GCC warnings
--HG--
branch : develop
2015-12-26 13:26:51 +01:00
kervala
9b5c426c19 Merged with develop
--HG--
branch : compatibility-develop
2015-12-25 20:52:18 +01:00
kervala
2d0d87a05e Fixed: Warnings with GCC
--HG--
branch : develop
2015-12-25 20:49:59 +01:00
kervala
d999e4a3bd Merge with develop
--HG--
branch : compatibility-develop
2015-12-25 18:02:13 +01:00
kervala
1f2678eb10 Fixed: Warnings compiling with Qt 5
--HG--
branch : develop
2015-12-25 18:00:37 +01:00
kervala
1be6901176 Fixed: Link errors under Linux
--HG--
branch : develop
2015-12-25 17:59:41 +01:00
kervala
86a903c96e Merge with develop
--HG--
branch : compatibility-develop
2015-12-25 15:37:07 +01:00
kervala
4a1f4cd725 Changed: Use shared libs for X11 because API doesn't change
--HG--
branch : develop
2015-12-25 15:35:04 +01:00
kervala
cbc1acfcd2 Fixed: Link order with Qt 5 static under Linux
--HG--
branch : develop
2015-12-25 15:33:03 +01:00
kervala
75d16f7054 Fixed: Define QT_NO_DEBUG in Release with Qt 5 also in PCH
--HG--
branch : develop
2015-12-25 15:31:34 +01:00
kervala
21ada78b63 Changed: Display a warning when calling getModes if Display is NULL
--HG--
branch : develop
2015-12-25 15:30:14 +01:00
kervala
a5d3b2d461 Changed: Added new function getCommandOutput
--HG--
branch : develop
2015-12-25 15:29:23 +01:00
kervala
b68f217274 Fixed: client_config_qt needs QXcbGlxIntegrationPlugin in static
--HG--
branch : develop
2015-12-25 15:28:11 +01:00
kervala
2c6d4b6a50 Fixed: Frequency checks useless because it can be 0 or a wrong value, 16 bits depth requirement
--HG--
branch : develop
2015-12-25 15:26:32 +01:00
kervala
be0951f21f Fixed: Need to initialize OpenGL driver
--HG--
branch : develop
2015-12-25 15:25:08 +01:00
kervala
b6cf535fb0 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-23 23:11:59 +01:00
kervala
59c0cf7f00 Merge with develop
--HG--
branch : compatibility-develop
2015-12-23 15:31:37 +01:00
kervala
a86a013a16 Fixed: Warning when $json was empty (but perhaps we should fix the real reason...)
--HG--
branch : develop
2015-12-23 15:30:52 +01:00
kervala
cfd905b4a9 Changed: Replace ~0u by std::numeric_limits<uint>::max()
--HG--
branch : develop
2015-12-23 15:30:12 +01:00
kervala
4694ca2580 Fixed: Colors are on 3 bits (colors goes from 0 to 7) so 254 was converted to 6 (white)
--HG--
branch : develop
2015-12-23 15:28:33 +01:00
kervala
4fa6247672 Changed: windows.h already included in stdligo.h
--HG--
branch : develop
2015-12-23 15:23:50 +01:00
kervala
f1cc782223 Changed: Need more checks before using getTotalVideoMemory()
--HG--
branch : develop
2015-12-23 15:22:06 +01:00
kervala
36358cef50 Fixed: Wrong units (1 KiB = 1024 B, 1 KB = 1000 B, etc...)
--HG--
branch : develop
2015-12-23 15:11:26 +01:00
kervala
dd69f64225 Changed: Use a stack size of 1 MiB under all platforms for CCoTask (default under Windows)
--HG--
branch : develop
2015-12-23 15:10:06 +01:00
kervala
55feca30d7 Changed: Use nlSleep instead of usleep
--HG--
branch : develop
2015-12-23 15:08:08 +01:00
kervala
4061826715 Changed: Use _LP64 macro instead of sizeof(long unsigned int) == 8
--HG--
branch : develop
2015-12-23 15:04:22 +01:00
kervala
ffe0571a12 Changed: Use nlwarning instead of nlerror
--HG--
branch : develop
2015-12-23 15:03:32 +01:00
kervala
360a634f5b Changed: Don't need to use XDG_CURRENT_DESKTOP under OS X
--HG--
branch : develop
2015-12-23 15:03:08 +01:00
kervala
5d64a01f58 Fixed: Use Xcb plugin for Qt 5 under Linux
--HG--
branch : develop
2015-12-23 15:00:49 +01:00
kervala
09e22e292d Changed: Use toString instead of sprintf
--HG--
branch : develop
2015-12-23 14:56:36 +01:00
kervala
f57b1b9421 Changed: Implement CSystemUtils::getTotalVideoMemory() for Windows
--HG--
branch : develop
2015-12-23 14:48:33 +01:00
kervala
07a1285740 Fixed: Target at least Windows 2000
--HG--
branch : develop
2015-12-23 14:47:11 +01:00
kervala
72af4052ee Changed: Add getTotalVideoMemory to IDriver to query total video memory
--HG--
branch : develop
2015-12-23 14:36:16 +01:00
Nimetu
bed1d04f6f Merge with develop
--HG--
branch : compatibility-develop
2015-12-22 01:30:11 +02:00
Nimetu
f4d47f27aa Fixed: Crash when div was following p element
--HG--
branch : develop
2015-12-22 01:29:53 +02:00
kervala
8965a4d7a5 Merge with develop
--HG--
branch : compatibility-develop
2015-12-21 18:20:39 +01:00
kervala
016390446d Changed: Forgot to change RYZOM_GAMES_PREFIX
--HG--
branch : develop
2015-12-21 18:20:04 +01:00
kervala
806a6d21ab Changed: Only copy installscript_osx.vdf for Steam client
--HG--
branch : compatibility-develop
2015-12-21 17:46:38 +01:00
kervala
5bc5527fd6 Merge with develop
--HG--
branch : compatibility-develop
2015-12-21 17:39:49 +01:00
kervala
5cf0fd10af Changed: Only copy installscript_osx.vdf in compatibility branch
--HG--
branch : develop
2015-12-21 17:34:09 +01:00
kervala
fb98ffe809 Changed: Added WITH_RYZOM_CUSTOM_PATCH_SERVER that allows to give priority to PatchUrl defined in client.cfg
--HG--
branch : develop
2015-12-21 17:33:32 +01:00
kervala
93225c6495 Changed: Minor changes
--HG--
branch : develop
2015-12-21 17:32:05 +01:00
kervala
9bc4534660 Fixed: use PatchUrl instead of PatchServer in ryzom_client_patcher
--HG--
branch : develop
2015-12-21 17:31:14 +01:00
kervala
f88fd7719c Changed: Minor changes
--HG--
branch : develop
2015-12-21 17:29:34 +01:00
kervala
1b2e607d5d Changed: Add WITH_UNIX_STRUCTURE to use UNIX structure (bin, etc, share, etc...)
--HG--
branch : develop
2015-12-21 17:05:18 +01:00
kervala
3f329aacf7 Changed: Remove PatchServer because unused
--HG--
branch : develop
2015-12-21 16:29:58 +01:00
kervala
0d82e4ad7f Merge with develop
--HG--
branch : compatibility-develop
2015-12-21 14:21:08 +01:00
kervala
7ca5e7acf6 Fixed: Compilation with Qt 5 static under Linux
--HG--
branch : develop
2015-12-21 14:20:36 +01:00
kervala
335f5329ee Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-21 14:19:49 +01:00
kervala
d7e9922dd7 Merge with develop
--HG--
branch : compatibility-develop
2015-12-20 19:26:36 +01:00
kervala
296ca5133f Changed: Only display flushDebugStack messages if DisableNLDebug is not set
--HG--
branch : develop
2015-12-20 19:10:33 +01:00
kervala
68b23fe50f Changed: Typo
--HG--
branch : develop
2015-12-20 19:09:18 +01:00
kervala
71d3ea8a37 Changed: Preparation of future binary patching (each supported platform has its own BNP with binaries)
--HG--
branch : develop
2015-12-20 19:08:52 +01:00
kervala
2cbcb2735e Changed: Some improvements (only try to fix wrong filenames if right files don't exist)
--HG--
branch : develop
2015-12-20 19:06:38 +01:00
kervala
ae19cfe5eb Changed: Also fix medium and heavy boots with a dress
--HG--
branch : develop
2015-12-20 18:59:45 +01:00
kervala
f4c853d922 Changed: Revert back PreDataPath directories
--HG--
branch : compatibility-develop
2015-12-20 18:56:23 +01:00
kervala
eb60aa4446 Merge with develop
--HG--
branch : compatibility-develop
2015-12-20 11:21:40 +01:00
kervala
08671a2c57 Changed: Minor changes
--HG--
branch : develop
2015-12-20 11:19:51 +01:00
kervala
c0a3345c83 Changed: Simplified code
--HG--
branch : develop
2015-12-20 11:18:53 +01:00
kervala
f04ebac483 Changed: Only display this warning in debug, because occurs when underwears are equipped
--HG--
branch : develop
2015-12-20 11:18:01 +01:00
kervala
935809b40f Changed: There is no client_default.cfg.in anymore
--HG--
branch : develop
2015-12-20 11:14:13 +01:00
kervala
ad981b15c7 Changed: Translate comment in english
--HG--
branch : develop
2015-12-20 11:13:08 +01:00
kervala
08205daacc Changed: Remove old equivalent code
--HG--
branch : develop
2015-12-20 11:12:44 +01:00
kervala
d67d831afe Fixed: Use white color for underwears everywhere (even if it's a bug in EGS...)
Changed: Don't call applyColorSlot twice if item exists

--HG--
branch : develop
2015-12-20 11:12:01 +01:00
kervala
f51b33cc3b Fixed: Use correct shape for boots when caster dress is equipped
--HG--
branch : develop
2015-12-20 11:09:41 +01:00
kervala
fcda945608 Fixed: Wrong default shape names
--HG--
branch : develop
2015-12-20 11:08:15 +01:00
kervala
3b985311e0 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-20 09:50:48 +01:00
Nimetu
df07403586 Merge with develop
--HG--
branch : compatibility-develop
2015-12-20 03:34:00 +02:00
Nimetu
b06d8bb039 Fixed: Stuck scrollbar
--HG--
branch : develop
2015-12-20 03:33:43 +02:00
Nimetu
67eee7f3dd Merge with develop
--HG--
branch : compatibility-develop
2015-12-19 20:40:05 +02:00
Nimetu
e68d6f83fe Fixed: Incorrect vertical spacing between block style elements
--HG--
branch : develop
2015-12-18 21:23:18 +02:00
Nimetu
5e61995c3c Changed: Render p and div as block level elements
--HG--
branch : develop
2015-12-19 20:39:40 +02:00
Nimetu
73d010ca6b Fixed: Timestamps in chat not visible after switching characters
--HG--
branch : develop
2015-12-19 20:39:33 +02:00
kervala
1863f91782 Merge
--HG--
branch : develop
2015-12-18 18:09:00 +01:00
kervala
664fef5c59 Merge
--HG--
branch : compatibility-develop
2015-12-18 18:07:51 +01:00
kervala
83bdc24c1f Merge with develop
--HG--
branch : compatibility-develop
2015-12-18 18:07:11 +01:00
kervala
12da01085f Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-18 18:06:28 +01:00
Nimetu
193abf876b Merge with develop
--HG--
branch : compatibility-develop
2015-12-18 14:34:48 +02:00
Nimetu
bcae216816 Fixed: Table colspan overwrites previous row column width
--HG--
branch : develop
2015-12-18 14:29:40 +02:00
Nimetu
fe476d4872 Added: html TH element
--HG--
branch : develop
2015-12-18 14:29:40 +02:00
Nimetu
2eb56b6460 Added html HR element
--HG--
branch : develop
2015-12-18 14:29:40 +02:00
Nimetu
045a6471fe Added: html OL list
--HG--
branch : develop
2015-12-18 14:29:40 +02:00
kervala
2a86e317be Changed: Synchronization with private repository
--HG--
branch : develop
2015-12-18 13:05:11 +01:00
kervala
ec4dea9975 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-18 13:02:31 +01:00
kervala
b1885e9783 Merge with develop
--HG--
branch : compatibility-develop
2015-12-17 14:37:24 +01:00
kervala
b2927175c3 Changed: Minor changes
--HG--
branch : develop
2015-12-17 14:36:51 +01:00
kervala
80581347a4 Changed: Replace NLMISC::strupr by NLMISC::toUpper
--HG--
branch : develop
2015-12-17 14:36:33 +01:00
kervala
613150e5bc Changed: Replace more ~0 by std::numeric_limits<*>::max() some changes from private repository
--HG--
branch : develop
2015-12-17 14:35:48 +01:00
kervala
1e9092a385 Merge with develop
--HG--
branch : compatibility-develop
2015-12-17 13:04:56 +01:00
kervala
d187138099 Changed: Replace more ~0 by std::numeric_limits<*>::max()
--HG--
branch : develop
2015-12-17 13:03:21 +01:00
kervala
ad93a9005f Changed: Improve errors reporting
--HG--
branch : develop
2015-12-17 13:02:12 +01:00
kervala
a22e056de1 Fixed: Typos
--HG--
branch : develop
2015-12-17 12:51:26 +01:00
kervala
5efaa8360f Changed: Minor changes
--HG--
branch : develop
2015-12-17 12:48:57 +01:00
kervala
d927ada0ae Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-17 08:51:45 +01:00
kervala
23ffb50cf1 Merge with develop
--HG--
branch : compatibility-develop
2015-12-16 14:51:18 +01:00
kervala
75eceb9b24 Fixed: loadPNG with RGB images was returning 32
--HG--
branch : develop
2015-12-16 14:50:40 +01:00
kervala
9b337a064b Merge with develop
--HG--
branch : compatibility-develop
2015-12-16 08:01:00 +01:00
kervala
175af88d67 Fixed: Don't install libraries if WITH_INSTALL_LIBRARIES off
--HG--
branch : develop
2015-12-16 08:00:27 +01:00
kervala
a3b6e87b0d Changed: Disable useless message
--HG--
branch : develop
2015-12-16 08:00:06 +01:00
kervala
92fde75ea0 Merge with develop
--HG--
branch : compatibility-develop
2015-12-16 00:07:51 +01:00
kervala
394884ffd9 Fixed: Compilation under Linux
--HG--
branch : develop
2015-12-16 00:07:20 +01:00
kervala
56052cd908 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-15 23:16:49 +01:00
kervala
050a3679f1 Merge with develop
--HG--
branch : compatibility-develop
2015-12-15 22:52:28 +01:00
kervala
ec8d9ea266 Fixed: Install ryzom_configuration_qt in RYZOM_GAMES_PREFIX
--HG--
branch : develop
2015-12-15 22:51:55 +01:00
kervala
7105749d94 Changed: Include limits
--HG--
branch : develop
2015-12-15 22:51:37 +01:00
kervala
f305a1f832 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-15 18:50:25 +01:00
kervala
9135ed66cf Merge with develop
--HG--
branch : compatibility-develop
2015-12-15 18:46:51 +01:00
kervala
e486cac363 Fixed: Wrong cases
--HG--
branch : develop
2015-12-15 18:46:15 +01:00
kervala
b079810b86 Merge with develop
--HG--
branch : compatibility-develop
2015-12-15 18:29:39 +01:00
kervala
651870a2c9 Fixed: Allow to find Windows SDK libraries in lib/amd64 too
--HG--
branch : develop
2015-12-15 18:28:50 +01:00
kervala
7ad47a3f91 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-15 15:18:11 +01:00
kervala
0e63e81565 Merge with develop
--HG--
branch : compatibility-develop
2015-12-15 15:09:50 +01:00
kervala
4e8ba88046 Fixed: Clang warning
--HG--
branch : develop
2015-12-15 15:08:54 +01:00
kervala
b170168295 Fixed: Use NELID16 macros
--HG--
branch : develop
2015-12-15 15:05:31 +01:00
kervala
3b3b1d0d4c Fixed: Allow to sign OS X bundles with APPLE_CERTIFICATE
--HG--
branch : develop
2015-12-15 15:03:42 +01:00
kervala
3a3a8752d1 Changed: Replace (uint16)~0 by std::numeric_limits<uint16>::max()
--HG--
branch : develop
2015-12-15 14:33:59 +01:00
kervala
a550f2c760 Changed: Minor changes
--HG--
branch : develop
2015-12-15 14:07:32 +01:00
kervala
70196d2f90 Fixed: Implement launch of executables under OS X
--HG--
branch : develop
2015-12-15 14:06:49 +01:00
kervala
bc12a142c8 Changed: Replace atoi by fromString
--HG--
branch : develop
2015-12-15 14:05:56 +01:00
kervala
1ab5357804 Changed: Updates CMake modules
--HG--
branch : develop
2015-12-15 13:41:27 +01:00
kervala
c1716ae3db Fixed: Include directories with Qt 5 CMake modules in PCH
--HG--
branch : develop
2015-12-15 13:41:07 +01:00
kervala
2064fa2699 Fixed: _PatchDirectory already has a trailing slash
--HG--
branch : develop
2015-12-15 13:40:12 +01:00
kervala
a680c7d83b Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
--HG--
branch : develop
2015-12-15 13:39:40 +01:00
kervala
189fc7a2d9 Changed: Minor changes
--HG--
branch : develop
2015-12-15 13:39:02 +01:00
kervala
84831a4b34 Changed: Use std::string insteaf of const char* for filenames in CPersistentDataRecord
--HG--
branch : develop
2015-12-15 13:35:04 +01:00
Nimetu
9d3ac48137 Added: Translation for uiRadarUseCamera option
--HG--
branch : compatibility-develop
2015-12-15 12:23:35 +02:00
Nimetu
f3223d268e Merge with develop
--HG--
branch : compatibility-develop
2015-12-15 12:27:11 +02:00
Nimetu
55b46c5c76 Added: Option to set radar to follow camera
--HG--
branch : develop
2015-12-15 12:22:47 +02:00
kervala
5afda00594 Merge
--HG--
branch : develop
2015-12-13 20:35:21 +01:00
kervala
dcd5b3b325 Merge
--HG--
branch : compatibility-develop
2015-12-13 20:34:16 +01:00
kervala
0ff606bfe2 Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 20:32:17 +01:00
kervala
7977ef5903 Changed: Minor changes
--HG--
branch : develop
2015-12-13 20:23:58 +01:00
kervala
8b9098b5d5 Fixed: Wrong copyFile and moveFile syntax
--HG--
branch : develop
2015-12-13 20:23:08 +01:00
Nimetu
5ddc59f696 Added: Translation for 12-hour clock options
--HG--
branch : compatibility-develop
2015-12-13 21:08:22 +02:00
Nimetu
6746f163bd Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 21:04:37 +02:00
Nimetu
0f34e0ea91 Changed: Attach dyn chat to main chat as default.
--HG--
branch : develop
2015-12-13 21:02:25 +02:00
Nimetu
a64709552c Added: 12-hour clock in radar and chat
--HG--
branch : develop
2015-12-13 21:01:56 +02:00
Nimetu
3895644589 Changed: Display inventory bulk with two decimal places
--HG--
branch : develop
2015-12-13 21:01:13 +02:00
kervala
74f297f588 Merge with develop
--HG--
branch : compatibility-develop
2015-12-13 15:26:37 +01:00