[Community Project] Real Time Strategy Game. NEW MODELS AVAILABLE. SEE POST #1

[ryanjon2040]

@;121220

Did you commit your local changes and pushed them to server before the merging?

Nope.

@Brennen1350;121221

lol, i’m sorry about your AI blueprints.

No worries mate :). They were just basic and i’ve already re-created them and i’ll push them in a few minutes.

@Brennen1350;121221

Anyways I’m re-UV mapping the house mesh right now and I’ll texture it sometime tomorrow.

Awesome. Cant wait to see them textured :). I request you to follow this kind of art style. Thats what am aiming for.

@Brennen1350;121221

We could have like a 3-4 mesh system, 1 for placement and then 2-3 for construction that change as the production is completed and then 1 for the final production (or more that could be randomly selected for variance).

Yes. Thats how i did it in my old video.

@;121225

I also advice you to work with multiple branches. Create a new branch for each new feature (or each user) and work the branch. Once it feels like done, merge it to the master branch. In the current proejct I am wokring on (not a game project and its fully code), each programmer has his-own branch. We do not make changes to another persons branch. However if i feel like I want someone elses code in my branch, I will simply checkout that user’s branch and merge it into mine. At the end of the week, we merge all our branches to the master. And on the start of next week, each person will merge the master back into their own individual branch so everyone has the latest code, and start working from that.

Ok so should i create a new branch for and Brennen1350?