Commit Graph

923 Commits

Author SHA1 Message Date
oc
951b26fad5 V2.3.2 2018-07-09 22:59:18 +08:00
Zhang Chen
6442712e0c
Merge pull request #174 from zhaouv/v2.x
V2 x
2018-07-09 22:49:33 +08:00
YouWei Zhao
08e0e70acd ondblclick 2018-07-09 22:48:45 +08:00
YouWei Zhao
338323c748 drag 2018-07-09 22:30:43 +08:00
YouWei Zhao
5b81962869 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.x 2018-07-09 18:40:16 +08:00
ckcz123
9b5a7689c8 Fix width 2018-07-09 18:23:08 +08:00
Zhang Chen
f74b8fd136
Merge pull request #173 from zhaouv/editor-mobile-ui
show data area when change editModeSelect
2018-07-09 17:26:12 +08:00
YouWei Zhao
2444464d60 show data area when change editModeSelect 2018-07-09 17:14:53 +08:00
Zhang Chen
4cb74061c1
Merge pull request #172 from zhaouv/editor-mobile-ui
Update mobile ui
2018-07-09 15:27:46 +08:00
YouWei Zhao
2798c0cf58 fix resize 2018-07-09 14:31:18 +08:00
YouWei Zhao
0d39289df9 start game button 2018-07-09 13:10:10 +08:00
YouWei Zhao
ba954e27d8 Update mobile ui 2018-07-09 00:40:27 +08:00
Zhang Chen
382cd6a4e3
Merge pull request #170 from zhaouv/editor-mobile-ui
fix resize bug
2018-07-08 12:27:44 +08:00
YouWei Zhao
7901113564 fix resize bug 2018-07-08 11:20:00 +08:00
oc
7f0b3df264 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-07-08 02:15:07 +08:00
oc
66edbd4983 Update tools 2018-07-08 02:14:46 +08:00
Zhang Chen
a03252d4a4
Merge pull request #168 from zhaouv/editor-mobile-ui
Update mobile ui
2018-07-07 17:06:40 +08:00
YouWei Zhao
189ef85b2a Update mobile ui 2018-07-07 17:05:20 +08:00
oc
bd2340168c setVolume fade 2018-07-07 02:11:41 +08:00
ckcz123
4c80ff3004 No flags in save 2018-07-06 21:15:10 +08:00
oc
b42da2f660 Animate SE 2018-07-06 00:31:26 +08:00
Zhang Chen
4c4bf20dee
Merge pull request #166 from zhaouv/editor-mobile-ui
fix getCategory
2018-07-05 20:53:38 +08:00
YouWei Zhao
0288f42c8d fix getCategory
修复了getCategory,因为命名不一致带来bug的可能, 方便添加新分类
2018-07-05 20:39:32 +08:00
Zhang Chen
5dacdeccd8
Merge pull request #165 from zhaouv/editor-mobile-ui
Editor mobile ui
2018-07-05 19:20:40 +08:00
YouWei Zhao
cd23d0abba finish 2018-07-05 18:13:04 +08:00
YouWei Zhao
11ed345321 mainview 2018-07-05 13:27:17 +08:00
YouWei Zhao
9a276883da init 2018-07-05 12:11:53 +08:00
YouWei Zhao
fcef76e751 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.x 2018-07-05 11:20:38 +08:00
oc
6317224c74 Default 2018-07-05 00:03:31 +08:00
oc
2a5d318675 Fix ChangeFloor Bug 2018-07-04 02:09:08 +08:00
ckcz123
5edac5d8a8 Remove .DS_Store from everywhere 2018-07-03 19:07:03 +08:00
ckcz123
9c732edc1a Follow Effect 2018-07-03 18:58:45 +08:00
ckcz123
74d3fd070e Follow Effect 2018-07-03 18:56:35 +08:00
oc
54c6e7162a Do Effect 2018-07-02 00:17:24 +08:00
Zhang Chen
63e06c5af3
Merge pull request #163 from zhaouv/v2.x
V2 x
2018-07-01 22:09:35 +08:00
YouWei Zhao
36440ba768 _string 2018-07-01 20:02:54 +08:00
YouWei Zhao
a54029fbf3 editor: copy event
改变复制事件的方向
2018-07-01 20:00:22 +08:00
YouWei Zhao
8e99a4ef83 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.x 2018-07-01 19:49:49 +08:00
oc
2f140dc7d7 魔攻&破甲 2018-07-01 00:41:27 +08:00
Zhang Chen
d84ceba5d1
Merge pull request #162 from ckcz123/master
Export
2018-06-30 17:18:05 +08:00
ckcz123
74bf56c88b Export 2018-06-30 17:16:22 +08:00
oc
9d3f581183 Autosize 2018-06-30 00:33:14 +08:00
oc
7ce005d770 Autosize 2018-06-30 00:31:58 +08:00
Zhang Chen
c5ea1c23d8
Merge pull request #161 from zhaouv/v2.x
hide point_m
2018-06-29 23:20:06 +08:00
YouWei Zhao
9ddefed070 hide point_m
隐藏入口方块中的加点
入口方块类型错误时同步的报错
2018-06-29 23:11:08 +08:00
Zhang Chen
9295967e6d
Merge pull request #160 from zhaouv/v2.x
V2 x
2018-06-29 23:00:31 +08:00
YouWei Zhao
a9d92e7996 fix bug in editor
1.比如道具效果 useItemEffect
等,在新注册后默认是null;如果要编辑需要先改成空的双引号"",然后再双击编辑;否则直接双击的话系统会认为是一个JSON,写脚本就会出错
2.事件编辑器保存时检测用的框是否是正确
2018-06-29 22:57:49 +08:00
YouWei Zhao
4084c93c17 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.x 2018-06-29 22:01:37 +08:00
oc
7ee1bcad13 Update pickaxe usage 2018-06-28 23:09:03 +08:00
Zhang Chen
0fd740d926
Merge pull request #159 from ckcz123/v2.0
V2.0
2018-06-28 19:38:16 +08:00