khanat-ressources-NeL

Khaganat-NeL/khanat-ressources-NeL

Fork 0

Commit graph

Select branches

Hide pull requests

bnp_make_param_fix

feature/0004_aquatic_rider

feature/0011_primitive_meunier

feature/0013_ajout_nouveau_objet

feature/character_screens

feature/test-bijoux

feature/test-spire

lirria

#17

#18

#19

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#50

#51

#52

#53

#54

#55

#56

#57

668b1fcd54 Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' lirria deed 2017-08-29 23:04:30 +0200
3ce5fbaa80 correction de la trad creature (oublie d'une tab) feature/0013_ajout_nouveau_objet compil 2017-08-29 23:01:30 +0200
551d790cb3 ajout des panneaux et boskurji dans les primitves compil 2017-08-25 21:03:49 +0200
cabc93a213 correction des DS boskurji compil 2017-08-25 21:01:37 +0200
018a9399c8 ajout de la traduction boskurji compil 2017-08-25 20:56:30 +0200
170d413e66 ajout des panneaux deed 2017-07-27 22:28:10 +0200
9232f9f278 Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-07-09 21:55:46 +0200
f57f950002 correction de bug /primitives deed 2017-07-09 21:54:22 +0200
b4ddcf96b3 Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-07-06 23:57:14 +0200
d2ffe85ba7 ajout de pnj dans les primitives et correction des missions deed 2017-07-06 23:40:39 +0200
8db7ba5840 Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-07-01 15:25:33 +0200
e53c1b945d ajout de trad deed 2017-07-01 15:24:07 +0200
a7ca1ea6bf Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-07-01 15:20:56 +0200
e324721a09 changement mineur sur les primitives et pnj deed 2017-07-01 15:18:24 +0200
35ead35783 ajout pnj deed 2017-06-24 17:15:38 +0200
7c38bb6874 Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-06-19 21:07:28 +0200
29d1b950c6 traduction des ajouts deed 2017-06-19 15:27:54 +0200
41704302f9 ajout de npc deed 2017-06-17 15:35:22 +0200
d296868f85 ajout nouveau objet deed 2017-05-26 14:31:35 +0200
806148903f Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-05-20 17:54:37 +0200
0f6304c772 leveldesign mineur deed 2017-05-20 17:50:09 +0200
3ae4b8182c changement des dispositions dans les primitives deed 2017-05-20 17:03:28 +0200
def1288b1f Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-05-18 12:02:20 +0200
9b8b967fa3 ajout d'abris a pnj deed 2017-05-18 12:00:03 +0200
86c66c330f Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-05-15 14:44:56 +0200
10ad380ff6 ajout de l'etable deed 2017-05-15 13:48:37 +0200
4dc3c23612 Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria' deed 2017-05-14 21:16:54 +0200
f6cebd25ea ajout de nouvelle datasheet d'objet de decoration deed 2017-05-13 16:24:20 +0200
2baf1c0d7d erreur de push d'un fichier de travail deed 2017-04-14 14:03:36 +0200
815a44f122 Merge branch 'feature/0012_traduction_manquante' into 'lirria' deed 2017-03-24 21:44:38 +0100
d162ad82c4 traduction manquante de la mission farine deed 2017-03-24 21:40:40 +0100
2ce941958c ajout des traductions manquantes de l'interface deed 2017-03-24 21:16:02 +0100
c0b6370a2a Merge branch 'feature/0011_primitive_meunier' into 'lirria' deed 2017-03-07 15:12:47 +0100
1f3dd708f3 correction des missions du moulin feature/0011_primitive_meunier deed 2017-03-07 15:10:18 +0100
fbb2f1bf23 bug correction de test arme deed 2017-03-07 15:06:44 +0100
54e5dab61b Merge branch 'feature/0010_correction_wrg_visualtab' into 'lirria' deed 2017-03-06 14:34:13 +0100
62d34c8ea9 modification provisoir deed 2017-03-06 14:16:58 +0100
42917a165b correction animation deed 2017-03-06 13:58:51 +0100
edba8ef641 correction des sbrick et sphrase deed 2017-03-06 10:55:23 +0100
0846312160 Merge branch 'feature/0009_mission_farine' into 'lirria' deed 2017-03-04 19:25:21 +0100
bccc5c5134 ajout et correction des missions liées à la farine de gedja (divers test de trad) deed 2017-03-04 19:15:03 +0100
c2ea399786 Merge branch 'feature/0008_ajout_egg_revif' into 'lirria' deed 2017-02-27 23:01:33 +0100
69e65ef3e7 revert erreur de commit deed 2017-02-27 22:54:53 +0100
2cb30cc5d0 ajout de l'oeuf revif dans les primitives et ajout divers ajout RP deed 2017-02-27 22:29:13 +0100
25f75afa1d Merge branch 'feature/0007_ajout_DS_test_revif' into 'lirria' scoui 2017-02-22 18:04:59 +0100
cc14d6ae83 Merge branch 'cherry-pick-e75e304d' into 'feature/0007_ajout_DS_test_revif' deed 2017-02-22 17:10:37 +0100
d8c558a9e9 ajout des DS de test et egg_revif deed 2017-02-22 16:45:44 +0100
62fd42b138 Revert "ajout des DS de test et egg_revif" deed 2017-02-22 17:03:51 +0100
e75e304d21 ajout des DS de test et egg_revif deed 2017-02-22 16:45:44 +0100
7bdaf1f871 Merge branch 'feature/0006_changement_primitive_npc' into 'lirria' deed 2017-02-16 17:13:02 +0100
52503185d0 Changement des nouvelles DS de NPC deed 2017-02-16 17:09:32 +0100
9325c87f47 Merge branch 'feature/0005_traduction_manquante' into 'lirria' Zatalyz 2017-02-16 11:06:30 +0100
2aea06e875 Merge branch 'feature/ajout_ds_npc' into 'lirria' yannk 2017-02-16 00:15:44 +0100
9307273e9f ajout des titres manquants et continuation de la khanatisation deed 2017-02-15 20:40:47 +0100
dda542ad6a Ajout des DS de chaque NPC du dispensaire et parentage deed 2017-02-15 13:32:38 +0100
e9c1311eac Merge branch 'feature/0004_aquatic_rider' into 'lirria' yannk 2017-02-14 13:50:06 +0100
4f4e554a3e Ajout du clapclap simple dans entities.animset_list feature/0004_aquatic_rider yannk 2017-02-14 13:44:05 +0100
a0a859f8dd Merge branch 'feature/0004_aquatic_rider' into 'lirria' yannk 2017-02-14 00:09:40 +0100
746d08c9fe Ajout de sagass_mout dans entities.animset_list yannk 2017-02-14 00:08:34 +0100
30208a792d Merge branch 'feature/0004_aquatic_rider' into 'lirria' yannk 2017-02-13 23:45:20 +0100
93bf9dfd1a Souci d'héritage dans la DS de sagass_mount pour les animset yannk 2017-02-13 23:44:06 +0100
f6df93c8fa Merge branch 'feature/0004_aquatic_rider' into 'lirria' yannk 2017-02-13 23:11:59 +0100
27f78de67b Modification des noms de fichiers d'animset de sagass_mount yannk 2017-02-13 23:10:41 +0100
9ecf034e0f Merge branch 'feature/0004_aquatic_rider' into 'lirria' yannk 2017-02-13 22:58:48 +0100
bde6d85413 Modification de l'animset du sagass_mount dans sa DS yannk 2017-02-13 22:55:22 +0100
2c2fe0d5f5 Merge branch 'feature/nettoyage_emote' into 'lirria' deed 2017-02-09 10:45:32 +0100
8707142326 mise à plat du systeme d'emote deed 2017-02-09 10:43:17 +0100
ece5f7b629 Merge branch 'feature/ajout_primitives' into 'lirria' deed 2017-02-05 23:09:32 +0100
41308cebf6 Correction mineur deed 2017-02-05 22:58:46 +0100
458b6296b5 Ajout d'un colpoteur, ajout de tous les armures legeres, aggrandissment de la zone des gedja deed 2017-02-03 11:23:07 +0100
6fef0a8664 Merge branch 'feature/ajout_mill' into 'lirria' deed 2017-01-27 18:40:00 +0100
ac590d9038 ajout du moulin et quelques correction de leveldesign deed 2017-01-27 18:35:51 +0100
c4674110c9 Merge branch 'feature/ajout_nest_pendo' into 'lirria' deed 2017-01-12 22:53:34 +0100
c9ee74ea0a correction de bug deed 2017-01-12 22:49:12 +0100
70e2721aaf Merge branch 'feature/ajout_nest_pendo' into 'lirria' yannk 2017-01-09 21:18:09 +0100
c4aa108c32 Ajout des DS nid de pendo et des primitives deed 2017-01-08 22:59:59 +0100
da96b07ae9 Merge branch 'feature/ajout_datasheet' into 'lirria' deed 2016-12-06 20:59:18 +0000
b32ef462c3 Merge branch 'feature/changement_des_titres' into 'lirria' deed 2016-12-06 20:58:12 +0000
adf675dfea Merge branch 'lirria' into 'feature/ajout_datasheet' deed 2016-12-06 20:55:55 +0000
a27ee724b3 Ajout des titres DEV et Compagnon deed 2016-12-03 23:26:34 +0100
125e83be3b corrction des sacs + primitives + clapclap deed 2016-12-03 20:09:53 +0100
926e53f234 Merge branch 'feature/changement_des_titres' into 'lirria' deed 2016-12-03 18:37:25 +0000
dbe73552f9 changement des titres et trie deed 2016-12-03 19:34:05 +0100
ff4a9e19f7 Merge branch 'feature/test-spire' of ssh://git.khaganat.net:1022/khaganat/khanat-ressources into feature/test-spire feature/test-spire Sit Melai 2016-11-27 21:39:31 +0100
2e64c239ef Added two spires Sit Melai 2016-11-26 13:42:11 +0100
286a7f4265 Add README - renvoi vers la page du wikhan pour les explications yannk 2016-11-17 20:40:24 +0000
8082f7d268 Add license CC BY SA yannk 2016-11-15 22:05:17 +0000
db584f29c8 Delete LICENSE yannk 2016-11-15 21:33:11 +0000
e4b4194e68 Add license yannk 2016-11-15 21:22:53 +0000
9acec76bd3 Adding the branch and test_bijou.sitem to test if we can use a visible part in the jewel slot. feature/test-bijoux osquallo 2016-11-15 11:27:40 +0100
0ff55972be Merge branch 'feature/ajout_mission' into 'lirria' deed 2016-10-30 18:44:14 +0000
c17407859b ajout de la trad de la mission qabb20161025a + changement des chascores trad deed 2016-10-30 19:32:19 +0100
2b1834580c Revert "ajout de la trad de la mission qabb20161025a + changement des chascores trad" deed 2016-10-30 19:18:44 +0100
02aa109003 ajout de la mission qabb20161025a deed 2016-10-30 18:44:52 +0100
91f31490b1 ajout de la trad de la mission qabb20161025a + changement des chascores trad deed 2016-10-30 18:38:57 +0100
fcd8aa8c3d correction des missions et ajout d'une nouvelle qabb20161025a deed 2016-10-28 01:17:38 +0200
aa982879df Correction bug mission "changement de lot" deed 2016-10-26 22:28:46 +0200
5c6fe04e01 ajout primitives event aniiversaire deed 2016-10-23 22:40:50 +0200
d86a612075 correction du bug de remplissage du log (modif anim clapclap) deed 2016-10-16 21:29:41 +0200
f11ca15789 Merge branch 'feature/ajout_datasheet' into 'lirria' deed 2016-10-14 19:16:26 +0000