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 |
|
|
|
91f31490b1
|
ajout de la trad de la mission qabb20161025a + changement des chascores trad
|
2016-10-30 18:38:57 +01:00 |
|
|
|
fcd8aa8c3d
|
correction des missions et ajout d'une nouvelle qabb20161025a
|
2016-10-28 01:17:38 +02:00 |
|
|
|
aa982879df
|
Correction bug mission "changement de lot"
|
2016-10-26 22:28:46 +02: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 |
|
|
|
6cfdd2fcf1
|
Merge branch 'feature/changements_gameplay_xp_et_chance' into 'lirria'
xp à 0 et reussite à 80%
See merge request !4
|
2016-10-14 07:24:30 +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 |
|
|
|
e6ef99943b
|
Merge branch 'feature/character_screens' into 'lirria'
Minor change in UI terms - in accordance with for khanat-code Issue 14 changes
Complément de https://git.khaganat.net/khaganat/khanat-code/merge_requests/24
See merge request !3
|
2016-10-10 19:44:13 +00:00 |
|
yannk
|
a5cafb49ca
|
Minor change in UI terms - in accordance with for khanat-code Issue 14 changes
|
2016-10-09 21:37:22 +02:00 |
|
|
|
90784c6f80
|
Merge branch 'feature/ajout_datasheet' into 'lirria'
Feature/ajout datasheet
chascore et ajout des feux d'artifice
See merge request !2
|
2016-10-08 22:11:43 +00: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 |
|
|
|
8fb0830a7f
|
Merge branch 'feature/ajout_chascore' into 'lirria'
Feature/ajout chascore
ajout chascore cha chareg etc
See merge request !1
|
2016-09-28 19:44:52 +00: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 |
|
yannk
|
a8e24a8e44
|
New translations proverbs
|
2016-09-14 22:06:27 +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 |
|
yannk
|
aea16db82c
|
New translations
|
2016-09-11 19:01:41 +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 |
|
