Commit graph

6060 commits

Author SHA1 Message Date
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
deed
3cd8969cd7 Changement du volume du sac 2016-02-11 09:48:19 +01:00
SIELA1915
af55112ebf merged local changes 2016-02-09 23:12:25 +01:00
SIELA1915
55c9fac693 ignoring more build folders 2016-02-09 23:11:00 +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
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
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
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
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