Commit Graph

2053 Commits

Author SHA1 Message Date
oc
8aca0760c0 commonEventShop 2019-03-31 00:22:26 +08:00
YouWei Zhao
8b6ef9f0d3 Merge branch 'refactoring-editor' of https://github.com/zhaouv/mota-js into refactoring-editor 2019-03-30 12:15:25 -04:00
oc
31facb29e4 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2019-03-30 23:29:47 +08:00
oc
48c1555e30 Add docs 2019-03-30 23:27:45 +08:00
Zhang Chen
1c14cf64d6
Merge pull request #336 from zhaouv/events
shop_event & unknow_event
2019-03-30 23:25:48 +08:00
YouWei Zhao
f2cda09f12 Merge remote-tracking branch 'refs/remotes/origin/events' into refactoring-editor 2019-03-30 11:18:58 -04:00
YouWei Zhao
6e5e8f46ab shop_event & unknow_event 2019-03-30 11:13:11 -04:00
oc
3b1c8b8a80 Fix animate async 2019-03-30 22:08:15 +08:00
YouWei Zhao
3568fc11b7 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into events 2019-03-30 09:29:13 -04:00
oc
e822543bf1 prev replays 2019-03-30 20:15:43 +08:00
oc
16980c527a quickCommonEvents 2019-03-30 19:18:57 +08:00
oc
f7056d699f fix status:x 2019-03-30 17:15:12 +08:00
oc
67f98f2da6 toolbox textalign 2019-03-30 17:04:48 +08:00
oc
254484541d drawEquipbox 2019-03-30 16:46:02 +08:00
oc
25d0ce95ac Fix compress 2019-03-30 01:13:40 +08:00
oc
f98c1b0916 drawSL 2019-03-30 00:49:19 +08:00
oc
f961cc25ec drawSL 2019-03-30 00:43:35 +08:00
oc
46aa0c8278 drawSL 2019-03-30 00:30:56 +08:00
Zhang Chen
a684b80ae8
Merge pull request #335 from dljgs1/v2.0
V2.0
2019-03-29 13:14:58 +08:00
dljgs1
9b4572feb7 drawSLPanel 2019-03-29 07:00:15 +08:00
dljgs1
9aa7cca037 drawSLPanel 2019-03-29 06:52:04 +08:00
oc
90407e94a0 drawToolbox 2019-03-29 00:43:26 +08:00
ckcz123
5e978fa2d4 format date 2019-03-28 19:38:44 +08:00
ckcz123
d7fb0a2f3f Custom System Event 2019-03-28 15:58:01 +08:00
ckcz123
bf20f9ce92 buildFont 2019-03-28 15:19:20 +08:00
oc
2b0de5127d fix drawHero in gameOver 2019-03-28 01:26:59 +08:00
oc
dd48678d2d Fix animateBlock for none 2019-03-28 00:40:22 +08:00
oc
13b09ff911 type:insert set args 2019-03-28 00:24:13 +08:00
Zhang Chen
b84912c189
Merge pull request #333 from zhaouv/refactoring-editor
fix bug
2019-03-27 17:50:32 +08:00
ckcz123
eb9dbf1953 drawBook_row & drawBackground 2019-03-27 17:46:34 +08:00
YouWei Zhao
30d920d8b4 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into refactoring-editor 2019-03-26 14:27:28 -04:00
YouWei Zhao
0023a16007 Update refactoring.md 2019-03-26 14:27:10 -04:00
YouWei Zhao
2da164af9c fix bug in editor_table 2019-03-26 14:02:47 -04:00
oc
209f10d7a2 drawBook 2019-03-27 00:33:18 +08:00
oc
4e8c4c1798 startGame replay & init sys flags 2019-03-26 22:32:21 +08:00
oc
5c0e3ade0b drawMaps 2019-03-26 02:16:06 +08:00
oc
c91831841e drawFly 2019-03-26 00:55:11 +08:00
oc
45c74f44e0 drawStatistics & drawBookDetail 2019-03-26 00:43:08 +08:00
oc
c5f6ba9ac1 drawKeyboard 2019-03-25 23:37:43 +08:00
oc
f25a295742 drawKeyboard 2019-03-25 23:35:10 +08:00
oc
2cdac4930a drawConfirmBox, drawPagination 2019-03-25 23:05:44 +08:00
oc
400d91f697 drawConfirmBox, drawPagination 2019-03-25 23:03:07 +08:00
oc
798a751f2f Fix bigmap bug 2019-03-25 11:04:17 +08:00
oc
9813dc3115 lineHeight, showImage, splitImage 2019-03-25 00:29:18 +08:00
Zhang Chen
ff45cfdca3
Merge pull request #331 from zhaouv/refactoring-editor
efactoring
2019-03-24 16:51:04 +08:00
Zhang Chen
f7cc621bb2
Merge pull request #330 from zhaouv/blockly-mousewheel
onmousewheel
2019-03-24 16:49:32 +08:00
oc
38c8b81f48 actions choices HSIZE 2019-03-24 16:45:48 +08:00
oc
018dbe8332 rewrite drawTextBox & drawChoices 2019-03-24 16:05:46 +08:00
YouWei Zhao
8eddb7f7b5 editor_util 2019-03-23 16:50:10 -04:00
YouWei Zhao
f67a84faf4 editor_table 2019-03-23 16:21:45 -04:00