YouWei Zhao
|
39db1cd235
|
blockly改为弹窗
|
2018-03-07 17:35:15 +08:00 |
|
YouWei Zhao
|
3a62dee1ba
|
Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304
|
2018-03-06 13:28:24 +08:00 |
|
oc
|
dc2993e40d
|
Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0
|
2018-03-05 19:37:40 +08:00 |
|
oc
|
66117ebf08
|
Support Callback in Editor
|
2018-03-05 19:37:21 +08:00 |
|
Zhang Chen
|
ac29908604
|
Merge pull request #65 from zhaouv/v2.0-editor-20180304
Update blockly
|
2018-03-05 10:56:42 +08:00 |
|
YouWei Zhao
|
ddd43a1dbc
|
Update blockly
|
2018-03-05 09:50:08 +08:00 |
|
oc
|
3ca7c95231
|
load mod
|
2018-03-04 12:59:33 +08:00 |
|
Zhang Chen
|
fcc71dcf7f
|
Merge pull request #64 from zhaouv/v2.0-editor-20180304
调整 editor.file & editor.mode
|
2018-03-04 12:54:07 +08:00 |
|
YouWei Zhao
|
df89fd0b7c
|
调整 editor.file & editor.mode
|
2018-03-04 11:11:52 +08:00 |
|
oc
|
2f5caae07c
|
Support Reborn
|
2018-03-03 23:48:46 +08:00 |
|
oc
|
dcce32f931
|
Support Reborn
|
2018-03-03 23:46:21 +08:00 |
|
oc
|
f97495a6b6
|
Support Reborn
|
2018-03-03 23:34:10 +08:00 |
|
oc
|
e5ab7bd0ce
|
Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0
|
2018-03-03 22:48:41 +08:00 |
|
oc
|
43681581e0
|
1
|
2018-03-03 22:47:48 +08:00 |
|
Zhang Chen
|
646572f5d8
|
Merge pull request #63 from zhaouv/dev-2.0-functions-20180227
Dev 2 0 functions 20180227
|
2018-03-03 22:11:36 +08:00 |
|
YouWei Zhao
|
2653b602ee
|
merge
|
2018-03-03 21:59:00 +08:00 |
|
YouWei Zhao
|
2dd694bcfa
|
add weather in comment.js
|
2018-03-03 21:56:12 +08:00 |
|
YouWei Zhao
|
e79da81d50
|
Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into dev-2.0-functions-20180227
|
2018-03-03 21:37:53 +08:00 |
|
ckcz123
|
0974656ad1
|
Restructure
|
2018-03-03 21:07:26 +08:00 |
|
Zhang Chen
|
00d697af31
|
Fix Bug
|
2018-03-03 21:05:29 +08:00 |
|
Zhang Chen
|
890001a9dc
|
Merge pull request #62 from zhaouv/dev-2.0-functions-20180227
Dev 2 0 functions 20180227
|
2018-03-03 15:01:16 +08:00 |
|
YouWei Zhao
|
68c516d41d
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227
# Conflicts:
# libs/events.js
|
2018-03-03 15:00:11 +08:00 |
|
ckcz123
|
4e69b4ee10
|
Win End
|
2018-03-02 21:02:04 +08:00 |
|
oc
|
b1d9144e52
|
Add Mid License
|
2018-03-02 13:01:47 +08:00 |
|
YouWei Zhao
|
8c484d84d9
|
fix bug
|
2018-03-01 16:00:38 +08:00 |
|
ckcz123
|
90b36b3d27
|
Fix Small Bug
|
2018-02-28 21:04:27 +08:00 |
|
Zhang Chen
|
7148bc11e5
|
Merge pull request #59 from zhaouv/dev-2.0-functions-20180227
Dev 2 0 functions 20180227
|
2018-02-28 20:26:56 +08:00 |
|
YouWei Zhao
|
2f50978612
|
Update blockly
|
2018-02-28 20:25:53 +08:00 |
|
YouWei Zhao
|
b48b361a15
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227
|
2018-02-28 20:15:09 +08:00 |
|
YouWei Zhao
|
e39e49613c
|
Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into dev-2.0-functions-20180227
|
2018-02-28 20:13:16 +08:00 |
|
ckcz123
|
4d6f50d46e
|
Long Press
|
2018-02-28 20:10:04 +08:00 |
|
ckcz123
|
6707e7eca0
|
Long Press
|
2018-02-28 20:02:40 +08:00 |
|
YouWei Zhao
|
5da6ad56d0
|
Update blockly
|
2018-02-28 17:59:03 +08:00 |
|
YouWei Zhao
|
e3c0792028
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227
|
2018-02-28 16:47:57 +08:00 |
|
YouWei Zhao
|
205443c64d
|
Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-appendPic-20180218' into dev-2.0-functions-20180227
|
2018-02-28 16:45:56 +08:00 |
|
ckcz123
|
ebf42b3227
|
No cache
|
2018-02-28 16:44:03 +08:00 |
|
ckcz123
|
7256878408
|
Scroll Text
|
2018-02-28 16:38:37 +08:00 |
|
ckcz123
|
95ccc2574b
|
Auto Text, Scroll Text
|
2018-02-28 16:22:27 +08:00 |
|
YouWei Zhao
|
f22ba51023
|
保持editor中的gameGroup部分与index同形
|
2018-02-28 15:16:19 +08:00 |
|
YouWei Zhao
|
b7a8820a75
|
分离index.html中用户修改的部分
|
2018-02-28 15:12:29 +08:00 |
|
Zhang Chen
|
321e44f963
|
Merge pull request #58 from zhaouv/dev-2.0-appendPic-20180218
可设置可不设置的增加null选项
|
2018-02-28 14:51:45 +08:00 |
|
YouWei Zhao
|
d754df5a83
|
修改event显伤的默认值
|
2018-02-28 14:48:14 +08:00 |
|
YouWei Zhao
|
8f6dbbbe59
|
分离index.html中用户修改的部分
|
2018-02-28 14:45:13 +08:00 |
|
YouWei Zhao
|
3be76240ff
|
可设置可不设置的增加null选项
|
2018-02-28 14:02:34 +08:00 |
|
YouWei Zhao
|
9ee573d3af
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218
|
2018-02-28 13:38:26 +08:00 |
|
YouWei Zhao
|
d5d131227a
|
Merge remote-tracking branch 'refs/remotes/origin/master' into dev-2.0-appendPic-20180218
|
2018-02-28 13:36:49 +08:00 |
|
oc
|
c02bd41fbb
|
Fix Hide Bug
|
2018-02-27 22:30:17 +08:00 |
|
Zhang Chen
|
85f7bb3073
|
Merge pull request #56 from zhaouv/dev-2.0-appendPic-20180218
merge Use Remote BGM
|
2018-02-27 19:41:50 +08:00 |
|
YouWei Zhao
|
6c4bb49459
|
把events.js和ui.js中需要修改的函数分离出来
|
2018-02-27 19:13:13 +08:00 |
|
YouWei Zhao
|
2334a7dd06
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218
# Conflicts:
# libs/core.js
# main.js
|
2018-02-27 18:05:31 +08:00 |
|