ckcz123
|
0974656ad1
|
Restructure
|
2018-03-03 21:07:26 +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 |
|
oc
|
bfd22c8b83
|
Use Remote BGM
|
2018-02-27 14:12:21 +08:00 |
|
Zhang Chen
|
3ad7bf528e
|
Merge pull request #53 from zhaouv/dev-2.0-appendPic-20180218
Update editor-blockly-template
|
2018-02-25 15:55:57 +08:00 |
|
YouWei Zhao
|
463e715a3b
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218
|
2018-02-25 15:54:07 +08:00 |
|
ckcz123
|
0b548955c4
|
Fix Move Directly Bug
|
2018-02-25 14:24:32 +08:00 |
|
ckcz123
|
cdf8d6ccff
|
Fix SetInterval Bug
|
2018-02-25 13:55:10 +08:00 |
|
ckcz123
|
be2696c406
|
Fix SetInterval Bug
|
2018-02-25 12:31:13 +08:00 |
|
oc
|
a2d85bbc63
|
Fix Move Directly Bug
|
2018-02-25 01:28:09 +08:00 |
|
oc
|
ef901990a0
|
Fix Move Directly Bug
|
2018-02-23 23:52:04 +08:00 |
|
YouWei Zhao
|
2dc118b753
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218
|
2018-02-23 16:36:39 +08:00 |
|
YouWei Zhao
|
7b2c7c3509
|
Update editor-blockly-template
事件模板中添加
检测音乐如果没有开启则系统提示开启
|
2018-02-23 16:28:49 +08:00 |
|
oc
|
ca660b481a
|
Fix SetBlock Bug
|
2018-02-21 23:06:26 +08:00 |
|
Zhang Chen
|
3f2c5c0284
|
Merge pull request #51 from zhaouv/dev-2.0-appendPic-20180218
追加素材
|
2018-02-21 18:22:27 +08:00 |
|
YouWei Zhao
|
bb6a9e3266
|
Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218
|
2018-02-21 18:09:39 +08:00 |
|
YouWei Zhao
|
e436a5f995
|
追加素材完成
|
2018-02-21 18:09:19 +08:00 |
|
Zhang Chen
|
d5fb1367e0
|
Merge pull request #50 from zhaouv/dev-2.0-blockly-20180214
bold
|
2018-02-21 11:10:38 +08:00 |
|
YouWei Zhao
|
2fe7150b0e
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214
|
2018-02-21 11:08:51 +08:00 |
|
oc
|
903d2ac165
|
Fix Load Shop
|
2018-02-21 11:07:15 +08:00 |
|
YouWei Zhao
|
e6d9eceba9
|
blockly-setText-bold
|
2018-02-21 00:15:44 +08:00 |
|
oc
|
73188765f5
|
Bold in SetText
|
2018-02-20 23:51:17 +08:00 |
|