search

BoolClub / ProjectCrusade

First project of RHS Software Development Club
0 stars 0 forks source link

Fork ready for merge. All merge conflicts resolved. (Merge to fix network fustercluck.) #27

Closed AnonymousNix closed 8 years ago

AnonymousNix commented 8 years ago

The old pull request has been closed. The merge will be to the dev branch instead of the master. Merge dev to master afterwards. There are no real changes from the actual master at this point, But merge it anyway so it shows what actually happened on the network. (The chained merges and manual edits made the network graphs very confusing, so it looks like the dev branch and my fork are still way ahead of the master.)

To do after the merge: -Change inventory layout to be less minecraft-like -Redesign behavior handling system -Move item database to an xml file

AnonymousNix commented 8 years ago

(@Gooseguy) gibe de merge boss. ples. gibe da merge. (I can't honestly continue until the network graphs are fixed.)

christiancosgrove commented 8 years ago

I'm pretty sure I already merged your fork...

christiancosgrove commented 8 years ago

I merged it to master by accident and then updated dev from master.

christiancosgrove commented 8 years ago

Also, from now on, can we just work on the main repo? I think you @AnonymousNix have contributor status, so you can make your own branches.

And I don't think we need to make a separate dev branch. Each new major (or minor) feature should have its own branch (just as you did with the recent update). We should strive to make all non-master code bugfree.

christiancosgrove commented 8 years ago

Working on XML file right now.