oc
|
f557aaf553
|
x
|
2018-03-08 23:17:31 +08:00 |
|
oc
|
3c5e41842e
|
BGM
|
2018-03-08 23:04:13 +08:00 |
|
YouWei Zhao
|
05982bfaf4
|
issue #57
#57
|
2018-03-07 22:44:57 +08:00 |
|
oc
|
66117ebf08
|
Support Callback in Editor
|
2018-03-05 19:37:21 +08:00 |
|
oc
|
f97495a6b6
|
Support Reborn
|
2018-03-03 23:34:10 +08:00 |
|
YouWei Zhao
|
2dd694bcfa
|
add weather in comment.js
|
2018-03-03 21:56:12 +08:00 |
|
ckcz123
|
0974656ad1
|
Restructure
|
2018-03-03 21:07:26 +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 |
|
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 |
|
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 |
|
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 |
|
YouWei Zhao
|
cdff0e8abd
|
修复了添加物品怪物的新id时,没有添加items.js或enemys.js中数据的bug
|
2018-02-18 18:37:39 +08:00 |
|
YouWei Zhao
|
2b069b7614
|
集成blockly的事件编辑器
目前只能在正确的事件上工作,尚未处理null
|
2018-02-15 00:18:00 +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 |
|
YouWei Zhao
|
c5dc50803b
|
Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001
|
2018-02-12 15:30:42 +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 |
|
YouWei Zhao
|
8977ac5137
|
editor 全GUI编辑
|
2018-01-09 15:22:11 +08:00 |
|
YouWei Zhao
|
13aca79afb
|
Update editor_file.js
|
2018-01-07 22:14:51 +08:00 |
|
YouWei Zhao
|
9197a4d727
|
分离了楼层文件之外的数据的注释
|
2018-01-06 22:25:19 +08:00 |
|
YouWei Zhao
|
62fbd21836
|
Update editor_file.js
|
2018-01-05 20:43:11 +08:00 |
|
YouWei Zhao
|
137554623e
|
改变目录结构
|
2018-01-05 19:55:53 +08:00 |
|