mirror of
https://github.com/EDCD/coriolis.git
synced 2025-12-08 22:33:24 +00:00
Fixes
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
#2.2.19
|
||||
* Power management panel now displays modules in descending order of power usage by default
|
||||
* Shot speed can no longer be modified directly. Its value is derived from the range modifier for Long Range and Focused modifications
|
||||
* Ensure that jump range chart updates when fuel slider is changed
|
||||
|
||||
#2.2.18
|
||||
* Change methodology for calculating explorer role; can result in lighter builds
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "coriolis_shipyard",
|
||||
"version": "2.2.18",
|
||||
"version": "2.2.19b",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/EDCD/coriolis"
|
||||
@@ -19,7 +19,7 @@
|
||||
"test": "jest",
|
||||
"prod-serve": "nginx -p $(pwd) -c nginx.conf",
|
||||
"prod-stop": "kill -QUIT $(cat nginx.pid)",
|
||||
"build": "npm run clean && NODE_ENV=production webpack -d -p --config webpack.config.prod.js",
|
||||
"build": "npm run clean && NODE_ENV=production webpack -p --config webpack.config.prod.js",
|
||||
"rsync": "rsync -ae \"ssh -i $CORIOLIS_PEM\" --delete build/ $CORIOLIS_USER@$CORIOLIS_HOST:~/wwws",
|
||||
"deploy": "npm run lint && npm test && npm run build && npm run rsync"
|
||||
},
|
||||
|
||||
@@ -494,7 +494,7 @@ export default class DamageDealt extends TranslatedComponent {
|
||||
const sortOrder = this._sortOrder;
|
||||
const onCollapseExpand = this._onCollapseExpand;
|
||||
|
||||
const code = ship.getHardpointsString() + '.' + ship.getModificationsString() + '.' + against.properties.name;
|
||||
const code = ship.getHardpointsString() + '.' + ship.getModificationsString() + '.' + ship.getPowerEnabledString() + '.' + against.properties.name;
|
||||
|
||||
return (
|
||||
<span>
|
||||
|
||||
@@ -176,7 +176,6 @@ export default class LineChart extends TranslatedComponent {
|
||||
seriesData = [[0, yVal], [1, yVal]];
|
||||
}
|
||||
|
||||
|
||||
const markerElems = [];
|
||||
const detailElems = [<text key='lbl' className='text-tip x' y='1.25em'/>];
|
||||
const seriesLines = [];
|
||||
@@ -187,7 +186,9 @@ export default class LineChart extends TranslatedComponent {
|
||||
markerElems.push(<circle key={i} className='marker' r='4' />);
|
||||
}
|
||||
|
||||
this.setState({ markerElems, detailElems, seriesLines, seriesData });
|
||||
const tipHeight = 2 + (1.2 * (seriesLines ? seriesLines.length : 0.8))
|
||||
|
||||
this.setState({ markerElems, detailElems, seriesLines, seriesData, tipHeight });
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -399,6 +399,7 @@ export default class OutfittingPage extends Page {
|
||||
yLabel={translate('jump range')}
|
||||
xLabel={translate('cargo')}
|
||||
func={state.jumpRangeChartFunc}
|
||||
code={state.fuelLevel}
|
||||
/>
|
||||
<table style={{ width: '100%', lineHeight: '1em', backgroundColor: 'transparent' }}>
|
||||
<tbody >
|
||||
|
||||
@@ -52,7 +52,7 @@ module.exports = {
|
||||
allChunks: true
|
||||
}),
|
||||
new webpack.HotModuleReplacementPlugin(),
|
||||
new webpack.NoErrorsPlugin()
|
||||
new webpack.NoEmitOnErrorsPlugin()
|
||||
],
|
||||
module: {
|
||||
rules: [
|
||||
|
||||
@@ -45,10 +45,6 @@ module.exports = {
|
||||
},
|
||||
plugins: [
|
||||
new webpack.optimize.UglifyJsPlugin({
|
||||
sourceMap: true,
|
||||
mangle: {
|
||||
except: []
|
||||
},
|
||||
'screw-ie8': true
|
||||
}),
|
||||
//new webpack.optimize.CommonsChunkPlugin({
|
||||
@@ -90,16 +86,7 @@ module.exports = {
|
||||
})
|
||||
],
|
||||
module: {
|
||||
//noParse: /.*\.min\.js$/,
|
||||
rules: [
|
||||
// Expose non-parsed globally scoped libs
|
||||
//{ test: reactPath, loader: "expose-loader?React" },
|
||||
//{ test: d3Path, loader: "expose-loader?d3" },
|
||||
//{ test: lzStringPath, loader: "expose-loader?LZString" },
|
||||
//{ test: reactPath, use: [ { loader: 'expose-loader', options: 'React' } ] },
|
||||
//{ test: d3Path, use: [ { loader: 'expose-loader', options: 'd3' } ] },
|
||||
//{ test: lzStringPath, use: [ { loader: 'expose-loader', options: 'LZString' } ] },
|
||||
|
||||
{ test: /\.css$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader'}) },
|
||||
{ test: /\.less$/, loader: ExtractTextPlugin.extract({ fallback: 'style-loader',use: 'css-loader!less-loader'}) },
|
||||
{ test: /\.(js|jsx)$/, loaders: [ 'babel-loader' ], include: path.join(__dirname, 'src') },
|
||||
|
||||
Reference in New Issue
Block a user