Skip to content

Commit

Permalink
fix inconsistent code formatting (use CR-LF line ending; 4x space tab)
Browse files Browse the repository at this point in the history
  • Loading branch information
Barbosik committed Jul 15, 2016
1 parent 4433f63 commit 89c4d16
Show file tree
Hide file tree
Showing 44 changed files with 2,108 additions and 2,108 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Contributions are appreciated in the form of pull requests. However, to maintain
...
}
```
* Unix-style line endings should be used (`\n`).
* CR-LF line endings should be used (`\r\n`).
* Please leave a blank line at the end of each file.
* Conditional/loop statements (`if`, `for`, `while`, etc.) should always use braces, and the opening brace should be placed on the same line as the statement.
* There should be a space after a conditional/loop statement and before the condition, as well as a space after the condition and before the brace. Example:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MultiOgar
# MultiOgar
Ogar game server with fast and smooth vanilla physics and multi-protocol support.

Current version: **1.2.42**
Current version: **1.2.43**

## Project Info
![Language](https://img.shields.io/badge/language-node.js-yellow.svg)
Expand Down
48 changes: 24 additions & 24 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
{
"name": "MultiOgar",
"version": "1.2.42",
"description": "Open source Ogar server",
"author": "Barbosik (https://github.com/Barbosik/MultiOgar)",
"homepage": "https://github.com/Barbosik/MultiOgar",
"license": "Apache-2.0",
"main": "src/index.js",
"dependencies": {
"quad-node": "^1.0.5",
"vector2-node": "latest",
"ws": "latest"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/Barbosik/MultiOgar"
},
"bugs": {
"url": "https://github.com/Barbosik/MultiOgar/issues"
}
{
"name": "MultiOgar",
"version": "1.2.43",
"description": "Open source Ogar server",
"author": "Barbosik (https://github.com/Barbosik/MultiOgar)",
"homepage": "https://github.com/Barbosik/MultiOgar",
"license": "Apache-2.0",
"main": "src/index.js",
"dependencies": {
"quad-node": "^1.0.5",
"vector2-node": "latest",
"ws": "latest"
},
"devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/Barbosik/MultiOgar"
},
"bugs": {
"url": "https://github.com/Barbosik/MultiOgar/issues"
}
}
Loading

0 comments on commit 89c4d16

Please sign in to comment.