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
|
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
|
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 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
9330a18664
|
Conversation
|
2018-02-04 20:06:31 +08:00 |
|
oc
|
f26293a7ad
|
Open book while viewing maps
|
2018-02-04 16:22:12 +08:00 |
|