Commit graph

2574 commits

Author SHA1 Message Date
kervala
487aca0979 Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 19:51:11 +01:00
kervala
72e1724b67 Changed: Use absolute path
--HG--
branch : develop
2016-02-02 19:50:04 +01:00
kervala
923434aa72 Changed: Detect .bat file in launchProgram and adapt syntax of CreateProcess
--HG--
branch : develop
2016-02-02 19:49:37 +01:00
kervala
0e0dbf688d Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 19:31:12 +01:00
kervala
27e7efca56 Changed: Use CCmdArgs for client_patcher
--HG--
branch : develop
2016-02-02 19:30:19 +01:00
kervala
5a57de43fa Changed: Simplify client_patcher
--HG--
branch : develop
2016-02-02 19:30:00 +01:00
kervala
d1252b44dd Changed: Convert unpackTo directories to absolute directories
--HG--
branch : develop
2016-02-02 19:28:47 +01:00
kervala
69b5157da5 Fixed: Use launchProgram to launch batch
--HG--
branch : develop
2016-02-02 19:28:10 +01:00
kervala
6ff327f99c Fixed: Use absolute paths in patch batch and escape all paths
Fixed: If not using batch file and unable to delete/move some files, use batch anyway only for these files

--HG--
branch : develop
2016-02-02 19:26:02 +01:00
kervala
32c7ee794d Changed: Use application or current directory as root directory for patch
--HG--
branch : develop
2016-02-02 19:22:25 +01:00
kervala
705173bce7 Changed: Minor changes
--HG--
branch : develop
2016-02-02 19:21:14 +01:00
kervala
3c75bdb82e Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 14:33:32 +01:00
kervala
be6168d8d6 Removed: Files for patcher
--HG--
branch : develop
2016-02-02 14:32:06 +01:00
kervala
dd695f0b1f Fixed: Compile seven_zip for tools
--HG--
branch : develop
2016-02-02 14:31:57 +01:00
kervala
6459d901ef Merge with develop
--HG--
branch : compatibility-develop
2016-02-02 12:37:59 +01:00
kervala
0979b19e8e Fixed: Use absolute path of current directory instead of relative path (avoid to check more than once the same location)
--HG--
branch : develop
2016-02-02 10:23:57 +01:00
kervala
31e6bd1bb1 Fixed: patch_gen is now using packLZMA function to compress a file instead of using lzma executable
--HG--
branch : develop
2016-02-02 10:22:47 +01:00
kervala
b3309951c4 Changed: Moved LZMA and 7z functions/methods in seven_zip
Changed: Removed old 7z/lzma code since the library has been updated
Fixed: Implemented packLZMA function to compress a file with LZMA

--HG--
branch : develop
2016-02-02 10:21:42 +01:00
kervala
cf7a1e589f Merge with develop
--HG--
branch : compatibility-develop
2016-01-30 20:45:19 +01:00
kervala
475864dac0 Fixed: Typo
--HG--
branch : develop
2016-01-30 20:44:33 +01:00
kervala
5bf17060c0 Fixed: Crash if spawnBot is NULL
--HG--
branch : develop
2016-01-30 20:44:25 +01:00
kervala
51b4f3e5ab Merge with develop
--HG--
branch : compatibility-develop
2016-01-30 18:16:16 +01:00
kervala
fc96bdf46d Fixed: AIS crash if variable not initialized (forgot to commit)
--HG--
branch : develop
2016-01-30 18:15:48 +01:00
kervala
782b410eef Merge with develop
--HG--
branch : compatibility-develop
2016-01-30 18:02:33 +01:00
kervala
e60b630d09 Changed: Minor changes
--HG--
branch : develop
2016-01-30 18:01:55 +01:00
kervala
b6f8fe80e9 Fixed: AIS crash if variable not initialized (a big thanks to depyraken to finding it)
--HG--
branch : develop
2016-01-30 18:01:27 +01:00
kervala
8cd6d46d1d Merge with develop
--HG--
branch : compatibility-develop
2016-01-30 16:23:28 +01:00
kervala
75307d00da Changed: Minor changes (thanks to SIELA1915)
--HG--
branch : develop
2016-01-30 16:22:55 +01:00
kervala
cffaaa7a77 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-01-30 14:31:45 +01:00
kervala
563e79d3b8 Fixed: Reverted translations fix in wk
--HG--
branch : compatibility-develop
2016-01-30 14:31:34 +01:00
kervala
5d26033ff8 Fixed: Reverted modified ID for translations
--HG--
branch : compatibility-develop
2016-01-30 14:31:13 +01:00
kervala
bd0da4d824 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-01-30 14:30:33 +01:00
kervala
885b8da55f Changed: Updated german translations
--HG--
branch : compatibility-develop
2016-01-28 17:12:53 +01:00
kervala
f0d6d70b8c merge with develop
--HG--
branch : compatibility-develop
2016-01-28 13:27:35 +01:00
kervala
178c1acc3b Changed: OS X bundles have app extension
--HG--
branch : develop
2016-01-28 13:27:08 +01:00
kervala
086401f5d1 Fixed: ReleaseDebug configuration not used anymore
--HG--
branch : develop
2016-01-28 13:26:45 +01:00
kervala
0b4a2a39b3 Fixed: Don't display D3D item in tree under Linux and OS X
--HG--
branch : develop
2016-01-28 13:26:02 +01:00
kervala
82274e7f99 Merge with develop
--HG--
branch : compatibility-develop
2016-01-27 15:16:44 +01:00
kervala
733f319c4f Fixed: Only call setCPUMask once
--HG--
branch : develop
2016-01-27 14:44:13 +01:00
kervala
3683193dde Fixed: Compilation of client_patcher
--HG--
branch : develop
2016-01-27 14:42:19 +01:00
kervala
ccfd1c9721 Merge with develop
--HG--
branch : compatibility-develop
2016-01-27 13:30:49 +01:00
kervala
63a36fc2f8 Changed: Removed libxml2 dependencies from other targets
--HG--
branch : develop
2016-01-27 12:56:16 +01:00
kervala
fbed1d5854 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 23:30:48 +01:00
kervala
b6dae7002e Changed: Minor change
--HG--
branch : develop
2016-01-26 23:29:58 +01:00
kervala
93d89700bc Fixed: Useless dependencies
--HG--
branch : develop
2016-01-26 23:29:45 +01:00
kervala
c1125199ca Changed: Minor changes
--HG--
branch : develop
2016-01-26 23:26:50 +01:00
kervala
093ee91656 Fixed: libxml2 dependencies
--HG--
branch : develop
2016-01-26 23:26:38 +01:00
kervala
0540c386a6 Merge
--HG--
branch : compatibility-develop
2016-01-26 22:45:40 +01:00
kervala
325242c2e4 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 22:44:40 +01:00
kervala
36f886f5f1 Changed: Removed more useless dependencies
--HG--
branch : develop
2016-01-26 22:43:35 +01:00
kervala
c5d8c9965e Changed: Minor changes (EOL, spaces, etc...)
--HG--
branch : develop
2016-01-26 22:32:45 +01:00
kervala
af2f38612a Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
2016-01-26 22:30:13 +01:00
kervala
2be87f3c3e Fixed: Use same XML files as on Atys
--HG--
branch : compatibility-develop
2016-01-24 17:08:32 +01:00
kervala
1cbf1720ca Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 20:33:28 +01:00
kervala
30d7571aad Fixed: Compilation under Linux
--HG--
branch : develop
2016-01-23 20:32:37 +01:00
kervala
700b75f44a Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 19:07:13 +01:00
kervala
be92ac8e60 Fixed: Display of emotes using the same character case as in translations and showing corresponding command to type
--HG--
branch : develop
2016-01-23 19:06:28 +01:00
kervala
ba7b4094ef Changed: Use CCmdArgs to get program path and search data there
--HG--
branch : develop
2016-01-23 19:04:52 +01:00
kervala
482b1ba73a Fixed: Display wrong commands with UTF-8 characters
--HG--
branch : develop
2016-01-23 19:04:07 +01:00
kervala
dcd38de3f2 Changed: Minor changes
--HG--
branch : develop
2016-01-23 18:59:20 +01:00
kervala
61fb66d3af Changed: Support -config/-c parameter passed by Ryzom Installer
--HG--
branch : develop
2016-01-23 18:58:58 +01:00
kervala
895df72e3f Changed: Use CCmdArgs to parse client command-line
--HG--
branch : develop
2016-01-23 18:57:32 +01:00
kervala
ded0b3a252 Changed: Remove commented old crash report code
--HG--
branch : develop
2016-01-23 18:55:56 +01:00
kervala
5adebf258d Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 12:30:33 +01:00
kervala
e35fe4384b Changed: Use CBigFile to unpack BNP in CPatchManager
--HG--
branch : develop
2016-01-23 12:27:41 +01:00
kervala
cf414d8c14 Merge with develop
--HG--
branch : compatibility-develop
2016-01-21 15:07:14 +01:00
kervala
963892913f Fixed: Crash in backup service
--HG--
branch : develop
2016-01-21 15:06:40 +01:00
kervala
f5a60e3a60 Fixed: Don't install static libraries if not defining WITH_INSTALL_LIBRARIES
--HG--
branch : develop
2016-01-21 15:06:01 +01:00
kervala
7abbc07bc7 Removed: installscript_osx.vdf because we manage it directly in code now
--HG--
branch : compatibility-develop
2016-01-21 10:15:09 +01:00
kervala
5a6580dc38 Merge with develop
--HG--
branch : compatibility-develop
2016-01-21 10:08:56 +01:00
kervala
e281fc1706 Changed: Minor changes
--HG--
branch : develop
2016-01-21 10:05:10 +01:00
kervala
539a99b1e3 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-01-20 19:50:51 +01:00
kervala
bb0d2f6aa0 Merge with develop
--HG--
branch : compatibility-develop
2016-01-20 13:06:47 +01:00
kervala
1082c49aa6 Changed: Use a different original filename for DEV version
--HG--
branch : develop
2016-01-20 13:06:15 +01:00
kervala
3faac85a41 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-01-19 09:17:09 +01:00
kervala
d54e569b3f Merge with develop
--HG--
branch : compatibility-develop
2016-01-18 21:32:01 +01:00
kervala
a79393e9f8 Changed: Minor changes
--HG--
branch : develop
2016-01-18 21:31:23 +01:00
kervala
9073264f59 Changed: Remove hardcoded L:\\primitives\\ from C++ code (use RYZOM_LEVELDESIGN environment varianle instead)
--HG--
branch : develop
2016-01-18 21:31:10 +01:00
kervala
b0ad9b0315 Changed: Only add search paths that exist
--HG--
branch : develop
2016-01-18 21:29:43 +01:00
kervala
016f56578a Changed: Remove InstallStatsUrl in client_default.cfg
--HG--
branch : compatibility-develop
2016-01-17 20:16:18 +01:00
kervala
cc282fd3d5 Merge with develop
--HG--
branch : compatibility-develop
2016-01-16 23:50:23 +01:00
kervala
0be5356f78 Fixed: Right directories
--HG--
branch : develop
2016-01-16 23:49:39 +01:00
kervala
5b3e181227 Changed: Minor changes
--HG--
branch : develop
2016-01-16 23:47:58 +01:00
kervala
06eb63183e Added: Config file for translation_tools
--HG--
branch : develop
2016-01-16 23:47:12 +01:00
kervala
cca0dd450e Merge with develop
--HG--
branch : compatibility-develop
2016-01-16 10:52:18 +01:00
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