Commit graph

5 commits

Author SHA1 Message Date
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
d86a612075 correction du bug de remplissage du log (modif anim clapclap) 2016-10-16 21:29:41 +02:00
d369012830 correction erreur dans la compilation visual_slot.tab et ajout/correction de bricks 2016-10-13 15:38:44 +02:00
db2c92905d correction anim/creature 2016-08-06 02:40:33 +02:00