pharan d5e75febee Merge branch '3.6' into 3.7-beta ...

# Conflicts:
#	examples/hero/export/hero-pro.json
#	examples/hero/export/hero-pro.skel

2018-04-19 15:02:08 +08:00

..

alien

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

coin

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

dragon

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

export

[c] Fixed parsing of dark slot colors for binary files. See #1097

2018-04-12 10:30:43 +02:00

goblins

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

hero

Merge branch '3.6' into 3.7-beta

2018-04-19 15:02:08 +08:00

owl

Updated owl.

2018-01-19 13:15:31 +01:00

powerup

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

raptor

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

speedy

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

spineboy

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

spinosaurus

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

stretchyman

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

tank

Updated samples, added owl.

2018-01-18 15:18:31 +01:00

vine

Updated samples, added owl.

2018-01-18 15:18:31 +01:00