YouWei Zhao
|
e436a5f995
|
追加素材完成
|
2018-02-21 18:09:19 +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 |
|
YouWei Zhao
|
3ab73eb5bc
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001
|
2018-02-14 00:15:17 +08:00 |
|
oc
|
e44ff57f26
|
View maps
|
2018-02-13 21:03:01 +08:00 |
|
oc
|
5b751aea8a
|
View maps
|
2018-02-13 21:00:38 +08:00 |
|
oc
|
903725efde
|
Small bug
|
2018-02-13 16:31:48 +08:00 |
|
YouWei Zhao
|
e1e9ee2f58
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001
|
2018-02-12 17:00:07 +08:00 |
|
oc
|
6829e60d43
|
Update Autosave Bug
|
2018-02-12 16:41:39 +08:00 |
|
YouWei Zhao
|
c5dc50803b
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001
|
2018-02-12 15:30:42 +08:00 |
|
oc
|
27e6dc802d
|
Fix Shop Bug
|
2018-02-12 14:32:46 +08:00 |
|
oc
|
f9a147b0ba
|
Fix a Bug
|
2018-02-12 14:18:11 +08:00 |
|
oc
|
025f37911b
|
Update doc
|
2018-02-11 21:26:08 +08:00 |
|
YouWei Zhao
|
85c4d8a622
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into 2.0-for-merge
Conflicts:
_server/vm.js
drawMapGUI.html
index.html
libs/core.js
libs/data.js
libs/enemys.js
libs/icons.js
libs/items.js
libs/maps.js
main.js
project/floors/sample1.js
project/images/yewai.png
project/images/常用素材：如需使用请直接替换目录中的对应文件/items1：圆形宝石.png
styles.css
|
2018-02-10 16:35:38 +08:00 |
|
oc
|
c644f9f410
|
Update Map Generator4
|
2018-02-10 11:47:21 +08:00 |
|
oc
|
b65e5dcfbb
|
V1.4.1
|
2018-02-09 21:06:55 +08:00 |
|
oc
|
c0fcbea201
|
V1.4.1
|
2018-02-09 20:56:05 +08:00 |
|
oc
|
fa5aece101
|
Fix a small bug
|
2018-02-08 13:38:06 +08:00 |
|
oc
|
f30ccb5665
|
update ext
|
2018-02-07 15:23:01 +08:00 |
|
oc
|
cebdc25c30
|
Update doc
|
2018-02-06 17:01:46 +08:00 |
|
oc
|
3f1a039c86
|
V1.4
|
2018-02-06 16:56:27 +08:00 |
|
oc
|
9b48c01c9b
|
V1.4
|
2018-02-06 14:14:23 +08:00 |
|
oc
|
96c6c1a353
|
V1.4
|
2018-02-06 14:11:56 +08:00 |
|
oc
|
6bb839f7db
|
Update
|
2018-02-06 14:07:56 +08:00 |
|