Commit graph

6792 commits

Author SHA1 Message Date
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
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