beito123 54ef7760b9 Merge remote-tracking branch 'upstream/master' ...

# Conflicts:
#	core/assets/bundles/bundle_ja.properties

2019-03-20 13:11:49 +09:00

..

bundles

Merge remote-tracking branch 'upstream/master'

2019-03-20 13:11:49 +09:00

cursors

Bugfixes / Font changed / Zone tweaks

2019-03-08 19:07:23 -05:00

fonts

Fix fonts (#424)

2019-03-10 08:03:54 -06:00

maps

Map editor fixes / Zone environment changes

2019-03-19 23:51:52 -04:00

shaders

Fixed polluted water

2019-03-11 13:34:15 -04:00

sprites

Map editor fixes / Zone environment changes

2019-03-19 23:51:52 -04:00