Merged changes

This commit is contained in:
Jeremiah Billmann
2014-10-23 16:40:07 +00:00
5 changed files with 23 additions and 7 deletions
+4
View File
@@ -16,6 +16,10 @@ A simple, lightweight, HTML multiplayer game server (and client) for Node.js
## Install
### Demo
A playable [demo](http://garageserverio.jit.su/) of the [example](https://github.com/jbillmann/GarageServer.IO/tree/master/example) using GarageServer.IO.
### Server
`$ npm install garageserver.io`
+1 -1
View File
@@ -405,7 +405,7 @@ var GarageServerIO = (function (socketio) {
newState = _options.onInterpolation(positions.previous.state, positions.target.state, amount);
entity.state = newState = _options.onInterpolation(entity.state, newState, _stateController.smoothingFactor);
}
else {
else if (entity.inputController.sequenceNumber === 1) {
entity.state = entity.latestUpdate().state;
}
}
+4
View File
@@ -1,6 +1,10 @@
# GarageServer.IO Example
A sample application using GarageServer.IO
### Demo
A playable [demo](http://garageserverio.jit.su/) of this example using GarageServer.IO.
## Install
Change the `path` parameter of `GarageServerIO.initializeGarageServer` that is found in file, `/public/javascripts/game.js`, to point to the URL where your Node app runs. I.e. `http://127.0.0.1:3000`. Note that the example app uses a default port of `process.env.PORT || 3000`. This can be changed in `app.js`.
+13 -6
View File
@@ -1,15 +1,22 @@
{
"name": "garageserver.io.example",
"subdomain": "garageserverio",
"description": "A sample application using garageserver.io",
"author": {
"name": "Jeremiah Billmann",
"email": "jcbillmann@yahoo.com"
},
"version": "0.5.2",
"license" : "MIT",
"version": "0.6.0",
"license": "MIT",
"dependencies": {
"express": "3.1.0",
"jade": "*",
"socket.io": "1.1.0"
"express": "3.1.0",
"jade": "*",
"socket.io": "1.1.0"
},
"engines": {
"node": ">=0.10"
},
"scripts": {
"start": "node app.js"
}
}
}
File diff suppressed because one or more lines are too long