search

grofit / playmaker-astar-actions

Playmaker Astar Pathfinding Actions
5 stars 4 forks source link

Meta files #4

Closed kiriri closed 10 years ago

kiriri commented 10 years ago

This branch fixes the examples. Both the materials and all the components work just as they were intended. I would like to merge it with the master branch now. For some reason it can't be done directly though.

grofit commented 10 years ago

Hey,

Have you already turned on meta files and force text serialization on the master branch? as the meta files already seem to exist so merging in just gives a ton of merge issues. So if the master branch has this already then there is no need to merge and will just remove the remote branch.

kiriri commented 10 years ago

I didn't do a thing to the master branch but I think unity 4.3 enables meta files by default, so it might have happened automatically in the latest push.

grofit commented 10 years ago

ah right cool, I have manually carried out the meta file change on this branch anyway, so it should all be good. Have removed the old branch as we no longer need it. Thanks for taking a look.