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 |
|
YouWei Zhao
|
8f6dbbbe59
|
分离index.html中用户修改的部分
|
2018-02-28 14:45:13 +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 |
|
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 |
|
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 |
|
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 |
|
oc
|
62f09a6ec0
|
Add Multiple Ending
|
2018-02-20 23:26:11 +08:00 |
|
YouWei Zhao
|
7e61378d68
|
Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218
|
2018-02-20 22:56:36 +08:00 |
|
YouWei Zhao
|
c41f2a49e7
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214
|
2018-02-20 22:55:58 +08:00 |
|
oc
|
8396f28307
|
Fix setBlock Bug
|
2018-02-20 22:53:57 +08:00 |
|
YouWei Zhao
|
0f88227eef
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214
# Conflicts:
# libs/enemys.js
|
2018-02-20 22:39:54 +08:00 |
|
oc
|
ce577c56b1
|
Update
|
2018-02-20 22:05:10 +08:00 |
|
YouWei Zhao
|
2bff3f8e4e
|
Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218
|
2018-02-20 21:21:20 +08:00 |
|
YouWei Zhao
|
ad398c3560
|
0-12 -> Int
|
2018-02-20 21:19:19 +08:00 |
|
YouWei Zhao
|
11fb1b19c1
|
Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218
|
2018-02-20 20:52:35 +08:00 |
|
YouWei Zhao
|
89bd795cf0
|
blockly中支持show hide多事件以及type:input
|
2018-02-20 20:45:18 +08:00 |
|
YouWei Zhao
|
f1d603e9e6
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214
# Conflicts:
# project/floors/sample1.js
|
2018-02-20 18:13:48 +08:00 |
|
oc
|
1eb1e33fe1
|
Input, Show Multiple blocks, Load
|
2018-02-20 17:51:14 +08:00 |
|
oc
|
9d591d50a5
|
Input, Show Multiple blocks, Load
|
2018-02-20 17:47:44 +08:00 |
|
YouWei Zhao
|
f67b88d38e
|
add tab for appendPic
|
2018-02-19 12:07:49 +08:00 |
|
YouWei Zhao
|
84974ee9d5
|
Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-appendPic-20180218' into dev-2.0-blockly-20180214
|
2018-02-19 10:27:19 +08:00 |
|
YouWei Zhao
|
d003dbf84b
|
editor:修改成功或失败会有相应的提示
不再时只是throw错误
|
2018-02-19 10:26:23 +08:00 |
|
YouWei Zhao
|
cdff0e8abd
|
修复了添加物品怪物的新id时,没有添加items.js或enemys.js中数据的bug
|
2018-02-18 18:37:39 +08:00 |
|
YouWei Zhao
|
93160d2156
|
引入CodeMirror作为多行文本编辑器
|
2018-02-17 17:16:05 +08:00 |
|
YouWei Zhao
|
21998ec1a4
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214
|
2018-02-17 14:11:23 +08:00 |
|
oc
|
169233955a
|
Support constant damage
|
2018-02-16 15:27:47 +08:00 |
|
YouWei Zhao
|
9fe928530c
|
fix bug: default floor in floor selecter of editor
|
2018-02-15 19:23:37 +08:00 |
|
oc
|
e56b92d78e
|
Support \\n
|
2018-02-15 19:01:43 +08:00 |
|
YouWei Zhao
|
f5260266c4
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214
|
2018-02-15 18:36:36 +08:00 |
|
oc
|
b5d8cf5e3f
|
Fix PushBox Bug
|
2018-02-15 18:30:12 +08:00 |
|
YouWei Zhao
|
7c33ce6b1f
|
fix bug
可以正确的处理null了
|
2018-02-15 10:00:02 +08:00 |
|
YouWei Zhao
|
2b069b7614
|
集成blockly的事件编辑器
目前只能在正确的事件上工作,尚未处理null
|
2018-02-15 00:18:00 +08:00 |
|
YouWei Zhao
|
5939d27508
|
add tab for blockly
|
2018-02-14 14:51:10 +08:00 |
|
YouWei Zhao
|
d0115230d7
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001
# Conflicts:
# libs/icons.js
# libs/maps.js
|
2018-02-14 13:57:09 +08:00 |
|
oc
|
998ed9ddc2
|
Update Ski & Push Bpx
|
2018-02-14 13:34:44 +08:00 |
|