Commit graph

2439 commits

Author SHA1 Message Date
kaetemi
d5654ad62e Fix bad printf parameters
--HG--
branch : develop
2016-01-15 16:42:21 +01:00
kaetemi
53b62c66d2 More of that VS2015 magic
--HG--
branch : develop
2016-01-15 16:17:23 +01:00
kaetemi
5c6edf6cee And more VS2015 fixes
--HG--
branch : develop
2016-01-15 12:33:27 +01:00
kaetemi
e4b72e63a1 More of the VS2015 stuff
--HG--
branch : develop
2016-01-15 12:29:05 +01:00
kervala
563f92d27b Fixed: Use language name in native language in config window
--HG--
branch : compatibility-develop
2016-01-14 22:42:34 +01:00
kervala
f820e7b703 Merge with develop
--HG--
branch : compatibility-develop
2016-01-14 21:28:47 +01:00
kervala
cb26d897ae Fixed: Warning with clang
--HG--
branch : develop
2016-01-14 21:27:42 +01:00
kervala
27ae7dddf0 Fixed: Right directory under OS X
--HG--
branch : develop
2016-01-14 21:27:10 +01:00
kervala
7d9a8b28c8 Fixed: Don't display D3D page under Linux and OS X
--HG--
branch : develop
2016-01-14 21:26:47 +01:00
kervala
7f5a9f4d91 Merge with develop
--HG--
branch : compatibility-develop
2016-01-14 10:22:22 +01:00
kervala
c8c563807d Fixed: Compilation under OS X
--HG--
branch : develop
2016-01-14 10:21:50 +01:00
kervala
3c4f324bfe Merge with develop
--HG--
branch : compatibility-develop
2016-01-13 20:05:06 +01:00
kervala
bcb1aa242d Fixed: Use map for faster search for example (implemented a TODO of GUIGUI)
--HG--
branch : develop
2016-01-13 20:04:01 +01:00
kervala
ea8edd1e6a Changed: Replace \\ by /
--HG--
branch : develop
2016-01-13 20:02:24 +01:00
kervala
3bb45d4f2b Fixed: Remove some hardcoded paths and replaced them by LeveldesignDataPath variable
--HG--
branch : develop
2016-01-13 20:01:36 +01:00
kervala
57f216dc3e Changed: Expand environment variables in paths read from cfg files
--HG--
branch : develop
2016-01-13 19:59:09 +01:00
kervala
bd5f838d6d Changed: Minor changes
--HG--
branch : develop
2016-01-13 19:54:23 +01:00
kervala
a4dd37efc9 Changed: Try different alternative paths for game folders
--HG--
branch : develop
2016-01-13 19:52:58 +01:00
kervala
df816b2a5d Merge with develop
--HG--
branch : compatibility-develop
2016-01-12 22:32:22 +01:00
kervala
6ec0ab01cf Changed: Init CLoginProgressPostThread only if InstallStatsUrl is defined
--HG--
branch : develop
2016-01-12 22:31:06 +01:00
kervala
f3a971fc21 Merge with develop
--HG--
branch : compatibility-develop
2016-01-11 13:53:32 +01:00
kervala
7104a6cb29 Fixed: Wrong directory
--HG--
branch : develop
2016-01-11 13:53:01 +01:00
kervala
9a342f7acf Merge with develop
--HG--
branch : compatibility-develop
2016-01-11 12:55:47 +01:00
kervala
fc5e6ca982 Fixed: Error when signing bundle
--HG--
branch : develop
2016-01-11 12:55:09 +01:00
kervala
4c5de7f9b7 Merge with develop
--HG--
branch : compatibility-develop
2016-01-11 10:09:58 +01:00
kervala
d375038175 Fixed: Ryzom Configuration under OS X
--HG--
branch : develop
2016-01-11 10:09:10 +01:00
kervala
de5b3b478f Merge with develop
--HG--
branch : compatibility-develop
2016-01-09 19:42:29 +01:00
kervala
fe40e9e6b7 Fixed: Compilation
--HG--
branch : develop
2016-01-09 19:41:45 +01:00
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
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
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
45367135d5 Changed: Entraîneur instead of Moniteur
--HG--
branch : compatibility-develop
2016-01-07 15:33:46 +01:00
kervala
ef29c2b5ef Merge with develop
--HG--
branch : compatibility-develop
2016-01-06 23:22:57 +01:00
kervala
76dece0ec2 Changed: Minor changes
--HG--
branch : develop
2016-01-06 23:21:38 +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
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
ddba3e583c Merge with develop
--HG--
branch : compatibility-develop
2016-01-06 13:22:47 +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
64428d0018 Changed: Allow to debug Lua in FV too
--HG--
branch : develop
2016-01-06 12:38:10 +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
f482f77179 Fixed: GCC warnings
--HG--
branch : develop
2016-01-05 12:51:06 +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
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
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
cf89d60682 Merge with develop
--HG--
branch : compatibility-develop
2016-01-03 18:16:07 +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
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
47364c47c3 Merge with develop
--HG--
branch : compatibility-develop
2016-01-02 20:29:55 +01:00
kervala
844b1e3d02 Fixed: Warnings with GCC
--HG--
branch : develop
2016-01-02 19:19:39 +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
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
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
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
kervala
98c485bd94 Merge with develop
--HG--
branch : compatibility-develop
2015-12-29 18:03:21 +01:00
kervala
d5e74ca5c8 Fixed: Wrong check (if c is NULL, nothing is happening)
--HG--
branch : develop
2015-12-29 17:59:18 +01:00
kervala
c6927af7c0 Changed: Minor changes
--HG--
branch : develop
2015-12-29 16:39:37 +01:00
kervala
ef16bab62e Changed: Merge code from private repository
--HG--
branch : develop
2015-12-29 16:35:47 +01:00
kervala
88042cc28d Changed: Minor changes
--HG--
branch : develop
2015-12-29 16:19:46 +01:00
Nimetu
da34e717af Merge with develop
--HG--
branch : compatibility-develop
2015-12-29 15:03:12 +02:00
Nimetu
82afdecc72 Changed: Save screenshots with year-month-day info in filename
--HG--
branch : develop
2015-12-29 14:34:24 +02:00
kervala
aee315bda9 Merge with develop
--HG--
branch : compatibility-develop
2015-12-28 18:21:56 +01:00
kervala
4c0fc6074f Fixed: Set process name (fixes the <Unknown> under Linux and OS X)
--HG--
branch : develop
2015-12-28 18:13:37 +01:00
kervala
19cbbb2bec Changed: Don't create log.log anymore
--HG--
branch : develop
2015-12-28 18:12:45 +01:00
kervala
12ae39eb53 Changed: Updated translations
--HG--
branch : compatibility-develop
2015-12-28 10:32:15 +01:00
kervala
545569d049 Merge with develop
--HG--
branch : compatibility-develop
2015-12-26 18:00:04 +01:00
kervala
1928f6229c Fixed: Universe channel tab close
--HG--
branch : develop
2015-12-26 17:49:06 +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
d7255a63d8 Changed: Minor changes
--HG--
branch : develop
2015-12-26 14:00:39 +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
86a903c96e Merge with develop
--HG--
branch : compatibility-develop
2015-12-25 15:37:07 +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
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
f1cc782223 Changed: Need more checks before using getTotalVideoMemory()
--HG--
branch : develop
2015-12-23 15:22:06 +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
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
3f329aacf7 Changed: Remove PatchServer because unused
--HG--
branch : develop
2015-12-21 16:29:58 +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