Commit Graph

189 Commits

Author SHA1 Message Date
oc
bda274a428 Life Wand 2018-05-08 01:10:48 +08:00
oc
01860884a1 Weak percentage 2018-05-08 00:54:54 +08:00
oc
0bbb748c7a V2.2 2018-05-07 00:38:49 +08:00
oc
4ecac00f6d Remove isEquipment 2018-05-06 20:43:25 +08:00
ckcz123
992511160e Draw Status Bar 2018-05-06 17:32:56 +08:00
oc
d313b7fa40 Update Equipment 2018-05-05 23:52:02 +08:00
oc
2cc6ce49be Update Equipment 2018-05-05 19:53:15 +08:00
oc
2b0150270c Move comment to _server 2018-04-26 00:13:18 +08:00
oc
88c153e5a3 critical list 2018-04-26 00:07:01 +08:00
oc
9323d1aa8e critical list 2018-04-26 00:04:41 +08:00
oc
06b128e524 Test 2018-04-25 23:36:18 +08:00
oc
672afd72b5 Fix Browser Bug 2018-04-25 23:35:45 +08:00
oc
083d6e6ee2 setHeroIcon 2018-04-25 15:27:12 +08:00
oc
01c4ea4d31 setHeroIcon 2018-04-25 15:26:44 +08:00
oc
e01d90cdfd upFloor & downFloor 2018-04-25 14:51:16 +08:00
ckcz123
725bae87eb resetMap 2018-04-24 13:06:41 +08:00
ckcz123
c833626ce2 Update Number 2018-04-22 10:49:41 +08:00
ckcz123
c6ab9fb9b8 Reset numbers 2018-04-22 10:47:29 +08:00
ckcz123
c80f2e1dab Update icons 2018-04-21 21:09:13 +08:00
oc
3ba0473078 Update commments 2018-04-21 00:56:57 +08:00
oc
fd22c0aba2 Fix Equipment Bug 2018-04-19 00:30:40 +08:00
oc
99b1f9b671 Rewind replay & compress icons 2018-04-19 00:10:14 +08:00
ckcz123
4c4d869d40 Animate image & Gif support 2018-04-18 18:11:41 +08:00
ckcz123
8e68f1fbdf Animate image & Gif support 2018-04-18 18:11:21 +08:00
oc
a31991c16a Replay & Sleep 2018-04-18 14:08:31 +08:00
oc
fb49b62cd1 Delete single savefile & Add dragon to template 2018-04-18 01:37:57 +08:00
Zhang Chen
8936185276 Remove 999999999 for damage 2018-04-17 17:04:26 +08:00
oc
595141e83f equipment 2018-04-12 23:49:25 +08:00
oc
cd9ec2b112 support negative value 2018-04-12 00:50:08 +08:00
oc
da85a0a868 Fix PushBox Bug 2018-04-04 13:38:16 +08:00
oc
72f1e2f3ae Fix PushBox Bug 2018-04-04 13:37:07 +08:00
oc
0b1c186303 Update 2018-03-22 22:09:04 +08:00
oc
75864dfd82 Not bomb 2018-03-20 23:30:08 +08:00
YouWei Zhao
c192a2b62c 重构comment 2018-03-17 17:40:13 +08:00
oc
39245cd615 Use Tab to indent 2018-03-16 01:12:09 +08:00
ckcz123
0b084b027f Comment 2018-03-15 19:54:56 +08:00
ckcz123
dc35bc7adf Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 2018-03-15 19:51:45 +08:00
ckcz123
42fa7ffa7f CSS 2018-03-15 19:51:39 +08:00
Zhang Chen
9fc0937c81
Merge pull request #86 from zhaouv/v2.0-editor-docs-20180313
V2 0 editor docs 20180313
2018-03-15 19:18:22 +08:00
ckcz123
ef643a97af Javascript Lint 2018-03-15 19:16:50 +08:00
YouWei Zhao
f933ca5435 编辑mapblocksinfo 2018-03-15 17:25:47 +08:00
YouWei Zhao
1f221a1600 editor中显示useItem和canUseItem 2018-03-15 16:25:16 +08:00
oc
b4fdc3b326 Init Item 2018-03-15 14:13:16 +08:00
oc
150d65275b Update Item Effect 2018-03-15 13:56:45 +08:00
oc
b222ed4252 Support plugin 2018-03-15 10:04:51 +08:00
oc
6d9a4dafbf Support plugin 2018-03-15 10:04:12 +08:00
oc
55bae305d9 Support plugin 2018-03-15 10:00:10 +08:00
oc
cb2c0930d7 update doc 2018-03-14 11:22:00 +08:00
oc
55e153928b V2.0 Docs 2018-03-14 00:22:34 +08:00
ckcz123
cda73fe058 Support fg & bg 2018-03-13 12:24:06 +08:00
oc
292c2a59e6 Image 2018-03-13 10:57:39 +08:00
oc
0aaed81b76 Fix Bug 2018-03-13 01:59:58 +08:00
oc
a248349739 support 48x32 2018-03-13 01:50:00 +08:00
oc
a04d03000c ChangeFloor trigger firstArrive 2018-03-12 12:14:17 +08:00
oc
8592e4be31 Enemy Special 2018-03-11 23:31:05 +08:00
oc
ea0848f5a8 Enable HP Max 2018-03-11 23:23:45 +08:00
Zhang Chen
73f2ea3a84
Merge pull request #73 from zhaouv/v2.0-editor-20180304
V2 0 editor 20180304
2018-03-10 23:45:28 +08:00
oc
8fe982ed15 Compress 2018-03-10 23:43:52 +08:00
ckcz123
cd149a0360 Save canvas 2018-03-10 21:02:47 +08:00
YouWei Zhao
0ef90087d1 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 2018-03-10 19:37:47 +08:00
YouWei Zhao
46d4d77bde fix bug 以及调整追加素材的字体 2018-03-10 19:36:53 +08:00
ckcz123
ce0e80c4fa drawText & replay 2018-03-10 18:48:31 +08:00
ckcz123
184740e3cf Add Point 2018-03-10 18:36:25 +08:00
YouWei Zhao
15cdfa0f23 function调整 2018-03-10 14:10:42 +08:00
YouWei Zhao
9ee85323df editor实现$range以及细节调整 2018-03-10 13:27:13 +08:00
YouWei Zhao
38842a7200 editor细节优化 2018-03-09 22:50:59 +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