Commit Graph

544 Commits

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