Commit Graph

2636 Commits

Author SHA1 Message Date
AutumnOrange51
28d72176d5
Merge pull request #3 from ckcz123/v2.x
V2.x
2020-05-23 22:43:36 +08:00
ckcz123
f6e313126a 全局商店X键退出 2020-05-23 22:20:13 +08:00
ckcz123
64433423e6 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-23 21:40:34 +08:00
ckcz123
ac78f738ff Fix bug 2020-05-23 21:40:13 +08:00
Zhang Chen
935805847d
Merge pull request #466 from tocque/dev2.x
update JSCompressor & server
2020-05-23 20:32:55 +08:00
tocque
5e547229e4 fix bug in server 2020-05-23 20:29:03 +08:00
ckcz123
4a6c5042ac Fix 2.7 接档工具 2020-05-23 20:26:42 +08:00
tocque
e4c0ea880a
Merge pull request #13 from ckcz123/v2.x
update
2020-05-23 19:40:34 +08:00
ckcz123
2adf9ed529 接档工具 2020-05-23 19:33:12 +08:00
ckcz123
b9957b51a4 更新录像系统 2020-05-23 15:43:04 +08:00
tocque
49e0d7453b Merge branch 'dev2.x' of github.com:tocque/mota-js into dev2.x 2020-05-23 12:36:05 +08:00
tocque
612a452c63 update JSCompressor 2020-05-23 12:34:33 +08:00
ckcz123
28535a74d3 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-23 11:57:53 +08:00
ckcz123
7d6f5f35fb 合并items 2020-05-23 11:57:39 +08:00
Zhang Chen
d5a2c7766a
Merge pull request #465 from tocque/dev2.x
update ps & server
2020-05-23 11:30:44 +08:00
tocque
c61ca71f58
Merge pull request #12 from ckcz123/v2.x
V2.x
2020-05-23 11:18:33 +08:00
tocque
a52c30df49 update ps & server 2020-05-23 11:09:31 +08:00
ckcz123
34e4a5130e delete mid.js 2020-05-23 10:45:10 +08:00
ckcz123
11f32eb701 初始化和读档优化:不重建全部blocks 2020-05-23 10:14:00 +08:00
ckcz123
7707e9f689 合并全塔属性的样式 2020-05-23 08:04:41 +08:00
Zhang Chen
566462d6ea
Merge pull request #464 from zhaouv/blockly-entrance
merge
2020-05-22 21:25:58 +08:00
YouWei Zhao
7f79e9be59
Merge branch 'v2.x' into blockly-entrance 2020-05-22 21:24:50 +08:00
ckcz123
10c972dc0b ID:this代表当前点 2020-05-22 21:17:42 +08:00
YouWei Zhao
e5440ddc18 取消中文替换的前缀判定 2020-05-22 21:08:56 +08:00
YouWei Zhao
f923a7c997 简化补全分类判断代码 2020-05-22 20:40:15 +08:00
YouWei Zhao
e157d0735c 调整自动补全的配置 2020-05-22 20:28:35 +08:00
YouWei Zhao
5130969bdb Merge branch 'ckcz123/v2.x' into blockly-entrance 2020-05-22 19:57:08 +08:00
YouWei Zhao
daa014b7b3 update converter.bundle&调整双击blockly的判定 2020-05-22 19:49:05 +08:00
ckcz123
363d451f50 道具与怪物名的替换 2020-05-22 19:45:43 +08:00
ckcz123
2ac5a58e7b Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-22 18:44:48 +08:00
ckcz123
c41887bb19 MotaActionParse -> MotaActionParser 2020-05-22 18:44:27 +08:00
Zhang Chen
d3a03dc29e
Merge pull request #463 from zhaouv/blockly-entrance
更换options的引用
2020-05-22 18:42:35 +08:00
ckcz123
ba4e76d1ee Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-22 18:39:04 +08:00
ckcz123
a22c80e5bd 右键拉框复制剪切粘贴 2020-05-22 18:38:10 +08:00
YouWei Zhao
cd27054679 更换options的引用 2020-05-22 16:38:13 +08:00
Zhang Chen
29d9822916
Merge pull request #462 from zhaouv/blockly-entrance
add ===&move initscript
2020-05-22 12:42:57 +08:00
YouWei Zhao
a8d98bcb25 add ===&move initscript 2020-05-22 11:07:32 +08:00
ckcz123
c6d2bbeea5 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-22 10:43:17 +08:00
ckcz123
6ab04d71c8 勇士帧动画;ratio;优化注释 2020-05-22 10:43:03 +08:00
Zhang Chen
63369a4312
Merge pull request #461 from zhaouv/blockly-entrance
Blockly entrance
2020-05-22 10:32:29 +08:00
Zhang Chen
5119f44a4e
Merge pull request #460 from zhaouv/map-edit
选中区域
2020-05-22 10:31:28 +08:00
YouWei Zhao
df7da15f9f 入口方块筛选&移除 dom entrytype 2020-05-22 10:10:43 +08:00
YouWei Zhao
53f98f7b3a update converter.bundle 2020-05-22 09:47:32 +08:00
ckcz123
012c8d7d80 更新keyboard 2020-05-21 22:04:21 +08:00
ckcz123
237b6a4926 门信息&朝向的图块 2020-05-21 12:32:33 +08:00
ckcz123
57fff1b3e2 Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2020-05-21 10:58:27 +08:00
ckcz123
e6b4c78114 楼层贴图图块化 2020-05-21 10:58:20 +08:00
ckcz123
803b7c3cc4 楼层色调颜色选择器 2020-05-20 23:52:02 +08:00
ckcz123
9f42963db8 右键复制粘贴事件 2020-05-20 22:35:08 +08:00
ckcz123
b2b60b133e :x, :y, :o 翻转图片绘制 2020-05-20 17:48:17 +08:00