Commit graph

6168 commits

Author SHA1 Message Date
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
98c2b9c67d branch merge lirria 2016-02-01 16:10:11 +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
4ce753cdc9 changed .hgignore to ignore /code/build_debian32 and /code/build_debian64 directories 2016-02-01 15:48:47 +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
d6e8706581 merged Siela's changes with test changes 2016-01-30 21:51:32 +01:00
Yann
f81e1b0adc Adding a file for testing purposes 2016-01-30 21:30:32 +01:00
SIELA1915
74342fca4d creation de la branche lirria 2016-01-30 20:55:19 +01:00
SIELA1915
8d3c88e72a ignoring build_windows and build_linux 2016-01-30 20:53:43 +01: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