|
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 |
|
|
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 |
|
|
b13f1109cf
|
ajout score_upgrade
|
2016-08-27 14:51:49 +02:00 |
|
|
42fc3f9897
|
correction erreurs et ajout de fichier manquant
|
2016-08-17 22:25:58 +02:00 |
|
|
66934b43a3
|
essai pour comprendre les stats /craft objet
|
2016-08-16 22:26:02 +02:00 |
|
|
bae53a2a30
|
ajout et correction
|
2016-08-13 01:19:42 +02:00 |
|
|
6e18977bb3
|
ajout de parentage sur arma monte
|
2016-08-13 00:33:50 +02:00 |
|
|
414fd9a945
|
retour en arriere sur l'arma ticket
|
2016-08-13 00:19:59 +02:00 |
|
|
380a91a41d
|
trie et correction
|
2016-08-13 00:02:57 +02:00 |
|
|
49bb63fa36
|
essai pour comprendre les stats des sitem
|
2016-08-11 21:39:31 +02:00 |
|
|
2a05814446
|
ajout sbrick de changement de characteristique + quelques sphrases en plus
|
2016-08-07 23:59:55 +02:00 |
|
|
db2c92905d
|
correction anim/creature
|
2016-08-06 02:40:33 +02:00 |
|
|
3a3147b1d6
|
ajout sphrase et essai sur tank
|
2016-08-05 01:11:09 +02:00 |
|
|
ce0a2f1d19
|
ajout et correction de stanza
|
2016-08-05 00:03:01 +02:00 |
|
|
1c6e1fe01c
|
correction avec george des sbrick power
|
2016-08-04 22:02:45 +02:00 |
|
|
3b16056d19
|
ajout des fichiers wk des missions
|
2016-06-29 22:19:58 +02:00 |
|
|
dfb024f194
|
correction de warning
|
2016-06-28 16:09:13 +02:00 |
|
|
08b0c9dbbe
|
ajout craft epee diam
|
2016-06-28 15:56:43 +02:00 |
|
|
7a18c160f3
|
correction des nest_pendo
|
2016-06-28 15:47:27 +02:00 |
|
|
8f14d556a4
|
Missions cook 1er essai public
|
2016-06-28 14:41:17 +02:00 |
|