search

cookie966507 / Rangers

VGDev Spring 2016 Multiplayer Game
0 stars 16 forks source link

Two more maps #28

Closed imtn closed 8 years ago

imtn commented 8 years ago

I also added these maps to the map selection screen.

cookie966507 commented 8 years ago

Somehow the MainMenu unity scene conflicted and it looks like a mess in here (not your fault), so you should duplicate your scene to where it has a different name and then submit a pull request for that scene and then we will manually merge it.

cookie966507 commented 8 years ago

So don't pull until that happens

imtn commented 8 years ago

Don't pull until you've fixed the conflict, or don't pull until I've duplicated the scene? I've duplicated the scene on my end, just waiting for the go-ahead.

cookie966507 commented 8 years ago

Until you've duplicated so you can go ahead pull and then submit that file as an extra (named something other than MainMenu). It turns out that the git website copied something incorrectly and messed up the scene when I tried to merge earlier.