Commit Graph

522 Commits

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