aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-12-04 09:14:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
7130 commits 14 branches 0 tags 258 MiB
Commit graph

6857 commits

Author SHA1 Message Date
kervala
4b6a17bcb2 Changed: Clean files 2016-05-14 18:50:27 +02:00
kervala
f73fa8ee24 Changed: Display error message when no installer.ini file found 2016-05-14 18:48:32 +02:00
kervala
66c8269aad Changed: Compile shortcuts code only under Windows 2016-05-14 18:48:06 +02:00
kervala
17bec77777 Changed: Hide help button 2016-05-14 18:47:45 +02:00
kervala
8a726b62da Changed: Renamed configurationsComboBox to profilesComboBox 2016-05-14 18:47:28 +02:00
kervala
b2e7b71b1f Merge with develop 2016-05-14 12:35:12 +02:00
Nimetu
b619ef1865 Changed: Remove legacy HTTPCurrentDomain variable 2016-05-14 12:53:09 +03:00
Nimetu
16b08bd66e Fixed: Parsing url authority when path is empty 2016-05-14 12:53:09 +03:00
Nimetu
ec64ba53a7 Changed: Rename CUrlParser domain variable 2016-05-14 12:53:09 +03:00
kervala
d888e502b5 Fixed: Missing to include PCH 2016-05-13 20:55:00 +02:00
Nimetu
f68c84e361 Fixed: Resolve http-equiv refresh url 2016-05-13 13:57:28 +03:00
kervala
248c7e14a7 Changed: Replace other cp=1 by cp=2 2016-05-12 20:02:40 +02:00
kervala
2523706447 Changed: Append cp=2 parameter to query when requesting salt to know that we support SHA512 crypt 2016-05-12 19:53:16 +02:00
kervala
9e1b9d8050 Changed: Minor changes 2016-05-12 19:52:20 +02:00
kervala
04407be1cc Changed: Added new command /playedTime that displays time played with this character 2016-05-12 19:51:52 +02:00
Nimetu
008f67fcbc Fixed: url inheriting for defined empty query component 2016-05-09 20:05:06 +03:00
kervala
e4a1e9df63 Changed: Minor changes 2016-05-08 19:23:38 +02:00
kervala
2faf5b5010 Changed: Disable too verbose message for sound sheets 2016-05-08 19:23:27 +02:00
kervala
32d5f7c497 Fixed: Stack size errors while compiling with VC++ 2015 2016-05-08 14:00:15 +02:00
kervala
e22fa8b951 Fixed: Use correct formatted HTTP 1.1 query, previous one was blocked by some security software (a big thanks to Vojtech Vobr from AVG Technologies for his investigation to help us to fix this issue) 2016-05-08 13:39:17 +02:00
kervala
9571f5f235 Changed: Check for NULL X509_INFO 2016-05-08 13:33:38 +02:00
kervala
435ddae54f Changed: Useless to put a space after method name (if needed, we'll add ourself later) 2016-05-08 13:33:21 +02:00
kervala
27fcfd823a Changed: Minor changes 2016-05-08 13:31:54 +02:00
kervala
3e658f1a1f Changed: Specify host too for login HTTP requests 2016-05-08 13:31:08 +02:00
kervala
ea12dd7969 Fixed: Some problems with AMS, patches by depyraken (thanks a lot!) 2016-05-08 13:28:25 +02:00
kervala
fbd9800085 Fixed: Use %p to display pointer 2016-05-08 13:22:32 +02:00
kervala
84585af4c3 Backed out changeset: d758db202adf 2016-05-05 17:57:05 +02:00
Nimetu
f3b13af5e8 Changed: Increase default request timeout for web browsers 2016-05-05 15:00:28 +03:00
kervala
35bb966603 Changed: Better alignment 2016-05-04 10:07:42 +02:00
kervala
e1f8ac7d1b Changed: Update interfaces files with patchlet version 2016-05-04 10:07:03 +02:00
kervala
c3cd4d9d0d Changed: Simplify CMake end tags 2016-05-04 10:06:29 +02:00
Dremor
159898b081 Merge branch 'ryzomcore' into 'develop' 
Merge Ryzomcore into Develop



See merge request !2
 2016-05-02 08:01:47 +00:00
Nimetu
8b767cabcd Changed: When writing to icfg or keys files, write to temp file and then rename 2016-04-29 12:16:43 +03:00
Nimetu
6b75bdb0e1 Fixed: Tooltip position related to parent window 2016-04-23 18:49:36 +03:00
Nimetu
f023fa769a Fixed: bad commit (issue #143) 2016-04-19 22:55:34 +03:00
kervala
58347b9353 Changed: Display certificate path 2016-04-18 13:40:13 +02:00
kervala
8aabb4fec7 Fixed: Warnings with clang 2016-04-18 13:40:02 +02:00
kervala
a9685f71b2 Fixed: Ignore "certificate already in hash table" errors 2016-04-18 13:39:48 +02:00
kervala
b0934cabe4 Changed: Signed/unsigned comparison 2016-04-15 16:11:37 +02:00
kervala
c1983fba05 Fixed: Creation of sn_0_* folders under OS X 10.7 2016-04-15 16:11:14 +02:00
kervala
b1368c6e53 Fixed: Link to freetype when using Qt 2016-04-13 20:36:43 +02:00
kervala
f36c73a9b1 Changed: Display parameters passed to batch in log 2016-04-12 19:54:38 +02:00
kervala
58d787fa19 Fixed: Compilation with Qt 5.6 2016-04-12 19:54:05 +02:00
kervala
c9e5cd2e82 Merge with develop 2016-04-12 16:53:28 +02:00
kervala
3d50a01f83 Changed: Q_COMPILER_RVALUE_REFS hack useless with Qt 5.6 2016-04-12 15:43:13 +02:00
kervala
a545a8b091 Changed: Removed extraneous spaces at the end of lines 2016-04-12 15:42:53 +02:00
kervala
e77815256f Fixed: CURLE_NOT_BUILT_IN undefined with some CURL versions 2016-04-12 15:42:43 +02:00
kervala
8c04ffe056 Fixed: Wrong display of max resist levels 2016-04-09 13:02:12 +02:00
kervala
130229cbb7 Changed: Give priority to login specified as argument 2016-04-06 09:36:06 +02:00
kervala
f93dfcfefe Changed: Minor changes 2016-04-06 09:29:37 +02:00
kervala
81ca1a9a04 Changed: Reverted change, not sure it fixes anything 2016-04-02 19:33:53 +02:00
kervala
4cccd74b25 Changed: Use booleans to know if we already added a loopback address 2016-04-02 13:31:59 +02:00
kervala
62a7ed13fe Fixed: Empty const char* because std::string destructor called 2016-04-02 13:31:04 +02:00
kervala
4e62ef6921 Changed: Use toString for formatting 2016-04-02 13:30:08 +02:00
kervala
e2073f31d7 Changed: Minor changes 2016-04-02 13:29:42 +02:00
kervala
a445afef3c Changed: Better camel case syntax 2016-04-02 13:28:42 +02:00
depyraken
8251713821 merge aquatic to lirria 2016-03-31 02:19:44 +02:00
depyraken
21d93bc1d7 fix a compil error on linux (compils with visual studio 2010) 2016-03-31 02:15:38 +02:00
depyraken
d6ef802487 merge aquatic to lirria 2016-03-30 23:13:00 +02:00
depyraken
3bbc975654 merge compatibility-develop to aquatic 2016-03-30 23:10:24 +02:00
Nimetu
9fb698f8af Fixed: Typo in translation key 2016-03-30 10:44:52 +03:00
depyraken
42aeac0243 handle separately water and ground 
The forbidden zones must be set in the primitives, in the fauna name = "Ybers:Ground|NoGo"
 2016-03-30 02:56:09 +02:00
kervala
7517200cc7 Merge with develop 2016-03-29 14:00:04 +02:00
kervala
8b5c38392a Fixed: Typo 2016-03-29 13:59:34 +02:00
kervala
1b0280b96f Fixed: Wrong locale under Linux 2016-03-29 13:58:57 +02:00
kervala
740b7a252d Changed: Updated translations 2016-03-29 13:58:29 +02:00
depyraken
d3c21bdd08 add isloopbackIPAddress prototype to code/nel/include/nel/net/inet_address.h 
add isloopbackIPAddress to code/nel/src/net/inet_address.cpp
add IPv4&IPv6 loopback IP addresses to localAddresses

In code/nel/src/net/unified_network.cpp:
replace is127001 calls by isloopbackIPAddress
change wrong comments about default network id (nid = 0xFF)
When the selected connectionId is not valid
	warnings are not triggered anymore when using default network (nid = 0xFF): the logs were full of warnings and the server was lagging
	When nid = 0xFF, the new connectionId is stored into DefaultNetwork
	When nid <> 0xFF, the new connectionId is stored into NetworkConnectionAssociations[nid]
 2016-03-29 02:29:35 +02:00
SIELA1915
52702f64f1 merged from compatibility-develop 2016-03-28 02:12:19 +02:00
Nimetu
df0d249834 Added: AppZone translations 2016-03-22 12:17:57 +02:00
Nimetu
2be2717ee7 Merge with develop 2016-03-22 12:23:04 +02:00
Nimetu
5f53c6caa6 Added: AppZone and WebBrowser components 2016-03-22 11:11:47 +02:00
kervala
9aae3598aa Merge with develop 2016-03-20 17:28:00 +01:00
kervala
e6729fb0e5 Fixed: Compilation (missing NLMISC namespaces for nlfopen) 2016-03-20 17:27:25 +01:00
kervala
323d981318 Merge with develop 2016-03-20 17:09:13 +01:00
kervala
d11053aa03 Fixed: Compilation (missing NLMISC namespaces for nlfopen) 2016-03-20 17:08:44 +01:00
kaetemi
354e52aac1 Merge with develop 2016-03-19 22:34:32 +01:00
kaetemi
c83f467be1 Fix random thunder activation caused by rounding error in setup interpolation 2016-03-19 22:13:38 +01:00
kaetemi
d76dc8fe56 Compile fix 2016-03-19 22:13:38 +01:00
kervala
54ceef6c99 Merge with develop 2016-03-19 19:30:06 +01:00
kervala
17b390e589 Fixed: Clang warnings 2016-03-19 19:29:03 +01:00
kervala
a9c06ce8d0 Fixed: Use presets from client_default.cfg for client_config_qt 2016-03-19 19:27:00 +01:00
kervala
66d9a0eea7 Changed: Try to load Steam DLL without path if fails 2016-03-19 18:29:14 +01:00
kervala
93f5836fd5 Merge with develop 2016-03-19 16:21:46 +01:00
kervala
82985016cf Fixed: Use nlfopen in tools and servers 2016-03-19 16:21:06 +01:00
kervala
5b892c1ed4 Fixed: Define _DARWIN_UNLIMITED_STREAMS to fix setrlimit under OS X 2016-03-19 15:34:00 +01:00
kervala
894ee5a47b Merge with develop 2016-03-18 22:27:43 +01:00
kervala
78c7a925c7 Changed: Minor changes 2016-03-18 22:26:58 +01:00
kervala
5caef15f94 Fixed: Compilation 2016-03-18 22:26:43 +01:00
kervala
ba71497344 Changed: Load Steam DLL just after initializing logs and before loading config 2016-03-18 22:21:01 +01:00
kervala
45f2100a03 Fixed: Use language defined in Ryzom properties from Steam 2016-03-18 22:20:28 +01:00
kervala
29c946b73a Merge with develop 2016-03-18 22:16:28 +01:00
kervala
2a53238ba3 Changed: Use named arguments in uiFilterMenuDynamic translation 2016-03-18 22:11:03 +01:00
kervala
f728a518a1 Fixed: Move setrlimit after initializing logs 2016-03-18 22:10:19 +01:00
kervala
bde61427a5 Changed: Removed wrong check 2016-03-18 22:09:43 +01:00
kervala
03715a64e0 Changed: Check if LC_NUMERIC is correct before loading or saving config files 2016-03-18 22:09:26 +01:00
kervala
b342f11949 Fixed: Set numeric locale in CApplicationContext 2016-03-18 22:08:43 +01:00
kervala
97979c9083 Changed: Don't need to use Windows functions with locale because the bug also occurs under Linux and OS X 2016-03-18 22:07:52 +01:00
kervala
baa490ca9c Changed: Fix clang warnings 2016-03-18 22:06:20 +01:00
kervala
f5e60a4fea Changed: Init log before calling prelogInit() 2016-03-18 18:10:01 +01:00
kervala
b4de9e66f5 Fixed: Possible crashes if ov_info returns NULL 2016-03-18 15:09:02 +01:00
kervala
d72a59f5ea Changed: Implement CI18N::setSystemLanguageCode, if we must force it 
Fixed: CI18N::getSystemLanguageCode under Windows (use 2 different methods)
 2016-03-18 15:07:49 +01:00
kervala
38de0a300e Changed: Updated translations 2016-03-17 13:51:44 +01:00
kervala
1b724c56fc Merge with develop 2016-03-16 19:15:11 +01:00
kervala
23e93ad89e Fixed: Renamed ryzom_configuration to ryzom_configuration_qt under Linux 2016-03-16 19:14:23 +01:00
kervala
624b2bbdd8 Fixed: We need to restart client from the same startup directory as parent one 2016-03-16 19:13:57 +01:00
kervala
7d23cd6f52 Changed: Removed some semicolons in Lua when useless 2016-03-16 19:13:07 +01:00
kervala
b86637ad56 Changed: Use same algorithm as before Windows unicodes fixes (try to open the file instead of checking its attributes) 2016-03-16 19:12:34 +01:00
kervala
85e9f7eadc Changed: Use # in Lua to get the size of an array 2016-03-15 17:55:58 +01:00
kervala
6494a85c5a Merge with develop 2016-03-15 17:45:55 +01:00
kervala
d4af134189 Changed: Search client_default.cfg also in ETC_RYZOM_PREFIX 2016-03-15 17:44:21 +01:00
kervala
a4be9e2479 Merge with develop 2016-03-15 12:37:11 +01:00
kervala
87bfd29c5f Changed: Removed useless dependencies on DirectX 2016-03-15 12:36:21 +01:00
kervala
445ba78816 Fixed: Fyros and Matis are using first name first while Trykers and Zoraïs are using last name first 2016-03-15 12:35:47 +01:00
kervala
966500e1a1 Changed: Remived useless semicolons 2016-03-15 12:34:45 +01:00
kervala
a0f20c8ad4 Changed: Remove Hungarian because this language is not supported by Ryzom 2016-03-15 12:31:20 +01:00
kervala
3e0c6fc2e1 Changed: Updated Configuration translations 2016-03-15 12:30:52 +01:00
kervala
5fb990c680 Changed: Fix typo 2016-03-15 12:30:14 +01:00
kervala
e5905be835 Merge with develop 2016-03-15 00:09:40 +01:00
kervala
b05d1352f8 Merge with develop 2016-03-15 00:08:40 +01:00
kervala
3fe5d2b5c6 Changed: Updated translations 2016-03-15 00:08:12 +01:00
kervala
b80b71d6f8 Changed: Updated Configuration translations 2016-03-15 00:06:06 +01:00
kervala
72bc7a8fd0 Fixed: Wrong first and last names orders and some minor bugs 2016-03-15 00:03:06 +01:00
kervala
7ee9833bf3 Changed: Use more explicit variable names 2016-03-15 00:01:29 +01:00
kervala
d2bc560ca8 Changed: Minor changes (spaces replaced by tabs) 2016-03-14 23:58:58 +01:00
kervala
a7874615d4 Changed: Sligthly changes 2016-03-14 21:36:50 +01:00
kervala
caf9a7b54f Fixed: UTF-8 encoding 2016-03-14 21:27:28 +01:00
kervala
b805749e98 Changed: Updated translations for Ryzom Configuration 2016-03-14 21:07:06 +01:00
kervala
97b85a790d Changed: Update shorcuts 2016-03-12 22:01:03 +01:00
kervala
1623961c20 Changed: Save when clicking on OK 2016-03-12 22:00:43 +01:00
kervala
a72e76be2f Changed: Update index in servers list 2016-03-12 22:00:12 +01:00
kervala
63dddb4df8 Changed: Disable widgets if no profile selected 2016-03-12 21:59:29 +01:00
kervala
1f999fc420 Changed: Read version from client and display it 2016-03-12 21:58:53 +01:00
kervala
b4c0c8f921 Changed: Use CServersModel 2016-03-12 21:58:05 +01:00
kervala
ebe627cce6 Changed: Methods to convert index from/to profile ID 2016-03-12 21:57:24 +01:00
kervala
c559bf1288 Changed: Minor changes 2016-03-12 21:56:23 +01:00
kervala
4c8d7884ea Changed: Read/write shortcuts 2016-03-12 21:54:44 +01:00
kervala
245b32782f Changed: Use checkboxes for shortcuts 2016-03-12 21:53:51 +01:00
kervala
a4e564bae5 Added: ServersModel to manage servers list 2016-03-12 21:53:20 +01:00
kervala
f5d6f34437 Changed: Updated translations 2016-03-12 15:40:28 +01:00
kervala
b4487dddec Merge with develop 2016-03-12 14:50:10 +01:00
kervala
a65f0fbd16 Merge with develop 2016-03-12 14:49:35 +01:00
kervala
861472b799 Changed: Use QString::number() instead of QString("%1") to convert an int to QString 2016-03-12 14:49:04 +01:00
kervala
1562a5dddf Fixed: Use full path to launch Ryzom client and pass profile argument 2016-03-12 14:48:18 +01:00
kervala
b571de42b7 Changed: Declare CCmdArgs outside of main() to be able to use it in other files 2016-03-12 14:47:13 +01:00
kervala
e010a87a9e Fixed: 0x0 is Auto mode 2016-03-12 14:46:13 +01:00
kervala
29824eedb4 Changed: Updated translations 2016-03-12 14:37:39 +01:00
kervala
68bc631a0b Merge with develop 2016-03-11 09:51:59 +01:00
kervala
3cb0fdf4f0 Fixed: ForceDXTC is not to disable compression but force it 2016-03-11 09:50:22 +01:00
kervala
4cfe978814 Changed: Use MiB for RAM 2016-03-11 09:48:59 +01:00
kervala
13e3489e11 Fixed: Determine path of client.cfg and client_default.cfg 2016-03-11 09:45:11 +01:00
kervala
23ed5c2be4 Changed: Create new client.cfg 2016-03-11 09:44:21 +01:00
kaetemi
4a581d89fa Merge with develop 2016-03-10 12:09:18 +01:00
kaetemi
2177ed554a Fix thunder update 2016-03-10 12:08:48 +01:00
kaetemi
af0568e131 Fix rounding error in _RyzomDay and _RyzomTime calculation 2016-03-10 12:08:48 +01:00
kervala
97f6cfe760 Changed: Write a warning instead of error 2016-03-09 11:24:17 +01:00
kervala
3300934591 Fixed: With new iOS versions (and perhaps OS X), locale can contains country code 2016-03-09 11:24:01 +01:00
kervala
2221bae1b2 Fixed: OpenGL ES driver compilation 2016-03-09 11:22:09 +01:00
kervala
68814a1d94 Changed: Random names generator updated by Osquallo 2016-03-09 11:21:53 +01:00
kaetemi
130901402d Merge with develop 2016-03-08 12:46:47 +01:00
kaetemi
7a5a8093c4 Fix curl crash 2016-03-08 12:46:15 +01:00
kervala
5e65bb1caf Changed: Updated translations 2016-03-06 19:42:06 +01:00
kervala
fcc53e3093 Changed: Updated translations 2016-03-05 19:30:35 +01:00
kervala
6e8a7dadf2 Merge with develop 2016-03-05 18:44:19 +01:00
kervala
4f4c0235a4 Improved Luabind CMake module, fixes #262 and fixes #263 2016-03-05 18:43:25 +01:00
kervala
711962de71 Merge with develop 2016-03-05 12:46:47 +01:00
kervala
b00bd2c9fc Merge with develop 2016-03-05 12:46:17 +01:00
kervala
8ae3b52846 Changed: Temporarily disable Spanish and Russian translations (not yet ready) 2016-03-05 12:45:49 +01:00
kervala
6f0febcf92 Changed: Better warning 2016-03-05 12:42:32 +01:00
kervala
02ab16f83f Changed: Profiles dialog code 2016-03-05 12:38:28 +01:00
kervala
008794031a Added: Profiles model class 2016-03-05 12:35:32 +01:00
kervala
960b3bc5e3 Changed: Create a typedef for lists of profiles and servers 2016-03-05 12:34:02 +01:00
kervala
78587d3d47 Changed: Use "arguments" instead of "parameters" 2016-03-05 12:33:19 +01:00
kervala
e280f89ea1 Merge with develop 2016-03-05 11:51:08 +01:00
kervala
51b3de86fd Improved Luabind CMake module, fixes #263 2016-03-05 11:50:38 +01:00
kervala
ca833bd3e5 Changed: Random names generator updated by Osquallo 2016-03-05 11:29:06 +01:00
Yann
0ce6b3c411 Adding new talents in mdehaviours in common 2016-03-04 20:16:16 +01:00
kervala
35d32fc715 Merge with develop 2016-03-03 20:50:56 +01:00
kervala
9fb8340a97 Lua 5.3 support for Fedora 22+, fixes #262 2016-03-03 20:50:20 +01:00
Nimetu
415eae4388 Merge with develop 2016-03-03 00:00:30 +02:00
Nimetu
14f1fa63fe Added: Possibility to set text as grayed in combo box 2016-03-02 23:58:48 +02:00
Nimetu
8c4b7b2e55 Changed: Update translations 2016-03-01 22:39:14 +02:00
Nimetu
beadf6657b Merge with develop 2016-03-01 22:39:10 +02:00
Nimetu
3b9da62b2e Added: Horizontal mode to second action bar 2016-03-01 22:30:05 +02:00
kervala
a88878a079 Merge with develop 2016-03-01 14:03:41 +01:00
kervala
1a41a61602 Merge with develop 2016-03-01 14:02:18 +01:00
kervala
00e6ff45ea Fixed: Missing translation for bytes in patcher 2016-03-01 14:01:47 +01:00
kervala
6af7a93174 Changed: Slots for buttons 2016-03-01 14:00:06 +01:00
kervala
64841ed85a Changed: Renamed configurations to profiles 2016-03-01 13:48:51 +01:00
kervala
fac530044f Merge with develop 2016-03-01 13:46:49 +01:00
kervala
b3ddafef29 Changed: Escape Linux upgrade script as well 2016-03-01 13:46:04 +01:00
kervala
b88f2e9e19 Fixed: Loading PEM file 2016-03-01 13:45:45 +01:00
kervala
77819d3639 Merge with develop 2016-02-29 09:33:00 +01:00
kervala
cd9d2cdd5d Fixed: Escape paths with quotes under OS X 2016-02-29 09:32:27 +01:00
kervala
cf4e747182 Changed: Updated translations 2016-02-28 18:58:10 +01:00
kervala
f009b00486 Changed: Try to load Steam DLL using absolute path 2016-02-28 18:56:19 +01:00
kervala
9e0918ad09 Merge with develop 2016-02-28 16:46:11 +01:00
kervala
589e320266 Fixed: Only use "open" if extension is app 2016-02-28 16:44:08 +01:00
kervala
14d90e4292 Changed: Delete updt_nl.bat/sh only when patch enabled and after determining ClientRootPath 2016-02-28 16:41:53 +01:00
kervala
f0794ee672 Fixed: Wrong check for OS X 2016-02-28 16:38:12 +01:00
kervala
c07f839545 Added: Scripts launched after patch 2016-02-28 16:36:46 +01:00
kervala
cad46d0e2c Merge with develop 2016-02-28 12:46:34 +01:00
kervala
b96d2f17c5 Fixed: Compilation under OS X 2016-02-28 12:45:31 +01:00
kervala
3c08d152ce Merge with develop 2016-02-27 19:23:14 +01:00
kervala
6c9db77a89 Merge with develop 2016-02-27 19:22:53 +01:00
kervala
11447db573 Fixed: Compilation 2016-02-27 19:22:23 +01:00
kervala
7e6fee83a1 Merge with develop 2016-02-27 18:45:16 +01:00
kervala
022ca9622d Changed: Extract Windows and UNIX attributes from 7z headers 2016-02-27 18:44:09 +01:00
kervala
d819704717 Changed: Renamed configurations to profiles 2016-02-27 18:43:14 +01:00
kervala
4be2a5c844 Merge with develop 2016-02-27 18:39:41 +01:00
kervala
1704030c38 Changed: New functions launchProgramArray to pass an array of strings as arguments (easier to escape) 2016-02-27 18:38:58 +01:00
kervala
bc2c147722 Changed: New functions to convert arguments string from/to an array of strings 2016-02-27 18:37:43 +01:00
kervala
00f7b0851e Changed: Improve formatting of UNIX script 2016-02-27 18:35:59 +01:00
kervala
24cfa76e6b Fixed: Use / instead of \ under UNIX 2016-02-27 18:34:50 +01:00
kervala
7b67b6ad7c Fixed: Use export under UNIX to make variables available in upgd_nl.sh too 2016-02-27 18:33:59 +01:00
kervala
d0d8cfaf9b Fixed: Wrong patch categories 2016-02-27 18:32:45 +01:00
kervala
d874429b7c Added: Initial commit for Ryzom Installer (WIP) 2016-02-25 21:19:27 +01:00
kervala
17f0547bd9 Fixed: Typos in french translations 2016-02-24 12:22:33 +01:00
kervala
f920321b39 Merge with develop 2016-02-23 19:42:49 +01:00
kervala
4345f54db7 Changed: Minor changes 2016-02-23 19:42:15 +01:00
kervala
05d06ae702 Fixed: Memory leak 2016-02-23 19:41:49 +01:00
kervala
0231043886 Changed: Updated translations 2016-02-23 17:27:01 +01:00
kervala
4a8741a9b0 Merge with develop 2016-02-23 17:05:57 +01:00
kervala
6c1cf58572 Changed: Trim URL before to display it 2016-02-23 17:05:04 +01:00
kervala
fd06b974d5 Fixed: Implement alternate login system with LoginCustomParameters 2016-02-23 17:03:40 +01:00
kervala
d3f031f3ee Fixed: Don't append empty login, password or shard ID to batch 2016-02-23 16:58:57 +01:00
kervala
c70095d428 Fixed: Use full path for client_default.cfg 2016-02-23 16:58:07 +01:00
kervala
6b399be0f6 Changed: Minor changes 2016-02-23 16:57:34 +01:00
kervala
0f0f9ebc66 Changed: Updated german translations 2016-02-23 12:36:47 +01:00
Nimetu
de83ae89eb Changed: Implement multi-row select box 2016-02-23 10:52:21 +02:00
Nimetu
4d93cb8c22 Added: http-equiv refresh 2016-02-23 10:52:24 +02:00
Nimetu
272bdeb371 Changed: Use multiline text for http errors 2016-03-01 22:30:05 +02:00
kervala
1b5b1aefa5 Merge with develop 2016-02-21 20:30:16 +01:00
kervala
b0b9e18677 Changed: Use a wchar_t buffer for registry 2016-02-21 20:29:14 +01:00
kervala
d235209038 Changed: Updated world_editor_classes.xml 2016-02-21 17:28:43 +01:00
kervala
9ec4c76cd4 Changed: PatchServer not used anymore, use PatchUrl instead 2016-02-21 17:26:48 +01:00
kervala
db2c2c64a7 Changed: Updated world_editor_classes.xml 2016-02-21 17:10:28 +01:00
kervala
d0261d2fc5 Merge with develop 2016-02-21 17:06:38 +01:00
kervala
a58a3451b8 Fixed: Add unlearn_brick command for missions (a big thanks to Depyraken for the patch!) 2016-02-21 17:05:54 +01:00
kervala
867e15661e Merge with develop 2016-02-21 14:22:18 +01:00
kervala
c4655366e1 Changed: Make OpenSSL required 2016-02-21 14:21:49 +01:00
kervala
24302acc35 Merge with develop 2016-02-21 13:57:35 +01:00
kervala
ce75d5e898 Fixed: Compilation under Linux 2016-02-21 13:55:58 +01:00
kervala
af54e427c8 Changed: Updated world_editor_classes.xml 2016-02-21 13:52:20 +01:00
kervala
7c9ff22f28 Changed: Guild missions 2016-02-21 13:51:09 +01:00
kervala
81a5a15b4d Changed: Minor changes 2016-02-21 13:50:44 +01:00
kervala
9f7e192926 Changed: Minor changes (replaced l: by L:) 2016-02-21 13:30:48 +01:00
kervala
b552f850e8 Merge with develop 2016-02-21 13:22:22 +01:00
kervala
917ce69668 Changed: Allow to compile WITH_NEL_TESTS without compiling tools 2016-02-21 13:20:49 +01:00
kervala
2d6e35f41d Changed: Include wang_hash.h in NLMISC files 2016-02-21 13:19:41 +01:00
kervala
7ca7199190 Changed: Don't look for Qt5WinExtras in root CmakeLists.txt 2016-02-21 13:19:23 +01:00
kervala
d64fcc3720 Changed: Don't use DOS path under UNIX 2016-02-21 13:17:10 +01:00
kervala
c63932004e Changed: Launch upgrade script even if we don't want to launch client 2016-02-21 13:16:50 +01:00
kervala
192deb3bea Changed: Minor changes 2016-02-21 13:16:04 +01:00
kervala
ec6d43787a Changed: Don't use SrcPath and DstPath anymore (ClientPatchPath and ClientRootPath are more explicit) 2016-02-21 13:15:29 +01:00
kervala
591f69b2c0 Changed: Renamed DSTPATH to ROOTPATH and SRCPATH to UNPACKPATH and fixed paths with spaces 2016-02-21 13:13:28 +01:00
kervala
3c948ef625 Changed: Add a 7 seconds pause under UNIX 2016-02-21 13:10:48 +01:00
kervala
045d255a09 Changed: Use L:/ path instead of R:/ for leveldesign 2016-02-21 13:10:16 +01:00
kervala
123e326dbf Changed: Added NamingPolicyURL in client_default.cfg 2016-02-21 12:33:15 +01:00
kervala
bb4991b58b Merge with develop 2016-02-20 20:44:23 +01:00
kervala
c1e37527fd Fixed: Compilation 2016-02-20 20:42:43 +01:00
kervala
c4226f89ea Changed: Renamed uiCP_Surame and uiCP_Name to uiCP_FirstName and uiCP_LastName 2016-02-20 20:42:29 +01:00
kervala
08c30dc32b Changed: Removed extraenous spaces at the end of lines 2016-02-20 20:41:34 +01:00
kervala
8a6e94fc22 Changed: Updated translations 2016-02-20 20:11:52 +01:00
kervala
afc57f1b2a Merge with develop 2016-02-20 19:57:43 +01:00
kervala
9dff74badf Changed: Added IG Name Generator by Osquallo (thanks a lot for your amazing work!) 2016-02-20 19:48:13 +01:00
kervala
c217f28626 Merge with develop 2016-02-20 19:29:00 +01:00
kervala
319fad1555 Changed: Minor changes 2016-02-20 19:26:43 +01:00
kervala
7ecc271b58 Fixed: Compilation under Linux (thanks Kishan for the patch!), fixes #260 2016-02-20 19:26:34 +01:00
kervala
0c25d3ecab Try to open certificate using cURL callback (allow to load it from BNP and support UTF-8 pathes), issue #261 2016-02-20 19:25:31 +01:00
kervala
379c8eeb64 Last changes for Unicode support under Windows, fixes #261 2016-02-20 19:21:39 +01:00
kervala
b2f2c2446e Changed: Minor changes 2016-02-20 19:20:49 +01:00
kervala
f4136bcdca Music player can now handle unicode filenames and m3u8 playlists, issue #261 2016-02-20 19:12:55 +01:00
kervala
399bf7e9ca Changed: Removed useless commented code 2016-02-20 19:11:43 +01:00
kervala
90962e292f Huge refactoring of batch creation process, because .bat files don't support unicode at all, we can pass Unicode paths on command-line though, issue #261 2016-02-20 19:11:05 +01:00
kervala
7e6114985e Changed: Use ClientCfg.getDefaultConfigLocation to get location of client root 2016-02-20 19:07:34 +01:00
kervala
ba5a164ec8 Fixed: Display human readable version of file timestamps 2016-02-20 19:06:15 +01:00
kervala
b2409763f9 Changed: Display only filename in patch screen 2016-02-20 19:05:39 +01:00
kervala
2024023541 Changed: Use uiByte translation 2016-02-20 19:04:34 +01:00
kervala
220930fd02 Changed: Don't put spaces in front of percent value 2016-02-20 19:04:18 +01:00
kervala
703bae5882 Changed: Use upgrade script if present 2016-02-20 19:03:31 +01:00
kervala
0a70560372 Changed: Use --profile instead of --config for client profile expression 2016-02-20 19:02:35 +01:00
kervala
008071caa3 Fixed: Display an error if unable to open a ogg file 2016-02-20 19:01:31 +01:00
kervala
c93112f3c5 Changed: Added NamingPolicyURL variable in cfg 2016-02-20 19:00:25 +01:00
kervala
2f9f1b249d Display patch errors/warnings in UTF-8, issue #261 2016-02-20 18:59:03 +01:00
kervala
35570eb0a3 Adapt CSTLoader to use nlfopen and some simplifications, issue #261 2016-02-20 18:56:21 +01:00
kervala
64af254ece Use Unicode of CreateProcess, issue #261 2016-02-20 18:54:32 +01:00
kervala
e9f8202701 Changed: Minor changes 2016-02-20 18:53:39 +01:00
kervala
f076548844 Use right versions of Win32 functions, issue #261 2016-02-20 18:52:57 +01:00
kervala
50afa42d93 Use ANSI versions of Win32 functions when not using Unicode text, issue #261 2016-02-20 18:38:17 +01:00
kervala
e7bebba3d3 Use Unicode versions of Win32 functions, issue #261 2016-02-20 18:30:51 +01:00
kervala
e4dc8ae94b Replace ifstream and ofstream to manage UTF-8 filenames, issue #261 2016-02-20 18:15:04 +01:00
kervala
3c74803187 New function to format a timestamp to human readable 2016-02-20 18:10:17 +01:00
kervala
bfb32b811d Removed useless comments/commented code 2016-02-20 18:09:24 +01:00
kervala
fa8f3b1c0f Use CIFile to load font instead of internal Freetype functions, issue #261 2016-02-20 18:01:57 +01:00
kervala
808f7b2c30 Use new wrapper insteaf of fopen, issue #261 2016-02-20 17:56:25 +01:00
kervala
667ddd1989 Create fopen wrapper that internally uses wide characters under Windows, issue #261 2016-02-20 17:46:11 +01:00
Gary Preston
d4f357850e Merge 2016-02-18 13:55:37 +00:00
Gary Preston
306d4a1e56 Ensure definitions from cmake files that make use of generator expressions 
(such as UseQt4.cmake) are retained but do not cause a empty "-D" to be
output when the generator evaluates to the empty string.
Fixes debug build failure on Linux using Qt4/tools/WITH_PCH.
 2016-02-18 13:53:14 +00:00
kaetemi
e22507ed1f Merge 2016-02-18 11:58:56 +01:00
kaetemi
f0051bb24d Fix gl context not being deleted with custom window 2016-02-18 11:56:44 +01:00
kaetemi
8bd8b3ea3e Move some stuff for easier debug 2016-02-18 11:55:58 +01:00
Gary Preston
20bc437d54 libxml include/lib related build errors for studio. 2016-02-17 14:52:01 +00:00
Gary Preston
816058ae75 Update indentation of tiles_model::data to match coding standard use of tabs. 2016-02-17 14:07:19 +00:00
Gary Preston
ba13914303 Fix qt4 build error. 2016-02-17 14:03:57 +00:00
Gary Preston
cb44c01ad4 Add vector include and remove extra qualification on s_InitFlags. 2016-02-16 19:01:14 +00:00
kervala
8460d1c382 Fixed: Reverted removed translation 2016-02-16 15:26:41 +01:00
kervala
ea4e7bf95b Changed: Minor changes in translations 2016-02-16 15:26:14 +01:00
kervala
653a6cf31f Changed: Updated hash 2016-02-16 15:22:06 +01:00
kervala
10d220f292 Fixed: Wrong indices 2016-02-16 15:10:07 +01:00
kervala
caaf2cc2fa Changed: Symbol for byte unit 2016-02-16 15:07:24 +01:00
kaetemi
db5c59d607 Centralized project directory configuration mechanism 2016-02-16 02:28:03 +01:00
kaetemi
9815393c27 Move pipeline utilities into new pipeline library 2016-02-16 00:28:24 +01:00
kaetemi
ab7512cfc0 Sorry 2016-02-15 22:09:43 +01:00
kervala
d8264f5090 Changed: Don't compile client_patcher if using Steam 2016-02-15 17:09:06 +01:00
kervala
187e93e5c6 Changed: Updated translations 2016-02-15 16:46:29 +01:00
kervala
d0e256301d Merge with develop 2016-02-15 12:11:08 +01:00
kervala
544aaa2510 Changed: We're now using crash_report to send reports 2016-02-15 12:08:55 +01:00
kervala
6dcae90a4c Changed: Add other parameters for client 2016-02-15 12:07:49 +01:00
kervala
ea37b61710 Fixed: Warning (wrong size) 2016-02-15 11:54:28 +01:00
kervala
e15c7c47a9 Merge with develop 2016-02-14 19:59:16 +01:00
kervala
395df606c0 Fixed: Windows XP doesn't support inet_pton and inet_ntop 2016-02-14 19:58:42 +01:00
kervala
db67910241 Merge with develop 2016-02-14 19:16:53 +01:00
kervala
588b832ddb Fixed: Set _WIN32_WINNT used by WinSock for IPv6 2016-02-14 19:16:22 +01:00
kervala
5d9d57d541 Merge with develop 2016-02-14 18:21:41 +01:00
kervala
c63e211cab Fixed: Implements IPv6 in CInetAddress 2016-02-14 18:21:09 +01:00
SIELA1915
76aa95dd82 branch merge 2016-02-14 17:01:57 +01:00
SIELA1915
abd1f8c41b Merged with compatibility-develop 2016-02-14 16:55:32 +01:00
Nimetu
5eb1495c91 Merge with develop 2016-02-14 01:24:10 +02:00
Nimetu
a16f8a6f18 Fixed: reloading cached image with style reload:1 hint 2016-02-14 01:22:44 +02:00
kervala
afa1007874 Changed: If symbol not found, return false 2016-02-13 23:47:20 +01:00
kervala
36550d7701 Changed: Log Steam warnings and messages 2016-02-13 23:46:50 +01:00
kervala
24081ab894 Merge with develop 2016-02-13 23:43:04 +01:00
kervala
ea35e47aba Changed: Translate bytes units in patch screen 2016-02-13 23:42:18 +01:00
kervala
b7f0121fbe Changed: Useless code, but later we could call launchProgram 2016-02-13 23:40:59 +01:00
kervala
c851313a66 Changed: Path can be too long, so display only filename 2016-02-13 23:40:25 +01:00
kervala
aa4f7eae76 Changed: Don't need to call exit(0), Ryzom will exit itself after that 2016-02-13 23:39:40 +01:00
kervala
da2916e41e Changed: Call launchProgram instead of CreateProcess 2016-02-13 23:39:05 +01:00
kervala
6813351e57 Fixed: Wait until Ryzom client is released from memory before to launch the new client 2016-02-13 23:37:21 +01:00
kervala
1b344d78ed Changed: If --config is specified on command-line, we shouldn't check client_default.cfg in current directory 2016-02-13 23:36:22 +01:00
kervala
2f1481f60d Changed: Minor changes 2016-02-13 23:35:37 +01:00
kervala
26d883ed2e Changed: Simplify defaultConfigPath order 2016-02-13 23:35:06 +01:00
kervala
f62ee8756a Changed: Don't need to convert a std::string to a std::string 2016-02-13 23:34:09 +01:00
kervala
8f1359eb49 Changed: LIBXML2_DEFINITIONS was defined twice 2016-02-13 23:33:45 +01:00
kervala
5fcfc87655 Fixed: All files and directories names are using 8-bits locale at the moment, so don't mix with UTF-8 under Windows (we could improve that later but it'll need a lot of changes, especially for all fopen calls) 2016-02-13 23:33:27 +01:00
kervala
53ab0c5aed Fixed: Don't force lower case with only first letter in upper case 2016-02-13 23:30:59 +01:00
kervala
daa42945b3 Changed: Display a warning when a environment variable doesn't exist 2016-02-13 23:30:18 +01:00
kervala
c98bf02cb0 Changed: Use same code as under Linux for OS X when executing sheel scripts 2016-02-13 23:30:00 +01:00
kervala
b577182adb Changed: Remember startup path (the initial current directory) 2016-02-13 23:29:00 +01:00
Nimetu
6ee3c2d8c1 Merge with develop 2016-02-13 17:36:57 +02:00
Nimetu
3962546457 Changed: Set context menu case mode to 'normal' 2016-02-13 17:36:40 +02:00
kervala
713a58dc2a Merge with develop 2016-02-13 14:00:02 +01:00
kervala
3513d7be5f Changed: Don't call FormatMessage 2016-02-13 13:59:32 +01:00
kervala
e95436e2da Fixed: Check VerboseLog config variable instead of "pPM->isVerboseLog()" 2016-02-13 13:58:51 +01:00
kervala
0c675f63eb Fixed: Don't try to convert next meshes if an error occurs 2016-02-13 13:58:21 +01:00
kervala
2481119b04 Fixed: Return true when "open" succeeds under OS X 2016-02-13 13:57:43 +01:00
Yann
8159627ed0 mering to lirria 2016-02-12 21:39:15 +01:00
SIELA1915
af1363f34e Fix for Mac Launch Program not returning true on success 2016-02-12 18:56:36 +01:00
SIELA1915
63b02cfc00 removed no more needed patcher files 2016-02-12 18:30:08 +01:00
SIELA1915
f5459a1b9b merge from compatibility-develop 2016-02-12 18:28:23 +01:00
kervala
4616792df2 Merge with develop 2016-02-12 16:05:43 +01:00
kervala
82e4a6183e Fixed: Display an error if unable to find database.cfg 2016-02-12 16:04:55 +01:00
kervala
a69103237f Changed: Reuse NLMISC::formatErrorMessage instead of native FormatMessage 2016-02-12 16:04:18 +01:00
kervala
024ad78d09 Merge with develop 2016-02-11 21:06:28 +01:00
kervala
f2ae43d229 Changed: Minor changes 2016-02-11 21:06:00 +01:00
kervala
c36fbf8f04 Fixed: Copy Steam runtime to bundle and sign it under OS X 2016-02-11 21:05:03 +01:00
kervala
ea976ec1e8 Merge with develop 2016-02-11 21:01:27 +01:00
kervala
23ec09c4b1 Fixed: CPath::makePathAbsolute removing first / 2016-02-11 21:00:54 +01:00
kervala
cc888d2dec Changed: Minor changes 2016-02-11 21:00:08 +01:00
kervala
14c4f1688b Changed: Updated translations 2016-02-11 16:26:07 +01:00
kervala
c2085c3db2 Changed: Updated translations 2016-02-11 16:24:06 +01:00
kervala
351160905d Changed: Updated translations 2016-02-11 15:58:53 +01:00
deed
3cd8969cd7 Changement du volume du sac 2016-02-11 09:48:19 +01:00
kervala
4a77ebcd44 Merge with develop 2016-02-10 18:48:09 +01:00
kervala
2da2788b57 Changed: Minor changes 2016-02-10 18:47:35 +01:00
kervala
f7c0d296fa Fixed: Load Steam library if Ryzom compiled with WITH_STEAM, request auth session ticket and send it to login server 2016-02-10 18:46:50 +01:00
Yann
006e119e1e merging 2016-02-09 23:36:51 +01:00
Yann
c76fdbf7db Deleting tries to delete unused continents - doesn't suffice, weather_everywhere.cpp ask for a different number of continents 
q
 2016-02-09 23:36:10 +01:00
SIELA1915
af55112ebf merged local changes 2016-02-09 23:12:25 +01:00
SIELA1915
fbc25847e1 corrections for Khanatising the code 2016-02-09 23:09:12 +01:00
Yann
5d9508ccf6 COmmenting calls to deleted continents in Respawn counts for RIng access 2016-02-09 22:59:01 +01:00
Yann
37c45bebac Changing somelines in continent.cpp 2016-02-09 21:54:52 +01:00
Yann
3fa275e64d merging to lirria 2016-02-09 21:32:08 +01:00
Yann
0dd802f677 Deleting unused continents from code 2016-02-09 21:31:30 +01:00
kervala
f4fbbd5daf Merge with develop 2016-02-09 13:02:57 +01:00
kervala
ea3e661db5 Fixed: Compilation of bin2c (replaced _splitpath and _makepath by something more portable) 2016-02-09 13:02:22 +01:00
kervala
0297521b19 Merge with develop 2016-02-08 14:37:34 +01:00
kervala
50ac2f917e Changed: Increase maximum size of font in chat 2016-02-08 14:35:55 +01:00
kervala
5d8ef9248a Changed: Increase scrollbars width in configuration 2016-02-08 14:35:40 +01:00
kervala
24bb648949 Changed: Translate "No files..." in MP3 player 2016-02-08 14:35:11 +01:00
kervala
97d377e92d Changed: Updated translations 2016-02-08 13:10:34 +01:00
kervala
f89f73fd85 Changed: Updated translations 2016-02-08 12:34:53 +01:00
kervala
1d492138fb Added: CMake file for bin2c 2016-02-07 16:28:23 +01:00
kervala
19d1ea7e95 Merge with develop 2016-02-06 00:24:44 +01:00
kervala
d103415052 Fixed: Use %f to display a float 2016-02-06 00:24:06 +01:00
kervala
2ce00ad573 Fixed: Don't process again same directory 2016-02-06 00:23:43 +01:00
kervala
ab738861ac Merge with develop 2016-02-05 12:30:26 +01:00
kervala
6a049dec8b Fixed: NeL unit test with GCC 2016-02-05 12:29:42 +01:00
kervala
1e4df2c9da Merge with develop 2016-02-04 15:25:39 +01:00
kervala
a176240189 Changed: Only link to Qt5::WinExtras if required 2016-02-04 15:23:02 +01:00
kervala
462e89efe8 Merge with develop 2016-02-04 14:33:30 +01:00
kervala
b00b6acf03 Fixed: Client patcher compilation 2016-02-04 14:32:40 +01:00
kervala
f72cf4789c Changed: Simplify client_patcher to not rely on UXT files anymore and only use english 2016-02-04 13:21:14 +01:00
kaetemi
b171323b91 Also support AppData/Local to allow a non-roaming config 2016-02-04 13:02:32 +01:00
kaetemi
1ed19d8677 Fix tools compilation 2016-02-04 12:27:41 +01:00
kaetemi
22aef38af5 Fix for VS2008 build 2016-02-04 12:07:36 +01:00
kervala
0bf28bf3b6 Merge with develop 2016-02-03 21:58:58 +01:00
kervala
b21ebd149b Changed: Updated launchProgramAndWaitForResult to support .bat files 2016-02-03 21:58:29 +01:00
kervala
62153a10a2 Changed: Only display filename because path can be too long for UI 2016-02-03 21:57:51 +01:00
kervala
016fce1d59 Changed: Translate patch screen 2016-02-03 21:56:54 +01:00
kervala
e408242a39 Changed: Minor changes 2016-02-03 21:56:28 +01:00
kervala
df983e3be4 Changed: Translate some texts in patch screen 2016-02-03 20:17:42 +01:00
kervala
5b82b0cd3b Changed: Use KiB and MiB as units 2016-02-03 20:17:16 +01:00
kervala
5811464f0b Merge with develop 2016-02-02 20:49:21 +01:00
kervala
07ef52ebe0 Fixed: Compilation of shared library 2016-02-02 20:48:49 +01:00
kervala
c920c9d634 Merge with develop 2016-02-02 19:51:11 +01:00
kervala
7028b0ce67 Changed: Use absolute path 2016-02-02 19:50:04 +01:00
kervala
5c8e42734c Changed: Detect .bat file in launchProgram and adapt syntax of CreateProcess 2016-02-02 19:49:37 +01:00
kervala
f80966aed4 Merge with develop 2016-02-02 19:31:12 +01:00
kervala
47f4a5d501 Changed: Use CCmdArgs for client_patcher 2016-02-02 19:30:19 +01:00
kervala
22c8ce32a7 Changed: Simplify client_patcher 2016-02-02 19:30:00 +01:00
kervala
2f7992e43c Changed: Convert unpackTo directories to absolute directories 2016-02-02 19:28:47 +01:00
kervala
6d41451d64 Fixed: Use launchProgram to launch batch 2016-02-02 19:28:10 +01:00
kervala
178a8a949d 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
 2016-02-02 19:26:02 +01:00
kervala
12204bb7e8 Changed: Use application or current directory as root directory for patch 2016-02-02 19:22:25 +01:00
kervala
13c4282911 Changed: Minor changes 2016-02-02 19:21:14 +01:00
kervala
e9a39a9a55 Changed: Use "open" to open other programs too under OS X 2016-02-02 19:20:34 +01:00
kervala
2274cfff89 Fixed: Async execution of .bat under Windows 2016-02-02 19:20:02 +01:00
kervala
185c48b026 Merge with develop 2016-02-02 14:33:32 +01:00
kervala
a83862f498 Removed: Files for patcher 2016-02-02 14:32:06 +01:00
kervala
78d17f478d Fixed: Compile seven_zip for tools 2016-02-02 14:31:57 +01:00
kervala
8d21f350b4 Merge with develop 2016-02-02 12:37:59 +01:00
kervala
3d285b1fc3 Changed: Unit tests for bytesToHumanReadableUnits 2016-02-02 12:37:20 +01:00
kervala
6679aa7621 Changed: New function bytesToHumanReadableUnits to use specific strings for units 2016-02-02 12:37:06 +01:00
kervala
e77a8b17b7 Fixed: Tests for fromStringwith a boolean 2016-02-02 11:38:08 +01:00
kervala
54001f553d Added: New unit tests for common.h 2016-02-02 11:37:46 +01:00
kervala
1978cab022 Fixed: Don't display logs in console for unit tests 2016-02-02 11:34:16 +01:00
kervala
7ffc842ba4 Fixed: Support new ISO units (KiB, MiB, etc...) in humanReadableToBytes 2016-02-02 11:33:44 +01:00
kervala
a82b0baa72 Changed: Support more values for fromString with a boolean 2016-02-02 11:32:20 +01:00
kervala
816d812ea2 Fixed: Use absolute path of current directory instead of relative path (avoid to check more than once the same location) 2016-02-02 10:23:57 +01:00
kervala
54aaa51736 Fixed: patch_gen is now using packLZMA function to compress a file instead of using lzma executable 2016-02-02 10:22:47 +01:00
kervala
92c598c81e 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
 2016-02-02 10:21:42 +01:00
SIELA1915
e9b564fb8b removed all ryzom icons for unix client 2016-02-01 16:06:39 +01:00
SIELA1915
ff4c458f6d changed the last missing 2016-02-01 16:04:21 +01:00
SIELA1915
6dc90dc08a 2. part of ryzom_client.desktop.in not updating in mercurial 2016-02-01 15:46:51 +01:00
SIELA1915
3b61f10cb7 fixed missing ';' in guild_manager.cpp, 1. part for fix of ryzom_client.desktop.in not updating in mercurial 2016-02-01 15:42:42 +01:00
kervala
4d95accfd5 Merge with develop 2016-02-01 09:07:45 +01:00
SIELA1915
74e420958b fixed nf_grp.cpp still for date 2016-01-31 21:04:41 +01:00
SIELA1915
1d60b878f9 final fix for displayTime() (i hope) 2016-01-31 20:48:52 +01:00
SIELA1915
aebed43da0 bugfixes 2016-01-31 20:45:41 +01:00
SIELA1915
6d3cc305de trying fixes 2016-01-31 20:42:07 +01:00
SIELA1915
5a5768c5c4 try to fix time display 2016-01-31 20:37:40 +01:00
SIELA1915
677e4b5e75 fixed CI18N (again lol) 2016-01-31 20:31:11 +01:00
SIELA1915
cd45b8731d bugfixes for CI18N 2016-01-31 20:24:54 +01:00
SIELA1915
68d97aeb0e fixed use of CI18N (it is in namespace NLMISC) 2016-01-31 19:36:58 +01:00
Gary Preston
388050a7fa Allow bnp_make to process "if" and "ifnot" argumenets multiple times instead of 
accepting only one instance or each.
 2016-01-31 18:02:47 +00:00
SIELA1915
095bc1b04c merged with compatibility-develop 2016-01-31 15:42:41 +01:00
SIELA1915
db771f1d2b fixed missing include for server when trying to get the date 2016-01-31 15:39:32 +01:00
Cédric OCHS
47caf67fd8 Merged in BWGaryP/ryzomcore/fix/bnp_make_call (pull request #134) 
Update BnpMake arguements to output bnp files to target folder/name using -o switch.
 2016-01-31 14:57:54 +01:00
Gary Preston
5239e9545b Update BnpMake arguements to output bnp files to target folder/name 
using -o switch.

Exclude first element from package[1] which was used to build the targetBnp file
rather than a file to be included within the bnp.
 2016-01-31 13:35:27 +00:00
SIELA1915
223139d53c merged 2016-01-30 20:51:30 +01:00
SIELA1915
a30a9f2770 added khanat.ico 2016-01-30 20:46:17 +01:00
kervala
e780c87360 Merge with develop 2016-01-30 20:45:19 +01:00
SIELA1915
cc5076b9bf Removed ryzom.ico and ryzom_small.ico 2016-01-30 20:45:09 +01:00
kervala
23c017c4f3 Fixed: Typo 2016-01-30 20:44:33 +01:00
kervala
a9f05efe06 Fixed: Crash if spawnBot is NULL 2016-01-30 20:44:25 +01:00
SIELA1915
5c77c15107 Changed date to match Khanat 2016-01-30 20:43:01 +01:00
kervala
5f3b160710 Merge with develop 2016-01-30 18:16:16 +01:00
kervala
bebae652cc Fixed: AIS crash if variable not initialized (forgot to commit) 2016-01-30 18:15:48 +01:00
kervala
0804083a13 Merge with develop 2016-01-30 18:02:33 +01:00
kervala
bbc7692aff Changed: Minor changes 2016-01-30 18:01:55 +01:00
kervala
7ab17400e7 Fixed: AIS crash if variable not initialized (a big thanks to depyraken to finding it) 2016-01-30 18:01:27 +01:00
kervala
51a54813f3 Merge with develop 2016-01-30 16:23:28 +01:00
kervala
976ebabf74 Changed: Minor changes (thanks to SIELA1915) 2016-01-30 16:22:55 +01:00
kervala
7d5262be16 Changed: Updated translations 2016-01-30 14:31:45 +01:00
kervala
b247d7543f Fixed: Reverted translations fix in wk 2016-01-30 14:31:34 +01:00
kervala
0e4bf4ee74 Fixed: Reverted modified ID for translations 2016-01-30 14:31:13 +01:00
kervala
80268ba17f Changed: Updated translations 2016-01-30 14:30:33 +01:00
kervala
bd19fdda28 Changed: Updated german translations 2016-01-28 17:12:53 +01:00
kervala
7945684a96 merge with develop 2016-01-28 13:27:35 +01:00
kervala
ec3e54f29f Changed: OS X bundles have app extension 2016-01-28 13:27:08 +01:00
kervala
3ac60ba7d8 Fixed: ReleaseDebug configuration not used anymore 2016-01-28 13:26:45 +01:00
kervala
8e54d7b25b Fixed: Don't display D3D item in tree under Linux and OS X 2016-01-28 13:26:02 +01:00
kervala
39574e4352 Fixed: Wrong return value for CCmdArgs::haveAdditionalArg 2016-01-28 13:25:21 +01:00
kervala
f3350a489b Merge with develop 2016-01-27 15:16:44 +01:00
kervala
936148de9d Fixed: Only call setCPUMask once 2016-01-27 14:44:13 +01:00
kervala
fc4ef1909b Fixed: Compilation of client_patcher 2016-01-27 14:42:19 +01:00
kervala
85eb2026f6 Merge with develop 2016-01-27 13:30:49 +01:00
kervala
ba3b4a977b Changed: Removed libxml2 dependencies from other targets 2016-01-27 12:56:16 +01:00
kervala
b6bbcb2eb4 Merge with develop 2016-01-26 23:43:34 +01:00
kervala
154e01ec79 Fixed: Remove inherited dependency on libxml2 for all projects 2016-01-26 23:42:55 +01:00
kervala
869b5d0044 Merge with develop 2016-01-26 23:30:48 +01:00
kervala
8b817eea07 Changed: Minor change 2016-01-26 23:29:58 +01:00
kervala
f118b85dc6 Fixed: Useless dependencies 2016-01-26 23:29:45 +01:00
kervala
a1bf53ca89 Changed: Minor changes 2016-01-26 23:26:50 +01:00
kervala
1c694c3216 Fixed: libxml2 dependencies 2016-01-26 23:26:38 +01:00
kervala
3c66481476 Merge 2016-01-26 22:45:40 +01:00
kervala
2583139ea9 Merge with develop 2016-01-26 22:44:40 +01:00
kervala
5a2be0659b Changed: Works for C compilers too 2016-01-26 22:43:58 +01:00
kervala
3faeb82290 Changed: Removed more useless dependencies 2016-01-26 22:43:35 +01:00
kervala
9bdccc82d1 Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...) 2016-01-26 22:41:58 +01:00
kervala
798194a6d9 Changed: Added PCH for logic 2016-01-26 22:41:02 +01:00
kervala
d05c011033 Changed: Minor changes (EOL, spaces, etc...) 2016-01-26 22:32:45 +01:00
kervala
237b6767b0 Fixed: Remove inherited dependency on libxml2 for all projects 2016-01-26 22:30:13 +01:00
kervala
9bf34dd055 Fixed: Use same XML files as on Atys 2016-01-24 17:08:32 +01:00
kervala
e13cb790fe Merge with develop 2016-01-23 20:33:28 +01:00
kervala
1af5ce7b2e Fixed: Compilation under Linux 2016-01-23 20:32:37 +01:00
kervala
b39f4864fb Merge with develop 2016-01-23 19:07:13 +01:00
kervala
bc86030636 Fixed: Display of emotes using the same character case as in translations and showing corresponding command to type 2016-01-23 19:06:28 +01:00
kervala
9eaa7b8399 Changed: Use CCmdArgs to get program path and search data there 2016-01-23 19:04:52 +01:00
kervala
0820939b59 Fixed: Display wrong commands with UTF-8 characters 2016-01-23 19:04:07 +01:00
kervala
8465076ec9 Changed: Minor changes 2016-01-23 18:59:20 +01:00
kervala
13347aeffa Changed: Support -config/-c parameter passed by Ryzom Installer 2016-01-23 18:58:58 +01:00
kervala
4ca9ffa35e Changed: Use CCmdArgs to parse client command-line 2016-01-23 18:57:32 +01:00
kervala
5212e35775 Changed: Remove commented old crash report code 2016-01-23 18:55:56 +01:00
kervala
c0fb23c007 Changed: Make absolute program path (useful if launched from current directory under Linux) 
Changed: Set process name for logs
 2016-01-23 18:50:17 +01:00
kervala
be0355c570 Fixed: Display an error if adding more than once the same filename in BNP 2016-01-23 18:49:10 +01:00
kervala
d06bff716f Fixed: toLower shouldn't transform a eszett to s 2016-01-23 18:48:25 +01:00
kervala
c051cc0b92 Merge with develop 2016-01-23 13:03:27 +01:00
kervala
344fc44359 Fixed: -o option of tga2dds for directory output 2016-01-23 13:02:29 +01:00
kervala
f928fa8b5c Merge with develop 2016-01-23 12:30:33 +01:00
kervala
3446cb4038 Changed: Use CBigFile to manage BNP and CCmdArgs for command-line in bnp_make 2016-01-23 12:30:01 +01:00
kervala
0ff951d94c Changed: Replace tabs by spaces 2016-01-23 12:28:40 +01:00
kervala
61b6ea0723 Fixed: Return true if a required argument is found 2016-01-23 12:28:22 +01:00
kervala
e0aa90e0f3 Changed: Use CBigFile to unpack BNP in CPatchManager 2016-01-23 12:27:41 +01:00
kervala
4151b88b3a Merge with develop 2016-01-23 10:59:56 +01:00
kervala
5e575d505e Fixed: Link to Qt ICO plugin 2016-01-23 10:59:30 +01:00
kervala
267bbcfb23 Merge with develop 2016-01-23 10:28:00 +01:00
kervala
f992ab007f Changed: Use CCmdArgs for tga2dds 2016-01-23 10:27:34 +01:00
kervala
b7c65ae7df Merge with develop 2016-01-23 10:19:01 +01:00
kervala
02bb9edf7d Changed: Minor changes 2016-01-23 10:18:23 +01:00
kervala
9d319a5688 Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs 2016-01-23 10:18:09 +01:00
kervala
94b033caf9 Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..) 2016-01-23 09:44:41 +01:00
kervala
f0b6bc23e5 Merge with develop 2016-01-21 15:07:14 +01:00
kervala
7f054799b4 Fixed: Crash in backup service 2016-01-21 15:06:40 +01:00
kervala
8a1b7d7836 Fixed: Don't install static libraries if not defining WITH_INSTALL_LIBRARIES 2016-01-21 15:06:01 +01:00
kervala
ebe4f7406d Removed: installscript_osx.vdf because we manage it directly in code now 2016-01-21 10:15:09 +01:00
kervala
4bcb41896e Merge with develop 2016-01-21 10:08:56 +01:00
kervala
05ce879469 Changed: Improve toString(const bool &val)... 2016-01-21 10:06:35 +01:00
kervala
82395e86f6 Fixed: Use icon under Windows 2016-01-21 10:05:26 +01:00
kervala
19de3d4e43 Changed: Minor changes 2016-01-21 10:05:10 +01:00
kervala
52899295c0 Changed: Updated translations 2016-01-20 19:50:51 +01:00
Nimetu
6a01e0c28b Merge with develop 2016-01-20 19:15:45 +02:00
Nimetu
5c3e84cf1b Changed: Use url from <base> element for relative urls 2016-01-20 19:15:20 +02:00
kervala
ce54eb820f Changed: Ryzom version 2.9.0 (stable version will be 3.0.0) 2016-01-20 13:08:23 +01:00
kervala
d1fea8d771 Merge with develop 2016-01-20 13:06:47 +01:00
kervala
16a6f7b271 Changed: Use a different original filename for DEV version 2016-01-20 13:06:15 +01:00
kervala
4e1f03e920 Fixed: Compilation in 64 bits under Windows 2016-01-20 13:05:55 +01:00
SIELA1915
c91e7626b4 stuff 2016-01-20 08:01:51 +01:00
kervala
d8986e4fe3 Merge with develop 2016-01-19 20:42:11 +01:00
kervala
b31816911a Changed: Removed fromString(const char *, ...) because useless 2016-01-19 20:41:41 +01:00
kervala
c00a1608ec Changed: Local includes against system includes 2016-01-19 20:38:05 +01:00
kervala
5dfd931cf8 Fixed: Compilation without PCH 2016-01-19 20:37:03 +01:00
kervala
28365d4012 Removed: Binary file generated by VC++ 2016-01-19 20:35:59 +01:00
kervala
40617b1f70 Fixed: Some unit tests with fromString 2016-01-19 13:12:53 +01:00
kervala
28d81f9e4e Changed: Updated translations 2016-01-19 09:17:09 +01:00
kervala
9f22359d02 Merge with develop 2016-01-18 21:48:31 +01:00
kervala
655e105d71 Fixed: Updated with new changes 2016-01-18 21:48:00 +01:00
kervala
1c791785f6 Merge with develop 2016-01-18 21:32:01 +01:00
kervala
58d7c95b05 Changed: Minor changes 2016-01-18 21:31:23 +01:00
kervala
eb30647103 Changed: Remove hardcoded L:\\primitives\\ from C++ code (use RYZOM_LEVELDESIGN environment varianle instead) 2016-01-18 21:31:10 +01:00
kervala
3000ae7cdf Changed: Only add search paths that exist 2016-01-18 21:29:43 +01:00
kervala
4f8aa63f78 Changed: Improved CCmdArgs 2016-01-18 21:22:57 +01:00
kervala
53fb7f39f4 Changed: Don't need to create it on heap 2016-01-18 13:27:48 +01:00
kervala
1641e48be0 Fixed: Import static platform plugin 2016-01-18 13:27:23 +01:00
kaetemi
e7b977c780 Faster Qt startup 2016-01-18 11:27:14 +01:00
kervala
6dba74ba53 Changed: Remove InstallStatsUrl in client_default.cfg 2016-01-17 20:16:18 +01:00
Tobias Peters
6359017dce Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests 2016-01-17 20:05:02 +01:00
SIELA1915
b46f7cd0cd Merged with new things. 2016-01-17 13:36:59 +01:00
kervala
25f98dbca8 Merge with develop 2016-01-17 13:24:01 +01:00
kervala
9ff0f99cea Fixed: Compilation with static Qt 5 2016-01-17 13:23:25 +01:00
kervala
d42d285958 Fixed: Typo in Lua 5.3 module 2016-01-17 13:21:27 +01:00
kervala
0a77dfbd5a Merge with develop 2016-01-16 23:50:23 +01:00
kervala
06f72437e2 Fixed: Right directories 2016-01-16 23:49:39 +01:00
kervala
2355f81fbd Fixed: Missing ++ 2016-01-16 23:48:44 +01:00
kervala
1cc7c18f1a Changed: Set CMP0020 NEW in root project 2016-01-16 23:48:32 +01:00
kervala
8124033e69 Changed: Minor changes 2016-01-16 23:47:58 +01:00
kervala
852da988fe Added: Config file for translation_tools 2016-01-16 23:47:12 +01:00
kervala
66c8dcab61 Fixed: Use lua_tointeger under Lua 5.2 and prior versions 2016-01-16 21:35:34 +01:00
SIELA1915
da926956b7 Merged 2016-01-16 17:32:22 +01:00
SIELA1915
cf9cd1c239 Changed icons for Unix and name. 2016-01-16 17:31:54 +01:00
kervala
c0e1abd41d Merge with develop 2016-01-16 15:58:19 +01:00
kervala
45a3bf320e Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals 2016-01-16 15:55:56 +01:00
kervala
5c0fcc5cfc Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 2016-01-16 15:54:46 +01:00
kervala
9ba7bcf720 Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) 2016-01-16 15:52:51 +01:00
kervala
bdcfa10c66 Fixed: Link to X11 under Linux 2016-01-16 15:50:45 +01:00
kervala
12bf13239c Fixed: Link to static libxml2 under Linux 2016-01-16 15:50:17 +01:00
kervala
74722cb678 Changed: Update year in copyright automatically 2016-01-16 15:47:13 +01:00
kervala
0d8b09001a Merge with develop 2016-01-16 10:52:18 +01:00
kaetemi
7d11f82e58 Update mask pixel format in panoply preview tool 2016-01-15 17:22:27 +01:00
kaetemi
20f93996ea Add panoply preview tool 2016-01-15 17:11:10 +01:00
kaetemi
8f61c6dfa9 Separate window displayer message stringify 2016-01-15 17:10:39 +01:00
kaetemi
fe6cc6656b Fix bad printf parameters 2016-01-15 16:42:21 +01:00
kaetemi
8b95360709 More of that VS2015 magic 2016-01-15 16:17:23 +01:00
kaetemi
c4f5b5d521 And more VS2015 fixes 2016-01-15 12:33:27 +01:00
kaetemi
9c1d333924 More of the VS2015 stuff 2016-01-15 12:29:05 +01:00
kaetemi
8405248a32 VS2015 fixes for NeL Samples 2016-01-15 12:22:35 +01:00
kaetemi
b81ae23369 Fix another VS2015 warning 2016-01-15 12:07:33 +01:00
kaetemi
e9912417bf More VS2015 fixes 2016-01-15 12:04:06 +01:00
kaetemi
a6b1ac4331 Fix VS2015 warnings 2016-01-15 11:52:09 +01:00
kaetemi
6abf73a61d VS2015 compilation fixes 2016-01-15 11:34:23 +01:00
kervala
eac3dc3ae1 Merge with develop 2016-01-15 10:47:37 +01:00
kervala
1c30bd835f Changed: Update WindowsSDK CMake module for VC++ 2015 2016-01-15 10:46:34 +01:00
kervala
156b14e989 Merge with develop 2016-01-14 23:58:34 +01:00
kervala
13f1ddd6f3 Fixed: Compilation 2016-01-14 23:58:04 +01:00
kervala
d60244a9c5 Merge with develop 2016-01-14 23:54:26 +01:00
kervala
3d9d77484a Changed: Minor changes 2016-01-14 23:53:17 +01:00
kervala
8040a6495b Changed: Invert version and help checks 2016-01-14 23:47:24 +01:00
kervala
1720f33c53 Fixed: Compilation 2016-01-14 23:46:19 +01:00
kervala
4bcc9cf6e0 Fixed: Use language name in native language in config window 2016-01-14 22:42:34 +01:00
kervala
e856e59a2d Merge with develop 2016-01-14 21:28:47 +01:00
kervala
bed94fb47e Fixed: Warning with clang 2016-01-14 21:27:42 +01:00
kervala
ef6cc501e0 Fixed: Right directory under OS X 2016-01-14 21:27:10 +01:00
kervala
823818f31f Fixed: Don't display D3D page under Linux and OS X 2016-01-14 21:26:47 +01:00
kervala
2682f4f4af Improve CCmdArgs (a generic command line parser in NeL Misc), fixes #257 2016-01-14 21:26:10 +01:00
kervala
06353eaa43 Merge with develop 2016-01-14 10:22:22 +01:00
kervala
e5d414fc5b Fixed: Compilation under OS X 2016-01-14 10:21:50 +01:00
kervala
7b075b979f Merge with develop 2016-01-13 20:05:06 +01:00
kervala
d55b781374 Fixed: Use map for faster search for example (implemented a TODO of GUIGUI) 2016-01-13 20:04:01 +01:00
kervala
29f56159b1 Changed: Replace \\ by / 2016-01-13 20:02:24 +01:00
kervala
13ee42d521 Fixed: Remove some hardcoded paths and replaced them by LeveldesignDataPath variable 2016-01-13 20:01:36 +01:00
kervala
02f6248bd4 Changed: Expand environment variables in paths read from cfg files 2016-01-13 19:59:09 +01:00
kervala
b05b865cfb Changed: Minor changes 2016-01-13 19:54:23 +01:00
kervala
2c8b51e9f9 Changed: Remove duplicate lines 2016-01-13 19:53:20 +01:00
kervala
2a3e173488 Changed: Try different alternative paths for game folders 2016-01-13 19:52:58 +01:00
kervala
9ab71b6c27 Fixed: Convert .bank filenames with / and use existing CFile::fileExists 2016-01-13 19:51:00 +01:00
kervala
50c796236b Fixed: getLastSeparator should return std::string::size_type instead of an integer 2016-01-13 19:47:35 +01:00
kervala
12e16e83e2 Changed: Implement CPath::isAbsolutePath 2016-01-13 19:46:27 +01:00
kervala
179499a5c1 Changed: Implement expandEnvironmentVariables function 2016-01-13 19:45:02 +01:00
kervala
b8d7b685f5 Fixed: Save filenames in .bank with / instead of system separator 2016-01-13 19:43:46 +01:00
SIELA1915
cd19784bff removed ryzom.icns 2016-01-13 19:31:02 +01:00
SIELA1915
93d2b80966 Adjustments to give more options to do custom emotes, "Khanatization" for the Mac Client, changements to the key system. 2016-01-13 19:26:28 +01:00
kervala
ac2229d42c Merge with develop 2016-01-12 22:32:22 +01:00
kervala
3a009045aa Changed: Init CLoginProgressPostThread only if InstallStatsUrl is defined 2016-01-12 22:31:06 +01:00
kervala
5b01b79a4c Fixed: lua_tointeger doesn't work if value has a decimal part and returns 0 2016-01-12 22:21:38 +01:00
kervala
acd0d6d88a Merge with develop 2016-01-11 13:53:32 +01:00
kervala
adb1cbf4bc Fixed: Wrong directory 2016-01-11 13:53:01 +01:00
kervala
9ec144c2b5 Merge with develop 2016-01-11 12:55:47 +01:00
kervala
1a56512b24 Fixed: Error when signing bundle 2016-01-11 12:55:09 +01:00
kervala
15e7f957c7 Merge with develop 2016-01-11 11:44:44 +01:00
kervala
7e5c664125 Changed: Table keys are integers 2016-01-11 11:43:59 +01:00
kervala
3e10ebf773 Fixed: In Lua, all integers are numbers and numbers can be converted to integers 2016-01-11 11:34:32 +01:00
kervala
b76e7c938e Merge with develop 2016-01-11 10:09:58 +01:00
kervala
7bcae9dbe4 Fixed: Ryzom Configuration under OS X 2016-01-11 10:09:10 +01:00
Nimetu
683a06efea Merge with develop 2016-01-10 16:34:13 +02:00
Nimetu
70673d5fb5 Fixed: Invalid image width/height on error 2016-01-10 16:33:42 +02:00
kervala
ef261f1be3 Merge with develop 2016-01-10 12:13:59 +01:00
kervala
5a01065159 Fixed: Compilation of object_viewer_widget in static under Linux 2016-01-10 12:12:50 +01:00
kervala
686586e3df Merge with develop 2016-01-09 19:42:29 +01:00
kervala
2dc084afc3 Fixed: Compilation 2016-01-09 19:41:45 +01:00
kervala
7fc4daa0a6 Merge with develop 2016-01-09 19:32:59 +01:00