|
|
e75e304d21
|
ajout des DS de test et egg_revif
|
2017-02-22 16:45:44 +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 |
|
|
|
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 |
|
|
|
8707142326
|
mise à plat du systeme d'emote
|
2017-02-09 10:43:17 +01:00 |
|
|
|
ac590d9038
|
ajout du moulin et quelques correction de leveldesign
|
2017-01-27 18:35:51 +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 |
|
|
|
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 |
|
|
|
dbe73552f9
|
changement des titres et trie
|
2016-12-03 19:34:05 +01:00 |
|
|
|
5c6fe04e01
|
ajout primitives event aniiversaire
|
2016-10-23 22:40:50 +02:00 |
|
|
|
d86a612075
|
correction du bug de remplissage du log (modif anim clapclap)
|
2016-10-16 21:29:41 +02:00 |
|
|
|
f11ca15789
|
Merge branch 'feature/ajout_datasheet' into 'lirria'
Feature/ajout datasheet
See merge request !5
|
2016-10-14 19:16:26 +00:00 |
|
|
|
e79bc5922c
|
xp à 0 et reussite à 80%
|
2016-10-13 21:35:02 +02:00 |
|
|
|
b4ba610fda
|
ajout des 8 creatures egg pour event anniversaire
|
2016-10-13 18:06:50 +02:00 |
|
|
|
d369012830
|
correction erreur dans la compilation visual_slot.tab et ajout/correction de bricks
|
2016-10-13 15:38:44 +02:00 |
|
|
|
cd84898099
|
trie et modification du lvl des bricks à 0
|
2016-10-12 11:11:45 +02:00 |
|
|
|
a25b121d08
|
Dernier poartage des cha, chascore , cha_score
|
2016-10-08 23:23:54 +02:00 |
|
|
|
e7b1423df0
|
changement des stanza de scores et characteristiques avec cha,cha*reg et chascore
|
2016-10-05 12:54:15 +02:00 |
|
|
|
05436b84ad
|
ajout des feux artifices sitem/creature
|
2016-09-30 22:39:08 +02:00 |
|
|
|
11596e5790
|
changement des DataSheets
|
2016-09-28 18:33:56 +02:00 |
|
|
|
93cc60a698
|
Changement DFN
|
2016-09-28 18:26:33 +02:00 |
|
|
|
3cbf9368a6
|
suppression de fichier en double et ajout des chaScore
|
2016-09-18 21:45:05 +02:00 |
|
|
|
b3b905e380
|
correction pour event_anniv
|
2016-09-13 15:19:06 +02:00 |
|
yannk
|
f1d7d873de
|
Merge branch 'lirria' of ssh://git.khaganat.net:1022/khaganat/khanat-ressources into lirria
|
2016-09-11 22:33:51 +02:00 |
|
yannk
|
25c8762760
|
Tweaking egg
|
2016-09-11 22:33:34 +02:00 |
|
|
|
347842ef7f
|
ajout d'un loot
|
2016-09-11 22:09:21 +02:00 |
|
yannk
|
7de85a8c89
|
Tweaking birthday egg
|
2016-09-11 22:07:32 +02:00 |
|
|
|
36fbcc9729
|
test creature lootable
|
2016-09-11 21:38:29 +02:00 |
|
yannk
|
dcb8af20ad
|
Merge branch 'lirria' of ssh://git.khaganat.net:1022/khaganat/khanat-ressources into lirria
|
2016-09-11 20:30:45 +02:00 |
|
yannk
|
9b9e8a09b9
|
Birthday egg added
|
2016-09-11 20:30:09 +02:00 |
|
|
|
fc52022a66
|
anniversaire cfasoa
|
2016-09-11 18:42:16 +02:00 |
|
|
|
6f72a46d6e
|
correction du arma de monte
|
2016-09-09 22:36:05 +02:00 |
|
|
|
11270d95e9
|
correction arma monte
|
2016-09-09 22:22:28 +02:00 |
|
yannk
|
b6cce75806
|
mission icons
|
2016-09-08 17:01:46 +02:00 |
|
|
|
4f8de6df0a
|
correction du monte et effacement de double
|
2016-09-07 17:34:18 +02:00 |
|
|
|
4d5c60c3f3
|
correction clapclap
|
2016-09-06 21:57:32 +02:00 |
|
|
|
288c60df26
|
correction des wrg sphrases
|
2016-08-28 15:48:28 +02:00 |
|
|
|
72bb230440
|
ajout items creatures
|
2016-08-27 23:28:17 +02:00 |
|
