Commit graph

5905 commits

Author SHA1 Message Date
kervala
d8ddb1fd11 Fixed: Async execution of .bat under Windows
--HG--
branch : develop
2016-02-02 19:20:02 +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
e5a601c109 Changed: Unit tests for bytesToHumanReadableUnits
--HG--
branch : develop
2016-02-02 12:37:20 +01:00
kervala
092a3226bd Changed: New function bytesToHumanReadableUnits to use specific strings for units
--HG--
branch : develop
2016-02-02 12:37:06 +01:00
kervala
b692b78718 Fixed: Tests for fromStringwith a boolean
--HG--
branch : develop
2016-02-02 11:38:08 +01:00
kervala
285965fe76 Added: New unit tests for common.h
--HG--
branch : develop
2016-02-02 11:37:46 +01:00
kervala
20c7c342ca Fixed: Don't display logs in console for unit tests
--HG--
branch : develop
2016-02-02 11:34:16 +01:00
kervala
7b1ab1592e Fixed: Support new ISO units (KiB, MiB, etc...) in humanReadableToBytes
--HG--
branch : develop
2016-02-02 11:33:44 +01:00
kervala
0919fc66e4 Changed: Support more values for fromString with a boolean
--HG--
branch : develop
2016-02-02 11:32:20 +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
ed68c612ac Merge with develop
--HG--
branch : compatibility-develop
2016-02-01 09:07:45 +01:00
Gary Preston
963ee5a66e Allow bnp_make to process "if" and "ifnot" argumenets multiple times instead of
accepting only one instance or each.

--HG--
branch : develop
2016-01-31 18:02:47 +00:00
Cédric OCHS
c2e444774e 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.

--HG--
branch : develop
2016-01-31 14:57:54 +01:00
Gary Preston
45755dd86f 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.

--HG--
branch : fix/bnp_make_call
2016-01-31 13:35:27 +00: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
6e93a0d395 Fixed: Wrong return value for CCmdArgs::haveAdditionalArg
--HG--
branch : develop
2016-01-28 13:25:21 +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
eae2e3fea1 Merge with develop
--HG--
branch : compatibility-develop
2016-01-26 23:43:34 +01:00
kervala
4c96c5a608 Fixed: Remove inherited dependency on libxml2 for all projects
--HG--
branch : develop
2016-01-26 23:42:55 +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
59aaad27c1 Changed: Works for C compilers too
--HG--
branch : develop
2016-01-26 22:43:58 +01:00
kervala
36f886f5f1 Changed: Removed more useless dependencies
--HG--
branch : develop
2016-01-26 22:43:35 +01:00
kervala
89319eb99c Changed: Put libxml code in .cpp (it was a hack for libwww, that is not used anymore...)
--HG--
branch : develop
2016-01-26 22:41:58 +01:00
kervala
df22787f90 Changed: Added PCH for logic
--HG--
branch : develop
2016-01-26 22:41:02 +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
7237736922 Changed: Make absolute program path (useful if launched from current directory under Linux)
Changed: Set process name for logs

--HG--
branch : develop
2016-01-23 18:50:17 +01:00
kervala
222544f902 Fixed: Display an error if adding more than once the same filename in BNP
--HG--
branch : develop
2016-01-23 18:49:10 +01:00
kervala
0505395fd1 Fixed: toLower shouldn't transform a eszett to s
--HG--
branch : develop
2016-01-23 18:48:25 +01:00
kervala
e6b2e0088b Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 13:03:27 +01:00
kervala
5892fb8c1c Fixed: -o option of tga2dds for directory output
--HG--
branch : develop
2016-01-23 13:02:29 +01:00
kervala
5adebf258d Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 12:30:33 +01:00
kervala
1ca826cda9 Changed: Use CBigFile to manage BNP and CCmdArgs for command-line in bnp_make
--HG--
branch : develop
2016-01-23 12:30:01 +01:00
kervala
f8d45d01dc Changed: Replace tabs by spaces
--HG--
branch : develop
2016-01-23 12:28:40 +01:00
kervala
9aff198d70 Fixed: Return true if a required argument is found
--HG--
branch : develop
2016-01-23 12:28:22 +01:00
kervala
e35fe4384b Changed: Use CBigFile to unpack BNP in CPatchManager
--HG--
branch : develop
2016-01-23 12:27:41 +01:00
kervala
a8a1e04299 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:59:56 +01:00
kervala
7f69309e39 Fixed: Link to Qt ICO plugin
--HG--
branch : develop
2016-01-23 10:59:30 +01:00
kervala
5f70be0308 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:28:00 +01:00
kervala
12d87b4914 Changed: Use CCmdArgs for tga2dds
--HG--
branch : develop
2016-01-23 10:27:34 +01:00
kervala
9aea637643 Merge with develop
--HG--
branch : compatibility-develop
2016-01-23 10:19:01 +01:00
kervala
e2cc9e622e Changed: Minor changes
--HG--
branch : develop
2016-01-23 10:18:23 +01:00
kervala
19aa093ea8 Changed: Centralize BNP unpacking and packing methods, to be reused in other tools/programs
--HG--
branch : develop
2016-01-23 10:18:09 +01:00
kervala
93e1289a77 Changed: Add a parameter to CPath::makePathAbsolute to simplify the path (remove all . and ..)
--HG--
branch : develop
2016-01-23 09:44: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
aff9cccd0c Changed: Improve toString(const bool &val)...
--HG--
branch : develop
2016-01-21 10:06:35 +01:00
kervala
a08cdce803 Fixed: Use icon under Windows
--HG--
branch : develop
2016-01-21 10:05:26 +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
Nimetu
6b13fdd770 Merge with develop
--HG--
branch : compatibility-develop
2016-01-20 19:15:45 +02:00
Nimetu
52dcf1a300 Changed: Use url from <base> element for relative urls
--HG--
branch : develop
2016-01-20 19:15:20 +02:00
kervala
d03e896702 Changed: Ryzom version 2.9.0 (stable version will be 3.0.0)
--HG--
branch : compatibility-develop
2016-01-20 13:08:23 +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
6c27e927b5 Fixed: Compilation in 64 bits under Windows
--HG--
branch : develop
2016-01-20 13:05:55 +01:00
kervala
f50c9c0866 Merge with develop
--HG--
branch : compatibility-develop
2016-01-19 20:42:11 +01:00
kervala
fa22852adb Changed: Removed fromString(const char *, ...) because useless
--HG--
branch : develop
2016-01-19 20:41:41 +01:00
kervala
5cc2b2865f Changed: Local includes against system includes
--HG--
branch : develop
2016-01-19 20:38:05 +01:00
kervala
00395d6b2e Fixed: Compilation without PCH
--HG--
branch : develop
2016-01-19 20:37:03 +01:00
kervala
5fb0c5d279 Removed: Binary file generated by VC++
--HG--
branch : develop
2016-01-19 20:35:59 +01:00
kervala
1864ad70db Fixed: Some unit tests with fromString
--HG--
branch : develop
2016-01-19 13:12:53 +01:00
kervala
3faac85a41 Changed: Updated translations
--HG--
branch : compatibility-develop
2016-01-19 09:17:09 +01:00
kervala
d96e1da521 Merge with develop
--HG--
branch : compatibility-develop
2016-01-18 21:48:31 +01:00
kervala
e01f706ccc Fixed: Updated with new changes
--HG--
branch : develop
2016-01-18 21:48:00 +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
b91e3bdf0e Changed: Improved CCmdArgs
--HG--
branch : develop
2016-01-18 21:22:57 +01:00
kervala
c379c61ab7 Changed: Don't need to create it on heap
--HG--
branch : develop
2016-01-18 13:27:48 +01:00
kervala
fc645a5668 Fixed: Import static platform plugin
--HG--
branch : develop
2016-01-18 13:27:23 +01:00
kaetemi
fd950a692b Faster Qt startup
--HG--
branch : develop
2016-01-18 11:27:14 +01:00
kervala
016f56578a Changed: Remove InstallStatsUrl in client_default.cfg
--HG--
branch : compatibility-develop
2016-01-17 20:16:18 +01:00
Tobias Peters
48c7404c74 Merged github:zerotacg/ryzomcore/issue/fix-failing-unit-tests
--HG--
branch : issue/fix-failing-unit-tests
2016-01-17 20:05:02 +01:00
kervala
6ea1421fd3 Merge with develop
--HG--
branch : compatibility-develop
2016-01-17 13:24:01 +01:00
kervala
58d23bbe97 Fixed: Compilation with static Qt 5
--HG--
branch : develop
2016-01-17 13:23:25 +01:00
kervala
d5749430f7 Fixed: Typo in Lua 5.3 module
--HG--
branch : develop
2016-01-17 13:21:27 +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
c5fbf56984 Fixed: Missing ++
--HG--
branch : develop
2016-01-16 23:48:44 +01:00
kervala
bb9ac688f6 Changed: Set CMP0020 NEW in root project
--HG--
branch : develop
2016-01-16 23:48:32 +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
b3cfd5f6bb Fixed: Use lua_tointeger under Lua 5.2 and prior versions
--HG--
branch : develop
2016-01-16 21:35:34 +01:00
kervala
b149c94a26 Merge with develop
--HG--
branch : compatibility-develop
2016-01-16 15:58:19 +01:00
kervala
4886da5855 Fixed: moc doesn't use the right namespace for std::string when using STLPort, so prefer QString for slots and signals
--HG--
branch : develop
2016-01-16 15:55:56 +01:00
kervala
cd021fc4ef Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist)
--HG--
branch : develop
2016-01-16 15:54:46 +01:00
kervala
c427bb216b Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist)
--HG--
branch : develop
2016-01-16 15:52:51 +01:00
kervala
8b5dcc345d Fixed: Link to X11 under Linux
--HG--
branch : develop
2016-01-16 15:50:45 +01:00
kervala
074fdb5c22 Fixed: Link to static libxml2 under Linux
--HG--
branch : develop
2016-01-16 15:50:17 +01:00
kervala
5c772f45b4 Changed: Update year in copyright automatically
--HG--
branch : develop
2016-01-16 15:47:13 +01:00
kervala
cca0dd450e Merge with develop
--HG--
branch : compatibility-develop
2016-01-16 10:52:18 +01:00
kaetemi
9c687430c8 Update mask pixel format in panoply preview tool
--HG--
branch : develop
2016-01-15 17:22:27 +01:00
kaetemi
8673d27a13 Add panoply preview tool
--HG--
branch : develop
2016-01-15 17:11:10 +01:00
kaetemi
8cfaa89620 Separate window displayer message stringify
--HG--
branch : develop
2016-01-15 17:10:39 +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
kaetemi
f7d05ea8e4 VS2015 fixes for NeL Samples
--HG--
branch : develop
2016-01-15 12:22:35 +01:00
kaetemi
9a0c6290a2 Fix another VS2015 warning
--HG--
branch : develop
2016-01-15 12:07:33 +01:00
kaetemi
da02779588 More VS2015 fixes
--HG--
branch : develop
2016-01-15 12:04:06 +01:00