Comparing version 1.0.3 to 1.1.3
module.exports = { | ||
core: require('./Core.js'), | ||
mapview: require('./map/MapView.js'), | ||
models: { | ||
hexgrid: require('./model/hexgrid.js') | ||
} | ||
}, | ||
definitions:require('./view_basics/BasicDefs.js') | ||
} | ||
@@ -11,2 +11,6 @@ // DO NOT EDIT THIS FILE | ||
if (typeof module !== 'undefined') { | ||
catan.definitions = require('../view_basics/BasicDefs.js') | ||
} | ||
catan.map.View = (function makeMapView(){ | ||
@@ -1039,3 +1043,3 @@ | ||
typeDef = this.getEdgeDefinition(); | ||
goodShape = typeDef.makeRoad(new EdgeLoc(0.5,0.5,"E"),color,outline); | ||
goodShape = typeDef.makeRoad(new EdgeLoc(0.5,0.5,"SE"),color,outline); | ||
break; | ||
@@ -1218,2 +1222,5 @@ case "robber": | ||
if (typeof module !== 'undefined') { | ||
module.exports = catan.map.View | ||
} | ||
// DO NOT EDIT THIS FILE | ||
var catan = catan || {}; | ||
if (typeof(catan) === 'undefined') catan = {} | ||
catan.models = catan.models || {}; | ||
@@ -346,3 +346,3 @@ | ||
HexGrid.prototype.getEdges = function(){ | ||
return getValid(this.hexGrid.getHexes(),"getValidEdges") | ||
return getValid(this.getHexes(),"getValidEdges") | ||
} | ||
@@ -359,3 +359,3 @@ | ||
HexGrid.prototype.getVertexes = function(){ | ||
return getValid(this.hexGrid.getHexes(),"getValidVertexes") | ||
return getValid(this.getHexes(),"getValidVertexes") | ||
} | ||
@@ -362,0 +362,0 @@ |
@@ -181,2 +181,4 @@ // DO NOT EDIT THIS FILE | ||
if ('undefined' !== typeof module) { | ||
module.exports = catan.definitions; | ||
} |
@@ -147,2 +147,15 @@ [ | ||
{ | ||
"args": [ | ||
{ | ||
"name": "logLevel", | ||
"description": "", | ||
"type": "STRING" | ||
} | ||
], | ||
"url": "/util/changeLogLevel", | ||
"method": "POST", | ||
"description": "Set's the server's log level ( ALL, SEVERE, WARNING ,INFO, CONFIG, FINE, FINER, FINEST, OFF) ", | ||
"type": "FORM" | ||
}, | ||
{ | ||
"args": [], | ||
@@ -173,2 +186,18 @@ "url": "/moves/sendChat", | ||
"args": [], | ||
"url": "/moves/robPlayer", | ||
"method": "POST", | ||
"description": "Moves the robber, selecting the new robber position and player to rob.", | ||
"type": "JSON", | ||
"template": { | ||
"type": "robPlayer", | ||
"playerIndex": -1, | ||
"victimIndex": -1, | ||
"robberSpot": { | ||
"x": "", | ||
"y": "" | ||
} | ||
} | ||
}, | ||
{ | ||
"args": [], | ||
"url": "/moves/finishTurn", | ||
@@ -238,3 +267,3 @@ "method": "POST", | ||
"victimIndex": -1, | ||
"robberSpot": { | ||
"location": { | ||
"x": "", | ||
@@ -352,2 +381,16 @@ "y": "" | ||
"args": [], | ||
"url": "/moves/maritimeTrade", | ||
"method": "POST", | ||
"description": "Accept or reject a trade offered to you.", | ||
"type": "JSON", | ||
"template": { | ||
"type": "maritimeTrade", | ||
"playerIndex": -1, | ||
"ratio": -1, | ||
"inputResource": "", | ||
"outputResource": "" | ||
} | ||
}, | ||
{ | ||
"args": [], | ||
"url": "/moves/discardCards", | ||
@@ -354,0 +397,0 @@ "method": "POST", |
{ | ||
"name": "byu-catan", | ||
"description": "Project framework for BYU CS 340 group project", | ||
"version": "1.0.3", | ||
"version": "1.1.3", | ||
"main": "index.js", | ||
"dist-tags": { | ||
"latest": "1.0.1" | ||
"latest": "1.0.4" | ||
}, | ||
@@ -16,4 +16,6 @@ "maintainers": "Nate McMaster <nate.mcmaster@byu.edu>", | ||
"1.0.0": "2014-02-01T00:14:23.673Z", | ||
"1.0.1": "2014-02-01T02:19:04.236Z" | ||
"1.0.1": "2014-02-01T02:19:04.236Z", | ||
"1.0.3": "2014-02-04T04:16:38.288Z", | ||
"1.0.4": "2014-02-06T06:32:39.591Z" | ||
} | ||
} |
@@ -0,3 +1,8 @@ | ||
02-18-14 | ||
Modified the joinGame.html to submit the form correctly so that using random tiles, ports and numbers placement actually works | ||
Modified the server to use "location" instead of "robberSpot" in the PlaceRobber API endpoint to make it consistent with the Soldier endpoint | ||
Fixed the MapView.js to get rid of an assert that it had been throwing | ||
Removed images from the partial zip to make it smaller. | ||
Fixed the server-api file included in the zip for the Maritime trade command | ||
01-31-14 | ||
@@ -4,0 +9,0 @@ Updated all the files to have a '//DO NOT EDIT THIS' comment at the top of the file |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
15389912
211
49260
7