Commit graph

7145 commits

Author SHA1 Message Date
1906de7b89 Update sheets_packer.cfg pour faciliter la mise en place du shard 2016-12-31 00:01:13 +01:00
a6339b7fd9 Merge branch 'feature/v3+CI' into 'develop'
Feature/v3+ci

Toujours le merge de la v3...

See merge request !28
2016-12-13 13:54:26 +00:00
9bd0bf131c Update .gitlab-ci.yml 2016-12-13 13:22:52 +00:00
f46cad2e63 Update .gitlab-ci.yml 2016-12-13 12:56:37 +00:00
1fdbb7e688 Update .gitlab-ci.yml 2016-12-13 12:47:22 +00:00
4f784dc460 Update .gitlab-ci.yml 2016-12-13 12:35:32 +00:00
7369ce6f78 Update .gitlab-ci.yml 2016-12-12 21:51:23 +00:00
eba869c7f0 Update .gitlab-ci.yml 2016-12-12 21:46:56 +00:00
2e8bfb3f0b Update .gitlab-ci.yml 2016-12-12 21:39:35 +00:00
9242213489 Update .gitlab-ci.yml 2016-12-12 21:36:14 +00:00
5cedb47135 Update .gitlab-ci.yml 2016-12-12 21:24:36 +00:00
2a21b4b517 Update .gitlab-ci.yml 2016-12-12 21:13:26 +00:00
f229de6ba5 Update .gitlab-ci.yml 2016-12-12 14:59:45 +00:00
3c25a4eb8c Update .gitlab-ci.yml 2016-12-12 14:32:42 +00:00
15db81852c Update .gitlab-ci.yml 2016-12-12 14:28:21 +00:00
a549e75526 Update .gitlab-ci.yml 2016-12-12 13:58:04 +00:00
e7a8320e98 Update .gitlab-ci.yml 2016-12-12 13:30:54 +00:00
0e55d39f53 Update egs_mirror.cpp (ajout ChaScore1 ) warning dans le shard 2016-12-12 09:34:03 +00:00
d5b6609538 Correction des privileges ChaScore1 et maxChaScore1 pour les GM 2016-12-07 21:40:41 +01:00
5d93d12272 Changement du nom de shard "Open" en "Lirria" 2016-12-07 21:26:43 +01:00
ce305c7512 Merge branch 'develop' of https://git.khaganat.net/khaganat/khanat-code into develop 2016-12-03 17:57:35 +01:00
56df66454a Changement du nom du shard à la création du personnage 2016-12-03 17:56:35 +01:00
99543f52f3 Delete sheet_id.bin , il ne devrait pas être la c'est une erreur !!! 2016-11-17 21:20:07 +00:00
Erwan Georget
9a7d51bda2 Ajustement de version de dépendances 2016-11-13 21:20:59 +01:00
Erwan Georget
2aa121968d tentative avec Ubuntu 16.10 (on ne sait jamais) 2016-11-13 21:10:27 +01:00
Erwan Georget
92a53aa4f5 test de compilation avec Ubuntu 16.04 au lieux de Ubuntu 14.04 2016-11-13 13:32:24 +01:00
Erwan Georget
61b607aebd Merge branch 'feature/ci-for-all' into 'develop'
Modification du CI pour build toutes les branches

Étant donner que les système actuel est un peu trop difficile à comprendre, et de l'ajout d'un runner CI permanent (merci moi-même), j'ai activé le CI pour toutes les branches (sauf Ryzomcore).

See merge request !26
2016-11-12 20:41:05 +00:00
Erwan Georget
52ee255d7e CI goodness for all 2016-11-07 20:56:17 +01:00
Sit Melai
ccb943b852 Merge de la v3 de Ryzom Core 2016-11-07 17:11:05 +01:00
kervala
7d909da444 Changed: Rerun Installer from a specific directory with right arguments 2016-11-05 19:46:12 +01:00
kervala
33580166f4 Changed: Minor changes 2016-11-04 20:23:01 +01:00
kervala
59527ecc49 Changed: Don't display an error if file doesn't exist 2016-11-04 20:22:42 +01:00
kervala
e50b590ad0 Changed: Discard \r and only use \n 2016-11-04 20:22:10 +01:00
kervala
6eb66730a5 Changed: Only put a space if several conditions 2016-11-04 20:21:18 +01:00
kervala
e1315c28a7 Changed: Minor changes 2016-11-04 20:20:39 +01:00
kervala
01736696a8 Changed: ForceUtf8 parameter useless now 2016-11-04 20:19:41 +01:00
kervala
4ad536b4fb Fixed: Wrong size of nl 2016-11-04 09:17:32 +01:00
kervala
db95157bdb Changed: Minor changes 2016-11-04 09:14:08 +01:00
kervala
2da57a4d24 Changed: Removed trailing spaces 2016-11-04 09:09:51 +01:00
kervala
8b40f509a0 Changed: Minor changes 2016-11-03 15:23:08 +01:00
kervala
6372a8f5fb Fixed: Only release NSAutoreleasePool once at the end 2016-11-03 15:22:59 +01:00
kervala
cd9a3c35c4 Changed: Sleep 1 second after copying files (because to some disk cache) 2016-11-03 14:44:01 +01:00
kervala
2625225120 Changed: Don't try to copy Installer several times (if it fails once, it'll fail forever) 2016-11-03 14:43:08 +01:00
kervala
d90983bee3 Changed: Use QSaveFile to be sure the file is fully written 2016-11-03 14:42:07 +01:00
Sit Melai
7e03f9964f Répare une fausse manipulation en rajoutant un const 2016-11-02 14:41:50 +00:00
003480c4e9 mise a jour des bons fichiers sur le client khanat 2016-11-01 17:59:10 +01:00
Sit Melai
510b5672d3 Fixed build_sound tool crashing because of not initialized CSheetId 2016-10-31 22:52:25 +01:00
Sit Melai
f75a3cdd2d Merge branch 'develop' of ssh://git.khaganat.net:1022/khaganat/khanat-code into develop
Merging local changes
2016-10-31 22:50:39 +01:00
Sit Melai
5231e8de28 various improvements to clients 2016-10-31 22:46:39 +01:00
kervala
8d16f2bc49 Fixed: Update libovr detection 2016-10-31 19:00:19 +01:00