Commit Graph

669 Commits

Author SHA1 Message Date
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