search

bhoang8855 / Game-Development-Quarter-Project

0 stars 1 forks source link

Enemy ai #5

Closed Shunlu-cpp closed 7 years ago

Shunlu-cpp commented 7 years ago

This seems worked. I put everything related to play in Level1. You can merge it to master or create a dev branch from master and merge enemy_ai to that branch.

bhoang8855 commented 7 years ago

This branch seems to have merge conflicts with the master branch. Can you try to resolve those conflicts and merge it with master?

Shunlu-cpp commented 7 years ago

Looks like the main issues here are Level1.unity and InputManager.asset. One need to use text format insteads of binary format, there is guide in repository issue. Hold for a minute and I will push the newest change.