khanat-ressources-NeL/leveldesign/game_element/anim/anim_set/clapclap
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
..
clapclap.animset_mode Merge branch 'lirria' into 'feature/ajout_datasheet' 2016-12-06 20:55:55 +00:00
clapclap_alert__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_combat__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_death__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_default__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_eat__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_hungry__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_rest__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_swim__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
clapclap_swim_death__.animation_set correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00