|
|
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 |
|
yannk
|
4f4e554a3e
|
Ajout du clapclap simple dans entities.animset_list
|
2017-02-14 13:44:05 +01:00 |
|
yannk
|
a0a859f8dd
|
Merge branch 'feature/0004_aquatic_rider' into 'lirria'
Ajout de sagass_mout dans entities.animset_list
See merge request !19
|
2017-02-14 00:09:40 +01:00 |
|
yannk
|
746d08c9fe
|
Ajout de sagass_mout dans entities.animset_list
|
2017-02-14 00:08:34 +01:00 |
|
yannk
|
30208a792d
|
Merge branch 'feature/0004_aquatic_rider' into 'lirria'
Souci d'héritage dans la DS de sagass_mount pour les animset
See merge request !18
|
2017-02-13 23:45:20 +01:00 |
|
yannk
|
93bf9dfd1a
|
Souci d'héritage dans la DS de sagass_mount pour les animset
|
2017-02-13 23:44:06 +01:00 |
|
yannk
|
f6df93c8fa
|
Merge branch 'feature/0004_aquatic_rider' into 'lirria'
Modification des noms de fichiers d'animset de sagass_mount
See merge request !17
|
2017-02-13 23:11:59 +01:00 |
|
yannk
|
27f78de67b
|
Modification des noms de fichiers d'animset de sagass_mount
|
2017-02-13 23:10:41 +01:00 |
|
yannk
|
9ecf034e0f
|
Merge branch 'feature/0004_aquatic_rider' into 'lirria'
Modification de l'animset du sagass_mount dans sa DS
See merge request !16
|
2017-02-13 22:58:48 +01:00 |
|
yannk
|
bde6d85413
|
Modification de l'animset du sagass_mount dans sa DS
|
2017-02-13 22:55:22 +01:00 |
|
|
|
2c2fe0d5f5
|
Merge branch 'feature/nettoyage_emote' into 'lirria'
mise à plat du systeme d'emote
See merge request !15
|
2017-02-09 10:45:32 +01:00 |
|
|
|
8707142326
|
mise à plat du systeme d'emote
|
2017-02-09 10:43:17 +01:00 |
|
|
|
ece5f7b629
|
Merge branch 'feature/ajout_primitives' into 'lirria'
Feature/ajout primitives
See merge request !14
|
2017-02-05 23:09:32 +01:00 |
|
|
|
41308cebf6
|
Correction mineur
|
2017-02-05 22:58:46 +01:00 |
|
|
|
458b6296b5
|
Ajout d'un colpoteur, ajout de tous les armures legeres, aggrandissment de la zone des gedja
|
2017-02-03 11:23:07 +01:00 |
|
|
|
6fef0a8664
|
Merge branch 'feature/ajout_mill' into 'lirria'
ajout du moulin et quelques correction de leveldesign
See merge request !13
|
2017-01-27 18:40:00 +01:00 |
|
|
|
ac590d9038
|
ajout du moulin et quelques correction de leveldesign
|
2017-01-27 18:35:51 +01:00 |
|
|
|
c4674110c9
|
Merge branch 'feature/ajout_nest_pendo' into 'lirria'
correction de bug
See merge request !12
|
2017-01-12 22:53:34 +01:00 |
|
|
|
c9ee74ea0a
|
correction de bug
|
2017-01-12 22:49:12 +01:00 |
|
yannk
|
70e2721aaf
|
Merge branch 'feature/ajout_nest_pendo' into 'lirria'
Ajout des DS nid de pendo et des primitives
See merge request !11
|
2017-01-09 21:18:09 +01:00 |
|
|
|
c4aa108c32
|
Ajout des DS nid de pendo et des primitives
|
2017-01-08 22:59:59 +01:00 |
|
|
|
da96b07ae9
|
Merge branch 'feature/ajout_datasheet' into 'lirria'
Feature/ajout datasheet
See merge request !10
|
2016-12-06 20:59:18 +00:00 |
|
|
|
b32ef462c3
|
Merge branch 'feature/changement_des_titres' into 'lirria'
Ajout des titres DEV et Compagnon
See merge request !9
|
2016-12-06 20:58:12 +00:00 |
|
|
|
adf675dfea
|
Merge branch 'lirria' into 'feature/ajout_datasheet'
# Conflicts:
# leveldesign/game_element/anim/anim_set/clapclap/clapclap.animset_mode
# primitives/newbieland/urban_newbieland.primitive
|
2016-12-06 20:55:55 +00:00 |
|
|
|
a27ee724b3
|
Ajout des titres DEV et Compagnon
|
2016-12-03 23:26:34 +01:00 |
|
|
|
125e83be3b
|
corrction des sacs + primitives + clapclap
|
2016-12-03 20:09:53 +01:00 |
|
|
|
926e53f234
|
Merge branch 'feature/changement_des_titres' into 'lirria'
changement des titres et trie
issue 3
See merge request !7
|
2016-12-03 18:37:25 +00:00 |
|
|
|
dbe73552f9
|
changement des titres et trie
|
2016-12-03 19:34:05 +01:00 |
|
yannk
|
286a7f4265
|
Add README - renvoi vers la page du wikhan pour les explications
|
2016-11-17 20:40:24 +00:00 |
|
yannk
|
8082f7d268
|
Add license CC BY SA
|
2016-11-15 22:05:17 +00:00 |
|
yannk
|
db584f29c8
|
Delete LICENSE
|
2016-11-15 21:33:11 +00:00 |
|
yannk
|
e4b4194e68
|
Add license
|
2016-11-15 21:22:53 +00:00 |
|
|
|
0ff55972be
|
Merge branch 'feature/ajout_mission' into 'lirria'
Feature/ajout mission
See merge request !6
|
2016-10-30 18:44:14 +00:00 |
|
|
|
c17407859b
|
ajout de la trad de la mission qabb20161025a + changement des chascores trad
|
2016-10-30 19:32:19 +01:00 |
|
|
|
2b1834580c
|
Revert "ajout de la trad de la mission qabb20161025a + changement des chascores trad"
This reverts commit 91f31490b1.
|
2016-10-30 19:18:44 +01:00 |
|
|
|
02aa109003
|
ajout de la mission qabb20161025a
|
2016-10-30 18:44:52 +01:00 |
|
