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
|
f67b88d38e
|
add tab for appendPic
|
2018-02-19 12:07:49 +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
|
9fe928530c
|
fix bug: default floor in floor selecter of editor
|
2018-02-15 19:23:37 +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
|
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
|
fbb05c4649
|
MotaAction.g4 && ~~'动作列表'~~
添加了语法的描述文件MotaAction.g4
移除了blockly中'动作列表'的字样
|
2018-01-26 01:15:20 +08:00 |
|
YouWei Zhao
|
6ea6bea7a7
|
blockly
_server/blockly/motaActionBlockyDemo.html
实现了文档中 choices: 给用户提供选项 中的复杂事件
|
2018-01-24 22:14:09 +08:00 |
|
echo
|
524c8be9a8
|
fix bug
|
2018-01-20 14:13:32 +08:00 |
|
echo
|
f5b8ac521c
|
fix bug
|
2018-01-20 14:06:04 +08:00 |
|
echo
|
f47eefeea8
|
fix IE bug
|
2018-01-20 13:56:44 +08:00 |
|
echo
|
b7cd8c0dc1
|
fix bug: polyfill old version of IE
|
2018-01-20 13:30:36 +08:00 |
|
echo
|
6fbffd75bf
|
fix bug
|
2018-01-11 19:43:43 +08:00 |
|
echo
|
75404428ed
|
fix bug
|
2018-01-11 17:51:58 +08:00 |
|
YouWei Zhao
|
0c24e662c9
|
editor
|
2018-01-09 23:45:16 +08:00 |
|
echo
|
d1a937628c
|
gui:fix a bug
|
2018-01-09 21:20:36 +08:00 |
|
echo
|
4db9583e41
|
merge from master
|
2018-01-09 21:13:05 +08:00 |
|
YouWei Zhao
|
bb08b1fb61
|
Update editor_mode.js
|
2018-01-09 15:44:44 +08:00 |
|
YouWei Zhao
|
8977ac5137
|
editor 全GUI编辑
|
2018-01-09 15:22:11 +08:00 |
|
YouWei Zhao
|
eb8a045816
|
把editor的代码拆分到单独的文件中
|
2018-01-08 19:28:11 +08:00 |
|
YouWei Zhao
|
f493bc1577
|
添加了2.0的修改说明
|
2018-01-08 16:15:32 +08:00 |
|
YouWei Zhao
|
1854d96fce
|
editor_file.js的修改数据功能完成
通过了editor_file_test.html中的简单测试,有待更进一步的测试
|
2018-01-07 22:52:18 +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
|
4659f4ddcd
|
editor.changeFloor
|
2018-01-02 13:35:27 +08:00 |
|
YouWei Zhao
|
5671d5501e
|
取消了editor模式的部分动画 & fix bug
|
2018-01-02 12:37:40 +08:00 |
|
YouWei Zhao
|
a9835de64a
|
editor_file & comment.js
|
2018-01-01 19:31:32 +08:00 |
|
YouWei Zhao
|
f6f4745b5d
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2.0-1.3-merge
# Conflicts:
# drawMapGUI.html
# libs/core.js
# libs/data.js
# libs/enemys.js
# libs/maps.js
# main.js
|
2018-01-01 11:45:29 +08:00 |
|
YouWei Zhao
|
62b11fc3a0
|
Update editor_file.js
|
2018-01-01 02:07:55 +08:00 |
|
echo
|
878d27eb0a
|
add bgimg seletion
|
2017-12-31 15:27:58 +08:00 |
|
echo
|
8b8538ccfd
|
add ground select
|
2017-12-31 13:10:56 +08:00 |
|
YouWei Zhao
|
5f248444ec
|
merge 1.3 into 2.0
|
2017-12-31 10:30:01 +08:00 |
|
YouWei Zhao
|
5e00ff8a50
|
editor.file
|
2017-12-31 09:13:24 +08:00 |
|
echo
|
d37c28abdf
|
for v1.3
|
2017-12-31 01:07:25 +08:00 |
|
echo
|
c45c638599
|
for 2.0
|
2017-12-30 22:04:37 +08:00 |
|
YouWei Zhao
|
627bcee8c4
|
main.init('editor')
|
2017-12-30 21:18:58 +08:00 |
|
YouWei Zhao
|
f92124e162
|
editor.file demo
|
2017-12-30 12:02:19 +08:00 |
|
echo
|
1a67fec545
|
重构&更新autotile算法
|
2017-12-29 18:35:06 +08:00 |
|
YouWei Zhao
|
0a15e303c1
|
重构drawMapGui
|
2017-12-26 00:55:41 +08:00 |
|
echo
|
2e7aa2dec0
|
update drawmapgui
|
2017-12-22 00:29:04 +08:00 |
|
echo
|
bc789fc0df
|
update drawMapGui
|
2017-12-21 22:35:12 +08:00 |
|
oc
|
8d6a75929d
|
Fix HTTP Bug
|
2017-12-21 20:54:08 +08:00 |
|