jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity
949 Commits 1 Branch 2 Tags 50 MiB
ccdc613afd
Commit Graph

406 Commits

Author SHA1 Message Date
ckcz123
ce0e80c4fa drawText & replay 2018-03-10 18:48:31 +08:00
ckcz123
184740e3cf Add Point 2018-03-10 18:36:25 +08:00
oc
c9ba70fa9c Replay use full name 2018-03-10 01:09:07 +08:00
oc
93ee7f0415 Remove Storage 2018-03-09 21:11:58 +08:00
oc
79f0854371 bgm 2018-03-08 23:21:33 +08:00
oc
f557aaf553 x 2018-03-08 23:17:31 +08:00
oc
3c5e41842e BGM 2018-03-08 23:04:13 +08:00
oc
66117ebf08 Support Callback in Editor 2018-03-05 19:37:21 +08:00
oc
2f5caae07c Support Reborn 2018-03-03 23:48:46 +08:00
oc
dcce32f931 Support Reborn 2018-03-03 23:46: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
ckcz123
4e69b4ee10 Win End 2018-03-02 21:02:04 +08:00
oc
b1d9144e52 Add Mid License 2018-03-02 13:01:47 +08:00
ckcz123
90b36b3d27 Fix Small Bug 2018-02-28 21:04:27 +08:00
YouWei Zhao
b48b361a15 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 2018-02-28 20:15:09 +08:00
ckcz123
4d6f50d46e Long Press 2018-02-28 20:10:04 +08:00
ckcz123
6707e7eca0 Long Press 2018-02-28 20:02:40 +08:00
YouWei Zhao
e3c0792028 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 2018-02-28 16:47:57 +08:00
YouWei Zhao
205443c64d Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-appendPic-20180218' into dev-2.0-functions-20180227 2018-02-28 16:45:56 +08:00
ckcz123
7256878408 Scroll Text 2018-02-28 16:38:37 +08:00
ckcz123
95ccc2574b Auto Text, Scroll Text 2018-02-28 16:22:27 +08:00
YouWei Zhao
9ee573d3af Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218 2018-02-28 13:38:26 +08:00
oc
c02bd41fbb Fix Hide Bug 2018-02-27 22:30:17 +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
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
oc
73188765f5 Bold in SetText 2018-02-20 23:51:17 +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
oc
ce577c56b1 Update 2018-02-20 22:05:10 +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
9d591d50a5 Input, Show Multiple blocks, Load 2018-02-20 17:47:44 +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
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
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
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
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
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
oc
d02f9df848 Support Animate 2018-02-06 13:36:18 +08:00
oc
99463c6e5e Support Show Image 2018-02-05 22:16:55 +08:00
oc
aab1bfa40b Support Weather 2018-02-05 21:22:59 +08:00
oc
c1d2e34317 Support Weather 2018-02-05 21:21:50 +08:00
oc
05aaa15f85 Conversation 2018-02-04 20:33:20 +08:00
oc
9330a18664 Conversation 2018-02-04 20:06:31 +08:00
oc
d212370425 Open book while viewing maps 2018-02-04 16:25:50 +08:00
oc
f26293a7ad Open book while viewing maps 2018-02-04 16:22:12 +08:00
oc
a6045f321d setRequestAnimationFrame 2018-02-04 15:37:20 +08:00
oc
46fc674b86 setRequestAnimationFrame 2018-02-04 15:33:09 +08:00
oc
a24fc1db38 Fix Hero Bug 2018-02-04 12:26:18 +08:00
oc
02337f0e64 Fix Hero Bug 2018-02-04 12:08:51 +08:00
oc
53ca30a913 Modify trigger 2018-02-04 12:00:04 +08:00
oc
e0b7331a1a Cursor 2018-02-01 22:00:32 +08:00
oc
deb465ed5c Single save 2018-02-01 10:57:38 +08:00
oc
777e296179 Move Directly 2018-01-31 20:29:33 +08:00
oc
aa3d86aaff Move Directly 2018-01-31 20:21:41 +08:00
oc
528c281bd3 Update 2018-01-26 17:26:08 +08:00
oc
875fdc8be8 Fix Replay Time 2018-01-25 02:29:29 +08:00
oc
32c9d58b65 Replay Control 2018-01-25 01:56:00 +08:00
oc
6cba90599b Use mid compress 2018-01-24 20:25:37 +08:00
oc
948257de82 Use mid compress 2018-01-24 20:24:38 +08:00
oc
acd634a93b Use mid compress 2018-01-24 20:23:56 +08:00
oc
cfed05335c Fix Enemy UI 2018-01-24 20:07:56 +08:00
oc
6a0ed4f304 Fix Events.js Bug 2018-01-24 20:03:05 +08:00
oc
4f283b0ffe Fix Events.js Bug 2018-01-24 20:01:46 +08:00
oc
c0bfac2f36 Enemy Vampire 2018-01-24 14:33:57 +08:00
oc
1cc55f5a11 Prompt & Replay 2018-01-22 22:40:49 +08:00
oc
df16c42637 Fix v1.3.2 Bug 2018-01-22 22:19:23 +08:00
oc
6b34e1e126 Fix A small bug 2018-01-22 17:06:49 +08:00
oc
ad3272f23e Update V1.3.2 2018-01-20 23:49:26 +08:00
oc
1213a32cc5 Equipment 2018-01-20 22:46:24 +08:00
oc
d5a396fc89 Update Between Attack 2018-01-20 10:38:34 +08:00
oc
02a0f0aa43 Update Between Attack 2018-01-20 10:10:35 +08:00
ckcz123
07f71ed617 Zone Square 2018-01-19 12:44:20 +08:00
oc
024fed913b Fix Bug 2018-01-18 22:46:33 +08:00
oc
498b2a7a24 Update 2018-01-18 21:53:21 +08:00
oc
9c5ee0fce1 Fix Bug 2018-01-18 21:11:39 +08:00
oc
40e207be23 Fix Bug 2018-01-18 21:03:53 +08:00
oc
90054cb7d1 Fix Bugs 2018-01-18 03:20:53 +08:00
oc
73e5d96ab4 View Maps 2018-01-18 03:01:46 +08:00
oc
f2843eca9a Fix Damage Bug 2018-01-18 01:21:27 +08:00
oc
7c40ae3da9 Fix Damage Bug 2018-01-18 01:17:59 +08:00
oc
3906cfc16f Fix UI Bug 2018-01-18 00:57:55 +08:00
oc
8d9b3f9106 Replay Quick Shop 2018-01-17 22:28:32 +08:00
ckcz123
89af952bf6 Ver 1.3.2 2018-01-17 21:29:15 +08:00
ckcz123
ac28d8622e Get info 2018-01-17 21:25:53 +08:00
ckcz123
abd74832d9 Get info 2018-01-17 21:22:35 +08:00
ckcz123
62621e7449 Get info 2018-01-17 21:19:22 +08:00
ckcz123
91cc1046e6 Upload 2018-01-17 20:53:40 +08:00
ckcz123
f736e1cf7b Update Detect 2018-01-17 20:52:20 +08:00
ckcz123
240c8e9a7c Upload 2018-01-17 20:39:15 +08:00
ckcz123
54468aafa0 Upload 2018-01-17 20:35:29 +08:00
ckcz123
8fe7dd3848 Upload 2018-01-17 20:26:08 +08:00
ckcz123
ee880b7cda Update Detect 2018-01-17 19:15:29 +08:00
ckcz123
254c2e3f68 Update Chrome Detect 2018-01-17 17:10:07 +08:00
ckcz123
aa77e2aa57 Replay 2018-01-17 16:40:37 +08:00
oc
1a3735f52e ReadFile & Download 2018-01-17 15:02:02 +08:00
oc
d172cbcd86 Fix Snipe Bug 2018-01-17 09:39:38 +08:00
ckcz123
c3da5c5e1c Download 2018-01-16 21:16:50 +08:00
ckcz123
290f2ddb1a Replay 2018-01-16 19:55:14 +08:00
ckcz123
9ebb6652c5 Replay 2018-01-16 19:54:18 +08:00
ckcz123
bbf250047f Replay Directions 2018-01-16 12:54:34 +08:00
oc
c8a2edbfc7 Save & Load Route 2018-01-16 00:20:30 +08:00
oc
c88a31f4c3 Record & Encode route 2018-01-15 20:56:57 +08:00
oc
d34642ca70 Update Shops 2018-01-15 19:22:47 +08:00
ckcz123
5bc2418773 Update Doc 2018-01-12 17:55:41 +08:00
ckcz123
143a0afd1e Virtual Keyboard 2018-01-12 17:50:15 +08:00
ckcz123
6b80afe9ee Update AutoSave 2018-01-12 15:53:01 +08:00
YouWei Zhao
eb8a045816 把editor的代码拆分到单独的文件中 2018-01-08 19:28:11 +08:00
YouWei Zhao
c0481b5e12
Merge fix bug 
Master
 2018-01-08 16:22:53 +08:00
oc
0d4ba49cc3 Fix Some Bugs 2018-01-08 13:19:32 +08:00
YouWei Zhao
13aca79afb Update editor_file.js 2018-01-07 22:14:51 +08:00
YouWei Zhao
137554623e 改变目录结构 2018-01-05 19:55:53 +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
oc
d0774de9f0 Ver 1.3 2018-01-01 09:40:38 +08:00
oc
4ae315d53f Avoid Cache 2018-01-01 01:56:11 +08:00
ckcz123
4c80b0216d Fix Doc Bug 2017-12-31 22:52:59 +08:00
ckcz123
2f50679891 V1.3 2017-12-31 22:43:19 +08:00
ckcz123
bd1ad3916a Merge branch 'master' of https://github.com/ckcz123/mota-js 2017-12-31 22:31:55 +08:00
ckcz123
3195e1d505 Update 2017-12-31 22:31:50 +08:00
echo
ab1f9bb4d5 merge ckcz123 2017-12-31 22:23:44 +08:00
echo
92a2c8cef1 update autotile 2017-12-31 22:00:26 +08:00
oc
e1fdfa3da5 战前剧情 2017-12-31 16:54:58 +08:00
oc
81727e1e71 战前剧情 2017-12-31 16:25:49 +08:00
YouWei Zhao
5438001ea0 editor: import main.js 
画图部分完美结合
 2017-12-31 15:29:44 +08:00
ckcz123
334e215009 可以使用自己的图片素材作为背景 2017-12-31 14:58:35 +08:00
YouWei Zhao
ba7bbbc7be editor: import main.js 
目前状态是都能工作,需要重写editor的方法
 2017-12-31 12:15:19 +08:00
YouWei Zhao
fd8a03a90d merge 1.3 into 2.0 
merge data
 2017-12-31 10:49:57 +08:00
YouWei Zhao
5f248444ec merge 1.3 into 2.0 2017-12-31 10:30:01 +08:00
oc
4bfb23b845 Merge branch 'master' of https://github.com/ckcz123/mota-js 2017-12-31 01:35:30 +08:00
oc
a58067cd6a Update V1.3 2017-12-31 01:35:21 +08:00
echo
9ce6ba8d3f merge ckcz123 2017-12-31 01:16:58 +08:00
echo
04eaf07ed1 merge ckcz123 2017-12-31 01:12:44 +08:00
YouWei Zhao
627bcee8c4 main.init('editor') 2017-12-30 21:18:58 +08:00
ckcz123
2d9278f8f6 Monster Detail 2017-12-30 18:05:21 +08:00
ckcz123
f2bfa7cd84 Update Enemy Detail 2017-12-30 17:25:39 +08:00
oc
9ecccf35de N连击 2017-12-30 15:58:42 +08:00
oc
c0d67d431c N连击 2017-12-30 15:38:54 +08:00
oc
0c61b6d28d Add Point' 2017-12-30 14:28:21 +08:00
echo
1a67fec545 重构&更新autotile算法 2017-12-29 18:35:06 +08:00
ckcz123
f3ab1dc83f Update damage 2017-12-29 18:00:12 +08:00
oc
53ba0d4f51 Update BGM 2017-12-29 16:47:09 +08:00
oc
7e832d0496 Music 2017-12-29 12:39:49 +08:00
oc
02b67f3c40 Music 2017-12-29 12:32:18 +08:00
oc
95686a637c Music 2017-12-29 12:28:59 +08:00
oc
5f7a03ec70 FloorMsgGroup 2017-12-28 22:02:08 +08:00
oc
c99997dca4 支持阻击 2017-12-28 19:16:31 +08:00
YouWei Zhao
d8ea628f11 重命名目录 2017-12-28 17:15:45 +08:00
YouWei Zhao
8873991004 数据json化 2017-12-28 16:19:38 +08:00
oc
8dcb6cb61a Update Snipe 2017-12-28 13:27:54 +08:00
oc
dab6656720 领域、夹击机制更新 2017-12-28 12:08:01 +08:00
oc
b549a5fd19 Enable Level Up 2017-12-28 09:23:46 +08:00
oc
fc01f43336 Enable Level Up 2017-12-28 09:20:16 +08:00
oc
68f0a28a61 Enable Level Up 2017-12-28 09:17:35 +08:00
oc
cf02a59dee Update Status Bar 2017-12-28 01:51:13 +08:00
oc
38672bd677 Update Curtain 2017-12-27 23:45:44 +08:00
ckcz123
9031a8351f Update FG 2017-12-27 17:38:00 +08:00
ckcz123
c21d62fb37 Disable Battle Animate 2017-12-27 17:25:14 +08:00
ckcz123
ea7e26c8a5 Merge branch 'master' of https://github.com/ckcz123/mota-js 2017-12-27 16:41:53 +08:00
ckcz123
e6eca11ead Multiple Autotiles 2017-12-27 16:10:47 +08:00
oc
84f44ae08a Update Map Generator 2017-12-27 13:55:28 +08:00
ckcz123
375c92628c Fix Duplicate ID 2017-12-26 22:08:25 +08:00
ckcz123
94aeacf424 多地面素材 2017-12-26 21:39:57 +08:00
ckcz123
795239934f 全键盘操作 2017-12-26 17:32:37 +08:00
ckcz123
92c4a2e84d 全键盘操作 2017-12-26 16:58:59 +08:00
ckcz123
dcc8eeb0e7 全键盘操作 2017-12-26 16:53:39 +08:00