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
|
f30ccb5665
|
update ext
|
2018-02-07 15:23:01 +08:00 |
|
oc
|
cebdc25c30
|
Update doc
|
2018-02-06 17:01:46 +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
|
6b929ffcca
|
Support Weather
|
2018-02-05 21:22:19 +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
|
26e7513c7d
|
Conversation
|
2018-02-04 20:07:08 +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 |
|
YouWei Zhao
|
fbb05c4649
|
MotaAction.g4 && ~~'动作列表'~~
添加了语法的描述文件MotaAction.g4
移除了blockly中'动作列表'的字样
|
2018-01-26 01:15:20 +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 |
|
YouWei Zhao
|
6ea6bea7a7
|
blockly
_server/blockly/motaActionBlockyDemo.html
实现了文档中 choices: 给用户提供选项 中的复杂事件
|
2018-01-24 22:14:09 +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
|
e4a8c8a3c9
|
Fix v1.3.2 Bug
|
2018-01-22 22:20:45 +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
|
2c85df01d8
|
Update Docs
|
2018-01-22 10:27:32 +08:00 |
|
oc
|
f9d66b4e5c
|
Update V1.3.2
|
2018-01-21 00:04:48 +08:00 |
|
oc
|
18be854d71
|
Update Server
|
2018-01-21 00:03:09 +08:00 |
|
oc
|
ad3272f23e
|
Update V1.3.2
|
2018-01-20 23:49:26 +08:00 |
|
oc
|
8a3616c539
|
V1.3.2
|
2018-01-20 22:48:45 +08:00 |
|