jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
2,821 Commits 1 Branch 2 Tags 50 MiB
ae57ae2cf5
Commit Graph

1023 Commits

Author SHA1 Message Date
ckcz123
4391e8cd7d selectPoint fix bug 2019-05-31 20:12:50 +08:00
ckcz123
b15782228a uievent mobile 2019-05-31 19:56:57 +08:00
ckcz123
cbad40d773 blockly selectPoint 2019-05-31 19:30:44 +08:00
oc
af9e541268 uievent.elements 2019-05-31 00:30:14 +08:00
oc
06a0d5153d uievent.elements 2019-05-31 00:29:03 +08:00
oc
1cee65b7ff selectPoint 2019-05-29 23:53:08 +08:00
oc
550252817c selectPoint 2019-05-29 22:48:41 +08:00
oc
58c9f4ddbe selectPoint 2019-05-29 22:40:45 +08:00
oc
317ff5d591 previewUI 2019-05-29 21:35:19 +08:00
oc
dc205877de previewUI 2019-05-28 00:04:45 +08:00
oc
414dd86c81 previewUI part 1 2019-05-27 23:23:32 +08:00
oc
ba7eccbf5e toolboxReplay 2019-05-27 21:56:28 +08:00
oc
6b23361b61 uievents 2019-05-26 23:26:50 +08:00
oc
0c6176f5f6 uievents 2019-05-26 23:10:28 +08:00
oc
1e96491dd4 uievents 2019-05-26 23:06:21 +08:00
oc
2586ec9b76 uievents 2019-05-26 23:02:46 +08:00
oc
01edcfbc98 uievents part 1 2019-05-26 16:33:42 +08:00
oc
a57771d1bf changeFloor symmetry point 2019-05-26 12:01:39 +08:00
oc
5335a2f858 Merge branch 'v2.x' into refactoring-editor 2019-05-02 21:11:10 +08:00
oc
2c0e0ba307 changeFloorId 2019-05-02 21:06:44 +08:00
oc
330e031bc7 changeFloorId 2019-05-02 21:05:05 +08:00
oc
4a3bf0e96a merge v2.x 2019-05-01 16:27:21 +08:00
oc
053665d081 changeId 2019-05-01 16:24:25 +08:00
YouWei Zhao
570f03343d change id idnum 2019-04-30 20:35:11 -04:00
oc
2426c8b010 canEquip -> equipCondition 2019-04-30 20:22:06 +08:00
oc
9264e7dfe5 insertAction commonEvent do-while 2019-04-29 20:10:42 +08:00
Zhang Chen
efe51ce363
Merge pull request #364 from zhaouv/g4-regex-this.xxx 
.g4-regex
 2019-04-29 19:08:34 +08:00
YouWei Zhao
ca7059bbc2 saveScript 2019-04-28 12:14:59 -04:00
oc
c4a38f4f99 moveBlock forward & backward 2019-04-28 22:38:19 +08:00
YouWei Zhao
45101d43f6 .g4-regex 2019-04-28 10:21:07 -04:00
YouWei Zhao
41b0fc553e editor_file fileMark 2019-04-28 09:54:56 -04:00
oc
9a993b13ca global:xxx -> core.getLocalStorage 2019-04-28 21:50:14 +08:00
oc
9e9025e089 openDoor async & battle loc & trigger keep 2019-04-28 20:29:51 +08:00
YouWei Zhao
5f75a0ad6f editor_file savefloor 2019-04-25 10:26:20 -04:00
YouWei Zhao
9861319734 update refactoring.md 
更新的重构思路,关于edtior_file的重构思考的(可能)比较清晰了
 2019-04-23 17:49:49 -04:00
YouWei Zhao
b49fbc6c22 editor_file 2019-04-23 17:08:31 -04:00
YouWei Zhao
59b1bee743 editor_file 
floors_template
 2019-04-23 16:46:03 -04:00
YouWei Zhao
057861d826 floors_template 2019-04-23 14:58:15 -04:00
YouWei Zhao
4e102eba6c editor_file 2019-04-23 14:39:19 -04:00
YouWei Zhao
cb10654e58 editor_file 2019-04-22 18:48:31 -04:00
YouWei Zhao
2b9eadbe9f rename editor_file 2019-04-22 17:51:10 -04:00
oc
507c2040c8 optimize loadData 2019-04-22 23:38:41 +08:00
Zhang Chen
354f2d192f
Merge pull request #358 from zhaouv/refactoring-editor 
refactoring-update
 2019-04-22 11:39:35 +08:00
YouWei Zhao
b41feefa07 add /* html */ to get tpl highlighted by plugin 
https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates
 2019-04-21 18:33:20 -04:00
YouWei Zhao
3360d151e7 fix comment 2019-04-21 18:16:15 -04:00
YouWei Zhao
3bae60a545 update 2019-04-21 18:14:48 -04:00
YouWei Zhao
c73d16c1b9 update 2019-04-21 17:59:50 -04:00
ckcz123
073cec920b flag:xxx support chinese 2019-04-20 21:10:01 +08:00
ckcz123
3230fde958 nameMap 2019-04-20 20:26:20 +08:00
YouWei Zhao
da5c2a2590 editor_file.js 2019-04-18 19:48:45 -04:00
YouWei Zhao
73ebf73f17 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.x' into refactoring-editor 2019-04-18 19:21:19 -04:00
YouWei Zhao
251ac2e46d update refactoring.md 2019-04-18 19:21:09 -04:00
oc
0923a7fdd2 SL 1000 longClick && tip icon && replaySpeed && \b followers 2019-04-18 01:05:27 +08:00
oc
0d49777e1a Fix blockly searchInput 2019-04-17 16:02:17 +08:00
oc
cbd2f650a5 type:autosave 2019-04-17 13:30:36 +08:00
oc
2eeaf5de03 __size__ -> __SIZE 2019-04-16 23:46:42 +08:00
YouWei Zhao
6a49cf89a1 iconLib.onmousedown 
core.__size__==13?630:655
 2019-04-16 11:40:13 -04:00
YouWei Zhao
7deec138ed merge 2019-04-16 11:07:58 -04:00
YouWei Zhao
73b8b9a825 move listen -> unsorted 2019-04-16 11:02:58 -04:00
ckcz123
5b239047b5 indexOf 48 -> endsWith 48 2019-04-16 14:00:48 +08:00
YouWei Zhao
0e9b26b31d update refactoring.md 2019-04-15 13:59:40 -04:00
YouWei Zhao
574a54f81a Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into refactoring-editor 2019-04-15 13:44:50 -04:00
oc
94374d7e81 map category & type:restart 2019-04-15 20:52:42 +08:00
oc
ceddecfd02 betweenAttackMax 2019-04-15 20:25:56 +08:00
oc
379ec5ca89 betweenAttackMax 2019-04-15 20:23:23 +08:00
oc
822a0deb5b changefloor current position 2019-04-13 22:11:08 +08:00
YouWei Zhao
5426052746 update refactoring.md 2019-04-12 17:51:21 -04:00
oc
2e34fd267f drawChoices offset 2019-04-12 23:59:39 +08:00
oc
f93c6d03f0 Fix bug: follow, callBook & dowhile 2019-04-09 23:13:43 +08:00
oc
29e9edae0e setBlock for id 2019-04-08 01:33:03 +08:00
oc
b81c94fe62 steelDoorWithoutKey 2019-04-08 01:12:16 +08:00
YouWei Zhao
616b77a760 mv *comment.js 2019-04-06 08:31:57 -04:00
ckcz123
f43a872895 update comments 2019-04-06 13:23:21 +08:00
YouWei Zhao
e7fc0cd846 config table 2019-04-05 21:41:04 -04:00
oc
a60b6ff3db if_1_s 2019-04-05 22:16:39 +08:00
oc
88a60d6995 type:confirm 2019-04-04 23:15:24 +08:00
Zhang Chen
5d58f1bf67
Merge pull request #339 from zhaouv/refactoring-editor 
confirm_s
 2019-04-04 22:12:40 +08:00
YouWei Zhao
9b5acbcdc4 nobreak 2019-04-03 18:21:48 -04:00
YouWei Zhao
bfa3f3e075 confirm_s 2019-04-03 13:54:19 -04:00
oc
9ecbd2aa42 api for actions & control 2019-04-02 02:38:37 +08:00
Zhang Chen
a688bdb868
Merge pull request #338 from zhaouv/refactoring-editor 
fix bug
 2019-03-31 23:55:10 +08:00
oc
f61ab63693 status:manamax & documents 2019-03-31 23:03:16 +08:00
YouWei Zhao
2d81d7ce74 update regactoring.md 2019-03-31 09:55:40 -04:00
YouWei Zhao
97386fa9cf fix bug 2019-03-31 09:45:28 -04:00
oc
99a4a7b2a2 playSound stop previous 2019-03-31 19:40:55 +08:00
YouWei Zhao
cfd3058b7e update refactoring.md 2019-03-30 19:35:10 -04:00
YouWei Zhao
11fe36a44e editor_game 2019-03-30 19:25:57 -04:00
YouWei Zhao
16930841ce Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into refactoring-editor 2019-03-30 18:52:29 -04:00
YouWei Zhao
52abd12740 update refactoring.md 2019-03-30 12:54:34 -04:00
YouWei Zhao
05f6b37121 update refactoring.md 2019-03-30 12:38:56 -04:00
oc
b3fb8cf98a remove double click unknow_s 2019-03-31 00:35:35 +08:00
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
YouWei Zhao
6e5e8f46ab shop_event & unknow_event 2019-03-30 11:13:11 -04:00
oc
16980c527a quickCommonEvents 2019-03-30 19:18:57 +08:00
ckcz123
d7fb0a2f3f Custom System Event 2019-03-28 15:58:01 +08:00
Zhang Chen
b84912c189
Merge pull request #333 from zhaouv/refactoring-editor 
fix bug
 2019-03-27 17:50:32 +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
9813dc3115 lineHeight, showImage, splitImage 2019-03-25 00:29:18 +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
YouWei Zhao
6b7f9837b6 Merge remote-tracking branch 'refs/remotes/origin/blockly-mousewheel' into refactoring-editor 2019-03-23 15:00:15 -04:00
YouWei Zhao
74b168a285 onmousewheel 
滚轮的行为从滚动百分比改为滚动固定的3行
修改.g4文件的位置
 2019-03-23 14:58:16 -04:00
YouWei Zhao
34e8d8cf9a editor_table 2019-03-23 14:49:10 -04:00
YouWei Zhao
a187df91c9 Merge branch 'refactoring-editor' of https://github.com/zhaouv/mota-js into refactoring-editor 2019-03-23 11:42:22 -04:00
YouWei Zhao
1dda51bb3c editor_table 2019-03-23 11:42:19 -04:00
YouWei Zhao
9bbc8d7a47 editor_table 2019-03-23 11:41:36 -04:00
oc
e7af2ec476 ski 2019-03-23 00:40:09 +08:00
YouWei Zhao
ffb8a5e2b3 editor_table 2019-03-21 11:54:50 -04:00
Zhang Chen
3a1d068308
Merge pull request #327 from zhaouv/remove-vue 
Remove vue
 2019-03-21 23:30:31 +08:00
oc
20781645d4 type:closeDoor 2019-03-21 22:31:13 +08:00
YouWei Zhao
b6b6aa33f6 structure 2019-03-20 20:40:51 -04:00
YouWei Zhao
8af45f900f editor_table 2019-03-20 20:27:23 -04:00
YouWei Zhao
331e4ca592 editor_table 2019-03-20 20:27:04 -04:00
YouWei Zhao
45207a2a54 structure 2019-03-20 19:11:35 -04:00
YouWei Zhao
3996b714c9 init 2019-03-20 19:01:08 -04:00
YouWei Zhao
a87e62ba26 Merge remote-tracking branch 'refs/remotes/origin/plugins' into refactoring-editor 2019-03-20 18:41:17 -04:00
YouWei Zhao
c14d1789e9 tip 2019-03-20 08:42:46 -04:00
oc
cebb4a73c0 flyTo 2019-03-20 14:18:05 +08:00
oc
cc45359ea1 plugins 2019-03-20 13:47:48 +08:00
Zhang Chen
da07c2dc7d
Merge pull request #326 from zhaouv/plugins 
Plugins
 2019-03-20 13:28:09 +08:00
YouWei Zhao
49d497b1a8 editArea 2019-03-19 23:17:47 -04:00
YouWei Zhao
a1e144f2da editArea-1 2019-03-19 22:36:13 -04:00
YouWei Zhao
b61a9afea8 selectBox 2019-03-19 22:25:14 -04:00
YouWei Zhao
4fa318a6b4 step1:buttons 2019-03-19 22:19:41 -04:00
oc
69e4215e03 myprompt & myconfirm 2019-03-20 02:32:31 +08:00
YouWei Zhao
eda91df9f0 ui 2019-03-19 14:23:43 -04:00
YouWei Zhao
d017c5e549 slicing files 2019-03-19 13:19:13 -04:00
oc
bb8182d589 type:insert 2019-03-19 23:57:43 +08:00
oc
676dc50092 save & load v2.6 2019-03-19 01:24:30 +08:00
ckcz123
911c2c5159 updateDamage, addValue 2019-03-18 19:21:23 +08:00
oc
ef5aa25047 automaticRoute & autoMove 2019-03-18 00:01:18 +08:00
ckcz123
147da1b443 resetGame & core.init 2019-03-17 18:00:00 +08:00
oc
83fb359179 Fix diff' 2019-03-17 02:07:06 +08:00
oc
e710804297 editor __SIZE__ 2019-03-17 01:54:58 +08:00
oc
32e760e9e6 remove flyRange 2019-03-16 03:03:02 +08:00
oc
0c4b1ad77a system events 2019-03-16 02:11:28 +08:00
ckcz123
56f80b0a88 drawEvents v2.6 2019-03-14 16:00:47 +08:00
oc
75deca3004 maps.js V2.6 2019-03-14 04:15:11 +08:00
oc
2fce7d9d68 maps.js V2.6 2019-03-14 02:01:19 +08:00
oc
90570489e8 drawBlock, drawMap, drawBgFg 2019-03-10 22:51:21 +08:00
oc
a3dfc875fb canMoveHero & canMoveDirectly 2019-03-10 18:38:55 +08:00
oc
622f5eb8be npc48 animate & loadBgm 2019-03-10 13:50:55 +08:00
oc
e499082407 loader v2.6 2019-03-09 23:23:44 +08:00
oc
ca250fa60a remove battleAnimate 2019-03-05 20:56:27 +08:00
oc
42e04f58be setValue2 2019-02-27 21:19:43 +08:00
oc
337827c17a icon in choices 2019-02-27 21:04:25 +08:00
oc
bd0e8e2f10 editor strict check range 2019-02-27 05:06:46 +08:00
oc
4372981cb3 draw icons in toolbox 2019-02-27 04:53:26 +08:00
oc
bd008a2d48 autoFormat & clearPoint 2019-02-27 00:37:46 +08:00
oc
d27fc7c3fc tilesets 3000 2019-02-26 02:14:24 +08:00
oc
e312e86bb7 iconLib scrollBar 2019-02-26 00:19:56 +08:00
oc
49daef63fb resume bgm 2019-02-21 20:41:50 +08:00
oc
2b92921e43 color in choices 2019-02-20 23:36:26 +08:00
oc
f98c85442f 48 in bg/fg 2019-02-20 21:30:30 +08:00
oc
6b63a8b6c4 moveHero forward & backward 2019-02-19 00:17:34 +08:00
Zhang Chen
5a1b22b9a2
Merge pull request #320 from zhaouv/update-blockly-version 
blockly-version
 2019-02-18 23:49:56 +08:00
oc
248b65834d editor format js 2019-02-18 23:51:38 +08:00
YouWei Zhao
fc878bb529 blockly-version 2019-02-18 10:20:34 -05:00
oc
25bd2c5d72 editor saveFloor 2019-02-18 23:05:39 +08:00
oc
b219c374a0 Ctrl+S in editor 2019-02-18 23:01:26 +08:00
oc
943b70faa1 floorImg animate 2019-02-04 17:14:57 +08:00
oc
7436c54c67 openDoor event needKey 2019-02-04 00:24:49 +08:00
oc
7586b3fe45 stopSound 2019-02-03 18:21:28 +08:00
oc
3f44807a06 commonEvents 2019-02-02 14:08:55 +08:00
YouWei Zhao
57b437de7b common event view 
edit-able in page
 2019-02-01 20:27:37 -05:00
YouWei Zhao
60955f2384 common event table 
editor_mode generate table
 2019-01-31 18:10:32 -05:00
YouWei Zhao
83be55d893 fix 2019-01-31 18:05:28 -05:00
YouWei Zhao
2b1334fe8c re-write editor_mode.prototype.doActionList 2019-01-31 18:04:51 -05:00
YouWei Zhao
f77c8edf29 common event editor_file 
change-able in editor_file
 2019-01-31 17:55:04 -05:00
YouWei Zhao
4ae8c2e863 delete legacy comment 2019-01-31 17:15:53 -05:00
YouWei Zhao
08315af63d common event blockly 
delete legacy point_m
add commentEvent_m
 2019-01-31 17:11:05 -05:00
YouWei Zhao
ed9550a773 common event-create 
create js file&obj, load them in main and editor_file
 2019-01-31 16:56:08 -05:00
oc
a2018b50ba multi equipments 2019-01-21 23:19:49 +08:00
oc
fb8145a9f4 pauseBgm 2019-01-21 22:25:43 +08:00
oc
2a8922f642 layerMod 2019-01-19 19:37:13 +08:00
oc
4d93f98a97 Fix add/delete mode 2019-01-16 22:42:31 +08:00
oc
58607216fe remove edata 2019-01-16 22:27:29 +08:00
oc
a199477b8a useItem event 2019-01-16 22:14:58 +08:00
oc
c89a65ff13 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2019-01-16 21:19:06 +08:00
ckcz123
3de7cae269 main.log && 2019-01-16 19:09:42 +08:00
YouWei Zhao
5a33a81224 editor-icons 
drawImage->img.src
 2019-01-13 10:44:37 -05:00
YouWei Zhao
57c5d983f4 more friendly to version migration 
工程能打开的在编辑器中尽量也不崩掉, 以支持添加了很深的data和comment后的版本迁移
 2019-01-12 11:01:52 -05:00
YouWei Zhao
951fdf7523 voidMark 2019-01-12 10:35:24 -05:00
YouWei Zhao
440f384e0c Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into editor-table-add-delete 2019-01-12 10:22:14 -05:00
YouWei Zhao
fe4c1782da editor .main 2019-01-12 10:21:59 -05:00
YouWei Zhao
bad6ff1412 dynamic table 2019-01-12 10:10:29 -05:00
oc
d31b864ad4 Support animateImage & showImage 2019-01-12 15:17:54 +08:00
oc
1b32ad1de2 Fix editor_mode.js 2019-01-12 15:08:15 +08:00
oc
db566da909 musicBtn & bgm in floor 2019-01-12 00:52:38 +08:00
YouWei Zhao
dc5c665037 order 2019-01-11 11:36:28 -05:00
YouWei Zhao
05290cf9a4 color: default & binding 2019-01-04 11:38:38 -05:00
oc
91eb0391c5 Blockly default color 2019-01-05 00:08:12 +08:00
oc
14202c8a15 Fix colorPanel width 2019-01-05 00:02:35 +08:00
oc
42c4301472 colorPicker 2019-01-04 02:26:12 +08:00
ckcz123
5e563ab410 bgmStatus 2019-01-03 13:09:18 +08:00
YouWei Zhao
6a210a6216 fsTest 2019-01-01 11:06:03 -05:00
Zhang Chen
a8e4cd34f9
Merge pull request #300 from zhaouv/editor-table 
add comment
 2019-01-01 23:14:37 +08:00
oc
20bedabd05 create multiple floors 2019-01-01 23:14:12 +08:00
oc
1b1b64463b writeMultiFiles 2019-01-01 21:18:26 +08:00
oc
91d227dd96 PS & addFloorEvent 2019-01-01 20:16:16 +08:00
YouWei Zhao
1a1426f209 add comment 2018-12-29 22:13:33 -05:00
oc
bf57367562 recover events 2018-12-30 01:03:09 +08:00
oc
c8ca08cb78 callBook & callSave/Load 2018-12-30 00:38:24 +08:00
Zhang Chen
ea8ec4fcfa
Merge branch 'colorpicker' into v2.0 2018-12-27 20:33:42 +08:00
oc
be5c13f717 Ctrl skip sleep 2018-12-27 20:34:38 +08:00
oc
1c26e5aa60 setGlobalFlag 2018-12-26 14:09:00 +08:00
oc
6db27f27ce setGlobalFlag 2018-12-26 14:03:46 +08:00
YouWei Zhao
2e6b7ebef7 fix re /^switch:([A-F])$/ 2018-12-25 10:48:55 -05:00
YouWei Zhao
a32d5d5e98 A-F 2018-12-25 10:44:48 -05:00
YouWei Zhao
8ccd1f00ec tryToUseEvFlag_e 2018-12-25 10:36:43 -05:00
oc
c25ba136c2 evFlag 2018-12-25 22:33:39 +08:00
oc
c622934dfd evFlag 2018-12-25 22:33:05 +08:00
Zhang Chen
75435ea3a8
Merge pull request #296 from ckcz123/v2.0 
V2.0
 2018-12-25 19:36:50 +08:00
ckcz123
ccae1b9ba1 Mobile highlight canvas 2018-12-25 19:35:46 +08:00
ckcz123
8e2cb367df Independent Switch 2018-12-25 18:39:18 +08:00
oc
dd31fe605e select in floorId 2018-12-25 11:50:21 +08:00
Zhang Chen
facbc71456
Merge pull request #295 from ckcz123/v2.0 
V2.0
 2018-12-25 00:32:53 +08:00
oc
75a714824d Fix WeatherList Bug 2018-12-24 21:14:37 +08:00
YouWei Zhao
a536c9958b blockly-comment 2018-12-23 18:21:44 -05:00
oc
07590c7aa6 Fix setWeather Bug 2018-12-23 21:11:48 +08:00
YouWei Zhao
c7e1786cc9 colorPicker - blockly binding 2018-12-22 17:20:04 -05:00
oc
132afb961e colorPicker 2018-12-22 23:44:59 +08:00
Zhang Chen
afddfafa1f
Merge pull request #287 from tocque/dev 
colorPicker
 2018-12-22 23:03:51 +08:00
oc
bf6c143ea0 Binary Search for critical 2018-12-22 23:01:39 +08:00
tocque
a7109fe0cb colorPicker 2018-12-22 23:19:21 +09:00
Zhang Chen
0ffd8d46d9
Merge pull request #283 from tocque/dev 
screenFlash
 2018-12-21 00:44:29 +08:00
tocque
e7641303dc setFg based screenFlash 2018-12-20 22:43:22 +09:00
ckcz123
1e96aa74a5 Avoid moving bigmap during input 2018-12-20 18:16:04 +08:00
oc
0d9507768b Fix setText Bug 2018-12-20 03:38:29 +08:00
oc
ce81f3480a forward calWidth & drawImage 2018-12-20 00:22:04 +08:00
tocque
c7f30538d8 screenFlash 2018-12-19 16:36:42 +09:00
ckcz123
77612f1018 changingFloor 2018-12-18 12:37:32 +08:00
ckcz123
f26bc14bf1 Dynamic canvas 2018-12-17 14:38:34 +08:00
oc
82490f352b Cache bgms 2018-12-17 00:31:43 +08:00
ckcz123
7bd4dba671 Merge branch 'v2.0' into dev 2018-12-16 13:25:52 +08:00
ckcz123
430c7650ce setVolume & useLoop 2018-12-16 13:24:54 +08:00
oc
9b84308149 showToolbox in hideMode 2018-12-15 12:04:48 +08:00
oc
e3f4f9dc68 showToolbox & force autoSave 2018-12-15 12:02:54 +08:00
oc
86fbd7ae54 moveOneStep in functions 2018-12-14 23:23:47 +08:00
ckcz123
65f9fcb612 Dynamic canvas 2018-12-14 20:52:55 +08:00
ckcz123
9098eefe09 Merge branch 'v2.0' into dev 2018-12-14 11:50:05 +08:00
ckcz123
eeab671f4e cannotMoveDirectly in floor 2018-12-14 11:49:00 +08:00
oc
f838ef3997 Fix Bugs 2018-12-14 10:19:41 +08:00
tocque
19e652c51d
Merge branch 'dev' into dev 2018-12-14 01:54:07 +09:00
oc
e8559f3e2d noGlobalAnimate 2018-12-13 23:50:01 +08:00
oc
8d31055c52 Search Blockly 2018-12-13 22:43:28 +08:00
ckcz123
71f03ffbfe Search 2018-12-13 20:41:20 +08:00
tocque
07bcfafe27 dynamic canvas 2018-12-13 20:02:03 +09:00
ckcz123
ecdea07856 Frequently & Last Used Blocks 2018-12-13 15:26:01 +08:00
ckcz123
5669197fbc Last Used Items 2018-12-13 15:10:55 +08:00
YouWei Zhao
560c6136f7 fix 2018-12-12 18:33:57 -05:00
YouWei Zhao
556dd15dc2 delete console.log(...) 2018-12-12 18:31:59 -05:00
YouWei Zhao
682873673b lastusedblocks 2018-12-12 18:27:34 -05:00
oc
3d2e0c06bb Fix Ctrl+Z 2018-12-12 23:07:38 +08:00
oc
b646c1cb3e firstArrive before eachArrive 2018-12-11 23:28:00 +08:00
ckcz123
2a85590055 blockly Int_0 2018-12-11 17:22:22 +08:00
ckcz123
25cdc2324d blockly Int_0 2018-12-11 17:21:23 +08:00
oc
a6260d9edd clear exp in levelUp 2018-12-11 01:44:01 +08:00
ckcz123
09f130e049 scrollText 2018-12-09 18:28:02 +08:00
oc
04cbc7697a Merge branch 'v2.0' into status-canvas 2018-12-08 00:26:33 +08:00
oc
ae720ee477 Fog 2018-12-08 00:03:31 +08:00
ckcz123
83b5ef106f floorChangeTime 2018-12-07 13:36:42 +08:00
oc
fa0692fd91 statusCanvas 2018-12-07 01:15:44 +08:00
oc
15b71dc60c Auto adjust for pure black 2018-12-07 01:08:01 +08:00
oc
519b882758 statusCanvas 2018-12-06 23:29:49 +08:00
ckcz123
75bff6bcd6 Fix Editor ChangeFloor Bug 2018-12-06 16:22:16 +08:00
ckcz123
5401714b3f Async function 2018-12-05 16:48:33 +08:00
ckcz123
ca05e48846 dblclick & highlight pos & WASD move 2018-12-04 20:50:25 +08:00
ckcz123
fd90933673 non-null in location 2018-12-04 18:58:39 +08:00
ckcz123
105d73e0af non-null in location 2018-12-04 18:57:02 +08:00
ckcz123
4db79dec3f Equipment percentage for each 2018-12-04 18:16:19 +08:00
oc
b970002b4f \f drawImage in TextBox 2018-12-03 21:56:17 +08:00
oc
717efe7882 show/hide Async 2018-12-03 21:22:40 +08:00
ckcz123
2a0568ae6c moveSpeed 2018-12-03 14:22:40 +08:00
ckcz123
0ea7d2e69c Merge branch 'startgame' into v2.0 2018-12-03 13:00:03 +08:00
oc
dff6793829 Enable Animate block & autotile in Bg/Fg 2018-12-02 23:10:06 +08:00
oc
4ee795a3c3 eachArrive 2018-12-02 22:15:22 +08:00
oc
a830e14614 waitAsync 2018-12-02 21:47:03 +08:00
oc
f8ead89d90 Update startGame 2018-12-02 01:41:35 +08:00
oc
379dbd0348 startUsingCanvas 2018-12-02 00:19:44 +08:00
oc
a6a8b91863 show/hide status bar 2018-12-01 14:48:52 +08:00
oc
d727a4d9d1 setGlobalAttribute & setGlobalValue 2018-12-01 14:12:42 +08:00
oc
dd3f7863a7 globalAttribute & Font 2018-12-01 13:09:15 +08:00
ckcz123
cbbd973357 Async move & jump 2018-11-30 21:14:14 +08:00
ckcz123
1e2238985a hideInReplay 2018-11-29 21:35:21 +08:00
ckcz123
4bc1ea4a9c background 2018-11-28 22:04:41 +08:00
ckcz123
d6eb3bab65 autoText 2018-11-27 17:19:24 +08:00
ckcz123
b46abe7179 1 2018-11-27 17:10:32 +08:00
ckcz123
db2a50e9e0 select direction 2018-11-27 17:07:08 +08:00
ckcz123
86d22a09ea faceIds 2018-11-27 16:59:53 +08:00
ckcz123
d0a8855650 faceIds 2018-11-27 16:57:19 +08:00
ckcz123
9bc3adf80b displayIdInBook 2018-11-27 13:31:36 +08:00
ckcz123
1ef9d7b195 strict mode: use var in project 2018-11-26 14:28:31 +08:00
ckcz123
417495cc33 norank 2018-11-25 13:20:21 +08:00
ckcz123
b9e1624183 norank 2018-11-25 13:19:15 +08:00
ckcz123
360ed87ba0 Replace Docs URL 2018-11-25 13:08:30 +08:00
ckcz123
41df301079 Fix changeFloor Time 2018-11-25 13:04:30 +08:00
ckcz123
8c4946ffad Floor ParallelDo 2018-11-25 12:16:13 +08:00
ckcz123
69e44861aa Floor ParallelDo 2018-11-25 12:14:07 +08:00
Zhang Chen
7db822e04a
Merge pull request #261 from tocque/levelUp 
Level up
 2018-11-24 22:34:54 +08:00
tocque
a8554c21e2 levelUp event 2018-11-24 22:30:54 +09:00
oc
b8c6a4fdf7 Auto fill new floor title 2018-11-24 01:19:17 +08:00
ckcz123
94f2531979 Append Multi Image 2018-11-22 17:29:37 +08:00
oc
d3d63ff6d8 \v -> \r Fix 2018-11-22 01:28:48 +08:00
oc
abd6f8cbef onError 2018-11-22 00:45:55 +08:00
oc
7e7d5dd563 type:insert 2018-11-21 22:57:08 +08:00
ckcz123
cdb81d5eb3 Add Image Auto Adjust 2018-11-21 20:53:04 +08:00
ckcz123
19d7ed2cac gray on unvisited quickshop 2018-11-21 19:52:08 +08:00
ckcz123
6c6829f621 canEquip 2018-11-21 19:35:02 +08:00
ckcz123
bede2fe682 Fix Bg/Fg Bug & Add opacity 2018-11-20 19:15:40 +08:00
ckcz123
b8e3c3798d levelUpLeftMode 2018-11-15 17:38:15 +08:00
ckcz123
7c28c1d2fb disableShopOnDamage 2018-11-15 17:27:08 +08:00
YouWei Zhao
b2776328bd fix switch 2018-11-12 21:32:01 +08:00
tocque
7b8c444fb3 type:switch 2018-11-10 00:00:31 +09:00
tocque
e3f03d8646 type:switch 2018-11-09 23:53:14 +09:00
tocque
3b5e7a0e30 switch 2018-11-09 22:48:07 +09:00
YouWei Zhao
56e5070f0a fix autotile append size bug 2018-10-31 23:48:56 +08:00
YouWei Zhao
31a7e76841 fix autotile hsl size 2018-10-31 23:27:08 +08:00
oc
82dcff123a Autotile animate 2018-10-31 22:59:46 +08:00
ckcz123
54b8e7e60d Quick Shops 2018-10-31 18:18:31 +08:00
ckcz123
d98a21f7f9 Event: Comment 2018-10-31 17:36:32 +08:00
ckcz123
755919307d Event: Comment 2018-10-31 17:34:41 +08:00
ckcz123
71f5d366dc StartText events 2018-10-30 15:43:33 +08:00
ckcz123
ca1c5a00ec QuickShop common times 2018-10-30 14:39:15 +08:00
ckcz123
5b1bf618c2 Skill 2018-10-30 14:19:24 +08:00
oc
1ddde2137d mana & skill 2018-10-30 02:58:21 +08:00
ckcz123
b9dc593bd1 F4 debug & cannotIn/Out 2018-10-29 12:59:24 +08:00
oc
2dad906e7e drawTextBox position 2018-10-29 01:31:37 +08:00
oc
4e79ba1015 floorChangingBackground 2018-10-29 00:43:16 +08:00
oc
87e39fee52 Move Directly 2018-10-28 22:18:35 +08:00
oc
4a3b488dc2 V2.4.4 2018-10-27 00:21:28 +08:00
YouWei Zhao
cab5b6adca fix-editor-init-tileset 
避免在一个actionlist中定义两次,使第一次的修改无效
 2018-10-26 23:27:42 +08:00
YouWei Zhao
94ae7f3a33 editor-tilesets 2018-10-26 23:25:51 +08:00
Zhang Chen
00e2a79840
Merge pull request #242 from zhaouv/editor-append-hsb 
editor-appendPic-hsl
 2018-10-26 21:29:02 +08:00
oc
69374042c3 imitate criticals & canBreak 2018-10-26 21:27:35 +08:00
YouWei Zhao
99998c3249 editor-appendPic-hsl 
追加素材中支持更改色相
 2018-10-26 21:24:25 +08:00
oc
082f57303f setFloor 2018-10-19 00:59:44 +08:00
oc
21553a7728 Damage in ViewMaps & Keep in animateImage 2018-10-16 22:52:45 +08:00
oc
32caa756fb V2.4.3 2018-10-14 17:30:26 +08:00
oc
1e53063785 Register Autotile 2018-10-14 17:20:37 +08:00
oc
92a24f1797 text font 2018-10-13 20:05:40 +08:00
oc
ed5966b746 text font 2018-10-13 20:02:36 +08:00
oc
c3d7910fe4 parallelDo 2018-10-13 13:46:57 +08:00
oc
6aed9a63d3 canUseQuickShop in functions 2018-10-11 22:15:05 +08:00
oc
3565b2256a Name on statusBar 2018-10-11 21:51:41 +08:00
oc
d42ce084d6 drawStatistics & flyTo 2018-10-11 17:28:03 +08:00
oc
41d9c5a298 getEnemyInfo & Aura 2018-10-11 16:53:39 +08:00
oc
a3bc8871be V2.4.2 2018-09-27 23:54:51 +08:00
YouWei Zhao
e17a333e74 editor: shortcut 2018-09-27 21:07:30 +08:00
YouWei Zhao
3d3d0f4b2e editor: shortcut 
ctrl+数字 使用快捷图块
alt+数字 改变快捷图块
 2018-09-27 19:19:13 +08:00
YouWei Zhao
21ab8a4450 editor-airwall 2018-09-27 18:48:52 +08:00
YouWei Zhao
74b6f48a01 editor-airwall 2018-09-27 18:01:38 +08:00
YouWei Zhao
02c7f86977 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into editor-tilesets 2018-09-27 14:49:23 +08:00
YouWei Zhao
be3925cae6 editor: tileset draw-mod 2018-09-27 14:44:32 +08:00
ckcz123
e927c9ea9c Number 17: Airwall 2018-09-27 14:41:59 +08:00
ckcz123
b36e1bae30 Muliple Animations 2018-09-27 14:23:48 +08:00
oc
9941d12689 Equipment Buff 2018-09-27 10:53:10 +08:00
YouWei Zhao
8e6e301bae editor-tilesets:check <img>.[height/width] mod 32 2018-09-27 00:05:49 +08:00
YouWei Zhao
458e464f73 editor-tilesets 2018-09-26 23:39:36 +08:00
YouWei Zhao
914874e5af editor: fine tuning 2018-09-24 14:35:30 +08:00
oc
a6a0ddc76c Fix ChangeFloor Bug 2018-09-20 08:08:59 +08:00
oc
feaa250a9c Async events 2018-09-19 21:17:43 +08:00
oc
8e234d396c Fix Bg/Fg map in floors 2018-09-19 20:40:40 +08:00
YouWei Zhao
e77dac115b fix editor:hide bg/fgmap in table ,add some '_range' in comment 2018-09-19 12:47:11 +08:00
ckcz123
ba08f55361 Async Animate 2018-09-18 18:51:24 +08:00
ckcz123
c57e734b97 Typing effect: display all on click 2018-09-17 19:35:34 +08:00
ckcz123
2ab6661ab1 Equipment Docs 2018-09-17 18:19:34 +08:00
ckcz123
c00ae6e017 Equipment 2018-09-17 16:18:33 +08:00
oc
f95b316ff5 V2.4.1 2018-09-16 16:23:27 +08:00
ckcz123
d2af698252 V2.4.1 2018-09-16 04:54:32 +08:00
Zhang Chen
55baa70d3c
Merge pull request #211 from zhaouv/editor-bgfgmap 
editor bg/fgmap
 2018-09-16 00:34:31 +08:00
Zhang Chen
73a5fd8b78
Merge pull request #209 from tocque/equipbox 
Equipment
 2018-09-16 00:29:18 +08:00
YouWei Zhao
d1fdc2825d editor: ban 48*32 blocks in fgmap/bgmap 2018-09-16 00:08:29 +08:00
YouWei Zhao
f0d5c04db5 editor: fgmap bgmap draw-support 2018-09-15 23:54:39 +08:00
tocque
42e0d2239e still have some problems 2018-09-15 12:23:25 +08:00
tocque
59976bbb0c correct some mistakes 2018-09-14 08:01:35 +08:00
YouWei Zhao
2c3fba90e1 editor: fgmap bgmap data-support 2018-09-13 19:31:10 +08:00
ckcz123
095aedf1e1 Bgmap & Fgmap events 2018-09-13 16:08:17 +08:00
oc
3d188025ca set bg/fg map 2018-09-13 00:22:20 +08:00
tocque
eedbd3d457 test 2018-09-07 22:34:50 +08:00
ckcz123
f43ed04b1c input2 2018-09-06 13:46:33 +08:00
ckcz123
3308bb8e6a clickMoveDirectly switch 2018-09-06 13:14:05 +08:00
oc
10cf507016 Fix changeFloor number 2018-09-04 22:44:15 +08:00
oc
ef816bce1f Fix Bug 2018-09-01 00:24:29 +08:00
oc
75d5b9dd29 show/hide floor images 2018-08-29 23:07:01 +08:00
oc
3422b07590 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-08-27 23:59:21 +08:00
oc
95f401e2dd write generate_map error 2018-08-27 23:57:07 +08:00
YouWei Zhao
740b96baf3 fix editor: import bigmap 2018-08-27 23:55:53 +08:00
Zhang Chen
09d4a65292
Merge pull request #195 from ckcz123/bigmap 
Bigmap -> V2.0
 2018-08-27 18:05:00 +08:00
ckcz123
2005f5059f setValue name 2018-08-27 17:52:18 +08:00
ckcz123
6471f61e35 Show PZF on status bar 2018-08-27 17:21:05 +08:00
YouWei Zhao
a6c602f4e2 editor : blockly 
response to feedback
 2018-08-27 17:02:26 +08:00
YouWei Zhao
5e99393cab drawEventBlock : mutli 2018-08-27 14:54:48 +08:00
oc
373e6a281e Fix mapIntoBlocks bug 2018-08-27 01:59:56 +08:00
oc
fb540a6976 Create bigmap 2018-08-27 01:36:00 +08:00
oc
0dab4301bd Add arrow keys 2018-08-27 01:01:24 +08:00
YouWei Zhao
e69f248ea2 fix textarea.select 
textarea.select();
==> (ios support)
textarea.focus();
textarea.setSelectionRange(0, textarea.value.length);
 2018-08-26 23:01:59 +08:00
YouWei Zhao
4bb60bd2f7 bigmap-editor 
drawEventBlock, exportMap, formatMap 等对于的大地图的支持
 2018-08-26 17:01:35 +08:00
YouWei Zhao
702c22d49d bigmap-editor 
界面的兼容
viewport调整以及对应的按钮, 地图两边的坐标刻度跟随
editor-mobile
 2018-08-26 15:25:39 +08:00
YouWei Zhao
7032cb7c83 bigmap-editor 2018-08-26 00:33:02 +08:00
oc
7551dd3c72 Automatic Route 2018-08-24 22:45:35 +08:00
ckcz123
4dcfcbd702 Update BigMap: Reformat & Fix & Add damage display 2018-08-24 20:36:14 +08:00
YouWei Zhao
2273315f93 fix append:use drawImage instead of putImageData 2018-08-23 21:29:59 +08:00
oc
9acee7233f V2.3.3 2018-08-06 01:09:56 +08:00
YouWei Zhao
c67c3e6e8d ColMark,RowMark: table->div 2018-07-28 20:27:00 +08:00
YouWei Zhao
667448800f fix ColMark,RowMark 2018-07-28 19:23:16 +08:00
oc
70b8d927de V2.3.3 2018-07-28 16:13:21 +08:00
oc
e5885a70b3 V2.3.3 2018-07-22 22:57:27 +08:00
oc
cd45e69ab0 V2.3.3 2018-07-22 22:47:19 +08:00
ckcz123
8908453be2 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-07-22 13:26:32 +08:00
YouWei Zhao
5f411c0acc editor brushMod 
editor.brushMod = "line"; // ["line","rectangle"]
 2018-07-21 22:18:19 +08:00
ckcz123
e987725523 V2.3.3 2018-07-21 14:59:45 +08:00
oc
1d70bcd131 Move enemy functions to proect 2018-07-19 02:08:04 +08:00
YouWei Zhao
08e0e70acd ondblclick 2018-07-09 22:48:45 +08:00
YouWei Zhao
338323c748 drag 2018-07-09 22:30:43 +08:00
ckcz123
9b5a7689c8 Fix width 2018-07-09 18:23:08 +08:00
Zhang Chen
f74b8fd136
Merge pull request #173 from zhaouv/editor-mobile-ui 
show data area when change editModeSelect
 2018-07-09 17:26:12 +08:00
YouWei Zhao
2444464d60 show data area when change editModeSelect 2018-07-09 17:14:53 +08:00
Zhang Chen
4cb74061c1
Merge pull request #172 from zhaouv/editor-mobile-ui 
Update mobile ui
 2018-07-09 15:27:46 +08:00
YouWei Zhao
2798c0cf58 fix resize 2018-07-09 14:31:18 +08:00
YouWei Zhao
ba954e27d8 Update mobile ui 2018-07-09 00:40:27 +08:00
Zhang Chen
382cd6a4e3
Merge pull request #170 from zhaouv/editor-mobile-ui 
fix resize bug
 2018-07-08 12:27:44 +08:00
YouWei Zhao
7901113564 fix resize bug 2018-07-08 11:20:00 +08:00
Zhang Chen
a03252d4a4
Merge pull request #168 from zhaouv/editor-mobile-ui 
Update mobile ui
 2018-07-07 17:06:40 +08:00
YouWei Zhao
189ef85b2a Update mobile ui 2018-07-07 17:05:20 +08:00
oc
bd2340168c setVolume fade 2018-07-07 02:11:41 +08:00
YouWei Zhao
0288f42c8d fix getCategory 
修复了getCategory,因为命名不一致带来bug的可能, 方便添加新分类
 2018-07-05 20:39:32 +08:00
YouWei Zhao
cd23d0abba finish 2018-07-05 18:13:04 +08:00
YouWei Zhao
11ed345321 mainview 2018-07-05 13:27:17 +08:00
YouWei Zhao
9a276883da init 2018-07-05 12:11:53 +08:00
oc
2a5d318675 Fix ChangeFloor Bug 2018-07-04 02:09:08 +08:00
ckcz123
74d3fd070e Follow Effect 2018-07-03 18:56:35 +08:00
YouWei Zhao
36440ba768 _string 2018-07-01 20:02:54 +08:00
YouWei Zhao
a54029fbf3 editor: copy event 
改变复制事件的方向
 2018-07-01 20:00:22 +08:00
oc
7ce005d770 Autosize 2018-06-30 00:31:58 +08:00
YouWei Zhao
9ddefed070 hide point_m 
隐藏入口方块中的加点
入口方块类型错误时同步的报错
 2018-06-29 23:11:08 +08:00
YouWei Zhao
a9d92e7996 fix bug in editor 
1.比如道具效果 useItemEffect
等，在新注册后默认是null；如果要编辑需要先改成空的双引号""，然后再双击编辑；否则直接双击的话系统会认为是一个JSON，写脚本就会出错
2.事件编辑器保存时检测用的框是否是正确
 2018-06-29 22:57:49 +08:00
YouWei Zhao
67e6bdb261 blockly bug fix 
opendoor_s
changeFloor_s
data.loc[0]||''
 2018-06-28 11:27:26 +08:00
oc
33325dc902 MoveBlock & move hero 2018-06-25 01:02:31 +08:00
oc
b0b4cd45c9 Fix bug 2018-06-22 01:20:35 +08:00
oc
78d39dbd79 Update data.comment 2018-06-21 23:01:08 +08:00
oc
dd12470866 V2.3.1 2018-06-16 23:23:19 +08:00
oc
f9bb336769 Mouse wheel to changefloor 2018-06-05 23:10:50 +08:00
Zhang Chen
206b763b88
Merge pull request #138 from zhaouv/v2.x 
V2 x
 2018-06-05 22:00:17 +08:00
YouWei Zhao
a7f156b73b blockly侧边栏改成中文 2018-06-05 14:29:09 +08:00
oc
e18d3c4cf7 snow four directions 2018-06-03 10:19:28 +08:00
oc
4b66b7b9c0 :before & :next 2018-06-03 10:08:46 +08:00