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 |
|