|
|
9232f9f278
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
correction de bug /primitives
See merge request !40
|
2017-07-09 21:55:46 +02:00 |
|
|
|
f57f950002
|
correction de bug /primitives
|
2017-07-09 21:54:22 +02:00 |
|
|
|
b4ddcf96b3
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
ajout de pnj dans les primitives et correction des missions
See merge request !39
|
2017-07-06 23:57:14 +02:00 |
|
|
|
d2ffe85ba7
|
ajout de pnj dans les primitives et correction des missions
|
2017-07-06 23:40:39 +02:00 |
|
|
|
8db7ba5840
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
ajout de trad
See merge request !38
|
2017-07-01 15:25:33 +02:00 |
|
|
|
e53c1b945d
|
ajout de trad
|
2017-07-01 15:24:07 +02:00 |
|
|
|
a7ca1ea6bf
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
Feature/0013 ajout nouveau objet
See merge request !37
|
2017-07-01 15:20:56 +02:00 |
|
|
|
e324721a09
|
changement mineur sur les primitives et pnj
|
2017-07-01 15:18:24 +02:00 |
|
|
|
35ead35783
|
ajout pnj
|
2017-06-24 17:15:38 +02:00 |
|
|
|
7c38bb6874
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
Feature/0013 ajout nouveau objet
See merge request !36
|
2017-06-19 21:07:28 +02:00 |
|
|
|
29d1b950c6
|
traduction des ajouts
|
2017-06-19 15:27:54 +02:00 |
|
|
|
41704302f9
|
ajout de npc
|
2017-06-17 15:35:22 +02:00 |
|
|
|
d296868f85
|
ajout nouveau objet
|
2017-05-26 14:31:35 +02:00 |
|
|
|
806148903f
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
Feature/0013 ajout nouveau objet
See merge request !35
|
2017-05-20 17:54:37 +02:00 |
|
|
|
0f6304c772
|
leveldesign mineur
|
2017-05-20 17:50:09 +02:00 |
|
|
|
3ae4b8182c
|
changement des dispositions dans les primitives
|
2017-05-20 17:03:28 +02:00 |
|
|
|
def1288b1f
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
ajout d'abris a pnj
See merge request !34
|
2017-05-18 12:02:20 +02:00 |
|
|
|
9b8b967fa3
|
ajout d'abris a pnj
|
2017-05-18 12:00:03 +02:00 |
|
|
|
86c66c330f
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
ajout de l'etable
See merge request !33
|
2017-05-15 14:44:56 +02:00 |
|
|
|
10ad380ff6
|
ajout de l'etable
|
2017-05-15 13:48:37 +02:00 |
|
|
|
4dc3c23612
|
Merge branch 'feature/0013_ajout_nouveau_objet' into 'lirria'
ajout de nouvelle datasheet d'objet de decoration
See merge request !32
|
2017-05-14 21:16:54 +02:00 |
|
|
|
f6cebd25ea
|
ajout de nouvelle datasheet d'objet de decoration
|
2017-05-13 16:24:20 +02:00 |
|
|
|
2baf1c0d7d
|
erreur de push d'un fichier de travail
|
2017-04-14 14:03:36 +02:00 |
|
|
|
815a44f122
|
Merge branch 'feature/0012_traduction_manquante' into 'lirria'
Feature/0012 traduction manquante
See merge request !31
|
2017-03-24 21:44:38 +01:00 |
|
|
|
d162ad82c4
|
traduction manquante de la mission farine
|
2017-03-24 21:40:40 +01:00 |
|
|
|
2ce941958c
|
ajout des traductions manquantes de l'interface
|
2017-03-24 21:16:02 +01:00 |
|
|
|
c0b6370a2a
|
Merge branch 'feature/0011_primitive_meunier' into 'lirria'
correction des missions du moulin
See merge request !30
|
2017-03-07 15:12:47 +01:00 |
|
|
|
1f3dd708f3
|
correction des missions du moulin
|
2017-03-07 15:10:18 +01:00 |
|
|
|
fbb2f1bf23
|
bug correction de test arme
|
2017-03-07 15:06:44 +01:00 |
|
|
|
54e5dab61b
|
Merge branch 'feature/0010_correction_wrg_visualtab' into 'lirria'
Feature/0010 correction wrg visualtab
See merge request !29
|
2017-03-06 14:34:13 +01:00 |
|
|
|
62d34c8ea9
|
modification provisoir
|
2017-03-06 14:16:58 +01:00 |
|
|
|
42917a165b
|
correction animation
|
2017-03-06 13:58:51 +01:00 |
|
|
|
edba8ef641
|
correction des sbrick et sphrase
|
2017-03-06 10:55:23 +01:00 |
|
|
|
0846312160
|
Merge branch 'feature/0009_mission_farine' into 'lirria'
ajout et correction des missions liées à la farine de gedja (divers test de trad)
See merge request !27
|
2017-03-04 19:25:21 +01:00 |
|
|
|
bccc5c5134
|
ajout et correction des missions liées à la farine de gedja (divers test de trad)
|
2017-03-04 19:15:03 +01:00 |
|
|
|
c2ea399786
|
Merge branch 'feature/0008_ajout_egg_revif' into 'lirria'
Feature/0008 ajout egg revif
See merge request !26
|
2017-02-27 23:01:33 +01:00 |
|
|
|
69e65ef3e7
|
revert erreur de commit
|
2017-02-27 22:54:53 +01:00 |
|
|
|
2cb30cc5d0
|
ajout de l'oeuf revif dans les primitives et ajout divers ajout RP
|
2017-02-27 22:29:13 +01:00 |
|
scoui
|
25f75afa1d
|
Merge branch 'feature/0007_ajout_DS_test_revif' into 'lirria'
Feature/0007 ajout ds test revif
See merge request !25
|
2017-02-22 18:04:59 +01:00 |
|
|
|
cc14d6ae83
|
Merge branch 'cherry-pick-e75e304d' into 'feature/0007_ajout_DS_test_revif'
ajout des DS de test et egg_revif
See merge request !24
|
2017-02-22 17:10:37 +01:00 |
|
|
|
d8c558a9e9
|
ajout des DS de test et egg_revif
|
2017-02-22 17:10:04 +01:00 |
|
|
|
62fd42b138
|
Revert "ajout des DS de test et egg_revif"
This reverts commit e75e304d21.
|
2017-02-22 17:03:51 +01:00 |
|
|
|
e75e304d21
|
ajout des DS de test et egg_revif
|
2017-02-22 16:45:44 +01:00 |
|
|
|
7bdaf1f871
|
Merge branch 'feature/0006_changement_primitive_npc' into 'lirria'
Changement des nouvelles DS de NPC
See merge request !23
|
2017-02-16 17:13:02 +01:00 |
|
|
|
52503185d0
|
Changement des nouvelles DS de NPC
|
2017-02-16 17:09:32 +01:00 |
|
|
|
9325c87f47
|
Merge branch 'feature/0005_traduction_manquante' into 'lirria'
ajout des titres manquants et continuation de la khanatisation
See merge request !22
|
2017-02-16 11:06:30 +01:00 |
|
yannk
|
2aea06e875
|
Merge branch 'feature/ajout_ds_npc' into 'lirria'
Ajout des DS de chaque NPC du dispensaire et parentage
See merge request !21
|
2017-02-16 00:15:44 +01:00 |
|
|
|
9307273e9f
|
ajout des titres manquants et continuation de la khanatisation
|
2017-02-15 20:40:47 +01:00 |
|
|
|
dda542ad6a
|
Ajout des DS de chaque NPC du dispensaire et parentage
|
2017-02-15 13:32:38 +01:00 |
|
yannk
|
e9c1311eac
|
Merge branch 'feature/0004_aquatic_rider' into 'lirria'
Ajout du clapclap simple dans entities.animset_list
See merge request !20
|
2017-02-14 13:50:06 +01:00 |
|
