How to work with a small team of people (version control) ?

[DarkMoe]

Not sure if this belongs to this forum, but this if I don't address this immediately, my project is going to die soon.

We are a small team, trying to work in different aspects of the game, I'm the one mostly doing the scripting area, but we overlap a lot.

I know how to work with github, svn, etc. But since there are lots of binary files (like the .crm files for rooms), where you can't really know the differences, you can't really merge changes.

What do you suggest to solve this ?

Thanks,

[Crimson Wizard]

There was already a question like that before (several times actually, I believe this even belongs to AGS Wiki), so I'll just give link to the latest answer I made on this topic: http://www.adventuregamestudio.co.uk/forums/index.php?topic=55356.msg636572977#msg636572977

Other than that, one solution I could mention is to create a kind of "dummy games" where other people could flesh out stuff, such as limited scripts, action modules, etc, which is then copied to the main game.

PS. Older thread with similar question: http://www.adventuregamestudio.co.uk/forums/index.php?topic=55248

[DarkMoe]

I see, so there really is no nice and tidy way to do this.

We'll have to be extra careful, thanks!