khanat-ressources-NeL/leveldesign/game_element
deed 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
..
anim Merge branch 'lirria' into 'feature/ajout_datasheet' 2016-12-06 20:55:55 +00:00
emotes correction de warning 2016-06-28 16:09:13 +02:00
encyclopedia Add initial 2013-07-24 21:45:31 +02:00
forage_source Add initial 2013-07-24 21:45:31 +02:00
fx Add initial 2013-07-24 21:45:31 +02:00
loot_table correction pour event_anniv 2016-09-13 15:19:06 +02:00
outpost Add initial 2013-07-24 21:45:31 +02:00
sbrick correction erreur dans la compilation visual_slot.tab et ajout/correction de bricks 2016-10-13 15:38:44 +02:00
sitem Merge branch 'lirria' into 'feature/ajout_datasheet' 2016-12-06 20:55:55 +00:00
sphrase correction erreur dans la compilation visual_slot.tab et ajout/correction de bricks 2016-10-13 15:38:44 +02:00
test_sky Add initial 2013-07-24 21:45:31 +02:00
xp_table changement des titres et trie 2016-12-03 19:34:05 +01:00