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

271 Commits

Author SHA1 Message Date
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