It is currently Tue Jun 19, 2018 10:19 am

All times are UTC - 6 hours




Post new topic Reply to topic  [ 2 posts ] 
Author Message
 Post subject: Github repository location and 'style guide'
PostPosted: Tue Jun 23, 2015 10:25 am 
Offline
User avatar

Joined: Tue Jun 23, 2015 9:55 am
Posts: 136
Location: Australia
Github is located here.

Quick and dirty style guide pending a proper GDD/reference document being finished up and posted:
- Always use absolute paths, it makes it a ton easier to search code.
- If you want to use a colon, cast the var to the appropriate path instead. It's only one extra line.
- New features/items go in their own folders or files if possible, this will minimize merge conflicts later.
- Maintain compatibility with Baycode as much as humanly possible, we're going to keep in lockstep with features from upstream as much as we can.

When making map edits:
- Run tools/mapmerge/1prepare_map.bat.
- Make your changes.
- Run tools/mapmerge/2clean_map.bat.

Merging for PRs will be 24 hours with no complaints or two maintainers signing off, whichever comes first. If that turns out to not be sufficient we can revisit standards later. Current maintainers are myself, Nienhaus and ZomgPonies until we can hash out a detailed staff roster.

Bugfixing should be a priority over features and features should be a priority over sprites, but any contribution at all is good.

For now everything can just go to the master branch and we'll shake bugs out as we go, but in the future we'll need probably to sit down and sort out a dev cycle of some kind.

_________________
There was a hole.


Last edited by Zuhayr on Thu Jun 25, 2015 11:12 am, edited 1 time in total.

Top
 Profile  
 
 Post subject: Re: Github repository location and 'style guide'
PostPosted: Thu Jun 25, 2015 12:47 am 
Offline
User avatar

Joined: Tue Jun 23, 2015 9:55 am
Posts: 136
Location: Australia
Before you do any pulls/merging, add the following to your .git/config file:

Code:
[merge "merge-dmm"]
    name = mapmerge driver
        driver = ./tools/mapmerge/mapmerge.sh %O %A %B
[merge "merge-dmi"]
   name = iconfile merge driver
   driver = ./tools/dmitool/dmimerge.sh %O %A %B


This will prevent conflicts between icon and map files.

_________________
There was a hole.


Top
 Profile  
 
Display posts from previous:  Sort by  
Post new topic Reply to topic  [ 2 posts ] 

All times are UTC - 6 hours


Who is online

Users browsing this forum: No registered users and 3 guests


You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot post attachments in this forum

Search for:
Jump to:  
cron
Powered by phpBB © 2000, 2002, 2005, 2007 phpBB Group
mergenine: oragne