Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

whitespace consistency change. tabs to 4 white spaces. #308

Closed
wants to merge 1 commit into from

Conversation

agmcleod
Copy link
Collaborator

No description provided.

@agmcleod
Copy link
Collaborator Author

@obiot @parasyte I dont recommend looking at the diff, but just want to confirm that we do indeed want 4 soft tabs as the standard.

@parasyte
Copy link
Collaborator

We do. But there are some branches we want to merge first. :)

@obiot
Copy link
Member

obiot commented Nov 14, 2013

The point is that the 1.0.0 release might be a long shot, and in order to be able to provide intermediate release along the way, the idea was to to keep the 1.0.0-dev branch more in a stable beta stage (e.g. still usable for game prototyping/development).

Now this is not incompatible with fixing the tabs, but the issue lies in the ticket-103 branch, that is not yet ready to be merged in 1.0.0-dev (because of faulty collision, polyshape not fully supported, etc…), and if we merge this now, I’m pretty sure it will be a nightmare to merge 1.0.0-dev into ticket #103 (to keep the branch up-to-date with the main 1.0.0) while waiting for ticket #103 to be ready .

@agmcleod
Copy link
Collaborator Author

Yep that's fair. Can close it for now if you wish, I can re-do the changes when we feel it's a good idea later. Editors make it pretty quick to do.

@obiot obiot closed this Nov 20, 2013
@obiot obiot deleted the white-space-fix branch November 26, 2013 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants