Skip to content

Commit

Permalink
Merge tag 'v2.4.13' into develop
Browse files Browse the repository at this point in the history
no message
  • Loading branch information
kobalab committed Jan 11, 2025
2 parents f86482b + 463efba commit c4f1834
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 17 deletions.
8 changes: 8 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### v2.4.13 / 2025-01-12

- 牌譜エディタのツモ切り表示の矢印のサイズが小さくなっているバグを修正
- @kobalab/majiang-ui 1.4.12 → 1.4.13
- 牌譜エディタで開槓直後の和了の「ツモ」「放銃」が表示されないバグを修正
- 牌譜エディタで連続したカンが入力できない場合があるバグを修正
- @kobalab/majiang-ai 1.0.12 → 1.0.13

### v2.4.12 / 2024-12-30

- 牌理の牌姿の入力の際にカーソルキーが使えない問題を修正
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "majiang",
"version": "2.4.12",
"version": "2.4.13",
"description": "HTML5 + JavaScript で動作する麻雀アプリ「電脳麻将」",
"private": true,
"scripts": {
"build:html": "pug -o dist -P src/html/page/",
"build:css": "stylus src/css/index.styl -o dist/css/majiang-2.4.12.css",
"build:css": "stylus src/css/index.styl -o dist/css/majiang-2.4.13.css",
"build:js": "webpack --mode development --devtool inline-source-map",
"build": "npm run build:html && npm run build:css && npm run build:js",
"release": "npm run build:html && npm run build:css && webpack --mode production",
Expand Down
2 changes: 1 addition & 1 deletion src/html/inc/version.pug
Original file line number Diff line number Diff line change
@@ -1 +1 @@
- var version = '2.4.12'
- var version = '2.4.13'
2 changes: 1 addition & 1 deletion src/js/autoplay.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 自動対戦 v2.4.12
* 電脳麻将: 自動対戦 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/dapai.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 何切る解答機 v2.4.12
* 電脳麻将: 何切る解答機 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/drill.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 点数計算ドリル v2.4.12
* 電脳麻将: 点数計算ドリル v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/hule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 和了点計算 v2.4.12
* 電脳麻将: 和了点計算 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将 v2.4.12
* 電脳麻将 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
4 changes: 2 additions & 2 deletions src/js/majiang.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将 v2.4.12
* 電脳麻将 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand All @@ -9,6 +9,6 @@
global.Majiang = require('@kobalab/majiang-core');
global.Majiang.AI = require('@kobalab/majiang-ai');
global.Majiang.UI = require('@kobalab/majiang-ui');
global.Majiang.VERSION = '2.4.12';
global.Majiang.VERSION = '2.4.13';
global.jQuery = require('jquery');
global.$ = jQuery;
2 changes: 1 addition & 1 deletion src/js/netplay.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: ネット対戦 v2.4.12
* 電脳麻将: ネット対戦 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/paiga.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 牌画入力 v2.4.12
* 電脳麻将: 牌画入力 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/paili.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 牌理 v2.4.12
* 電脳麻将: 牌理 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/paipu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: 牌譜ビューア v2.4.12
* 電脳麻将: 牌譜ビューア v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down
2 changes: 1 addition & 1 deletion src/js/rule.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* 電脳麻将: ルール設定 v2.4.12
* 電脳麻将: ルール設定 v2.4.13
*
* Copyright(C) 2017 Satoshi Kobayashi
* Released under the MIT license
Expand Down

0 comments on commit c4f1834

Please sign in to comment.