Commit Graph

520 Commits

Author SHA1 Message Date
oc
a248349739 support 48x32 2018-03-13 01:50:00 +08:00
Zhang Chen
817e95c225
Merge pull request #76 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-12 15:49:27 +08:00
oc
cb1561f6e7 Textbox 2018-03-12 12:17:40 +08:00
oc
a04d03000c ChangeFloor trigger firstArrive 2018-03-12 12:14:17 +08:00
YouWei Zhao
c4447d88c8 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-12 11:09:14 +08:00
YouWei Zhao
6be440a99d 发生不合要求的更改时显示field 2018-03-12 11:06:04 +08:00
Zhang Chen
7ad578a2a2
Merge pull request #75 from zhaouv/v2.0-editor-20180304
editor:更改部分内容显示的缩进
2018-03-12 00:25:45 +08:00
YouWei Zhao
45f27530a0 editor:更改部分内容显示的缩进 2018-03-12 00:02:28 +08:00
oc
8592e4be31 Enemy Special 2018-03-11 23:31:05 +08:00
oc
ea0848f5a8 Enable HP Max 2018-03-11 23:23:45 +08:00
Zhang Chen
640baac703
Merge pull request #74 from zhaouv/v2.0-editor-20180304
editor在编辑enemy.js时一个怪物一行
2018-03-11 20:41:07 +08:00
YouWei Zhao
fd5e0032ab editor在编辑enemy.js时一个怪物一行
修复了codeAreaHL不是全局量导致的bug
2018-03-11 19:56:21 +08:00
oc
0d592f4b4e PS v2.0 2018-03-11 01:33:02 +08:00
oc
61a804a19d PS v2.0 2018-03-11 01:32:03 +08:00
Zhang Chen
73f2ea3a84
Merge pull request #73 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-10 23:45:28 +08:00
oc
8fe982ed15 Compress 2018-03-10 23:43:52 +08:00
ckcz123
cd149a0360 Save canvas 2018-03-10 21:02:47 +08:00
YouWei Zhao
ae0a8be8f1 editor细节调整 2018-03-10 21:00:18 +08:00
YouWei Zhao
628d7eeafa 删除过时的文件
已经无法工作的editor_file_test.html
旧版的blockly
已经无效的2.0diff
2018-03-10 20:07:16 +08:00
YouWei Zhao
0ef90087d1 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-10 19:37:47 +08:00
YouWei Zhao
46d4d77bde fix bug 以及调整追加素材的字体 2018-03-10 19:36:53 +08:00
ckcz123
ce0e80c4fa drawText & replay 2018-03-10 18:48:31 +08:00
ckcz123
184740e3cf Add Point 2018-03-10 18:36:25 +08:00
ckcz123
e5098cd7d1 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-10 17:53:32 +08:00
Zhang Chen
b7f8b39d14
Merge pull request #72 from zhaouv/v2.0-editor-20180304
对function更好的支持
2018-03-10 17:32:11 +08:00
YouWei Zhao
3b9e03efee editor的tips的样式 2018-03-10 17:11:38 +08:00
YouWei Zhao
68fa560b0c 对function更好的支持 2018-03-10 16:41:50 +08:00
ckcz123
5f452a5363 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-10 15:11:32 +08:00
ckcz123
cbaf94e646 启动服务 2018-03-10 15:11:27 +08:00
Zhang Chen
e48a8f3106
Merge pull request #71 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-10 14:13:10 +08:00
YouWei Zhao
15cdfa0f23 function调整 2018-03-10 14:10:42 +08:00
YouWei Zhao
9ee85323df editor实现$range以及细节调整 2018-03-10 13:27:13 +08:00
YouWei Zhao
20fc1f6b53 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-10 12:12:08 +08:00
oc
fbc9926f36 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-10 01:09:29 +08:00
oc
c9ba70fa9c Replay use full name 2018-03-10 01:09:07 +08:00
Zhang Chen
15c3e17b86
Merge pull request #70 from zhaouv/v2.0-editor-20180304
editor细节优化
2018-03-10 00:34:19 +08:00
YouWei Zhao
38842a7200 editor细节优化 2018-03-09 22:50:59 +08:00
Zhang Chen
882446c442
Merge pull request #69 from zhaouv/v2.0-editor-20180304
表格css以及编辑细节调整
2018-03-09 21:12:22 +08:00
oc
93ee7f0415 Remove Storage 2018-03-09 21:11:58 +08:00
YouWei Zhao
8e3c1b5c67 表格css以及编辑细节调整 2018-03-09 20:46:34 +08:00
oc
79f0854371 bgm 2018-03-08 23:21:33 +08:00
oc
f557aaf553 x 2018-03-08 23:17:31 +08:00
oc
3c5e41842e BGM 2018-03-08 23:04:13 +08:00
Zhang Chen
6e1d4b61e8
Merge pull request #68 from zhaouv/v2.0-editor-20180304
editor前端上切换模式
2018-03-08 19:30:45 +08:00
YouWei Zhao
e578fba8f0 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into v2.0-editor-20180304 2018-03-08 19:27:05 +08:00
ckcz123
5103a84187 update server 2018-03-08 19:25:28 +08:00
YouWei Zhao
a695dcd6cf editor前端上切换模式 2018-03-08 19:00:20 +08:00
Zhang Chen
c57f3072bb
Merge pull request #67 from zhaouv/v2.0-editor-20180304
blockly改为弹窗
2018-03-07 22:47:28 +08:00
YouWei Zhao
05982bfaf4 issue #57
#57
2018-03-07 22:44:57 +08:00
YouWei Zhao
39db1cd235 blockly改为弹窗 2018-03-07 17:35:15 +08:00