oc
|
b138d0a157
|
editor.used_flags
|
2019-06-29 22:58:06 +08:00 |
|
oc
|
90fc42fc31
|
editor_blockly getAutoCompletions
|
2019-06-29 21:08:48 +08:00 |
|
oc
|
6f75c878a0
|
Fix uievent bugs & fillCircle
|
2019-06-19 23:20:19 +08:00 |
|
oc
|
b63c06d982
|
changeFloor_m selectPoint & ps
|
2019-06-03 12:45:23 +08:00 |
|
ckcz123
|
ef31d39bed
|
setBlock selectPoint
|
2019-05-31 20:45:53 +08:00 |
|
ckcz123
|
4391e8cd7d
|
selectPoint fix bug
|
2019-05-31 20:12:50 +08:00 |
|
ckcz123
|
cbad40d773
|
blockly selectPoint
|
2019-05-31 19:30:44 +08:00 |
|
oc
|
dc205877de
|
previewUI
|
2019-05-28 00:04:45 +08:00 |
|
oc
|
0c6176f5f6
|
uievents
|
2019-05-26 23:10:28 +08:00 |
|
oc
|
2586ec9b76
|
uievents
|
2019-05-26 23:02:46 +08:00 |
|
oc
|
01edcfbc98
|
uievents part 1
|
2019-05-26 16:33:42 +08:00 |
|
oc
|
9e9025e089
|
openDoor async & battle loc & trigger keep
|
2019-04-28 20:29:51 +08:00 |
|
YouWei Zhao
|
b41feefa07
|
add /* html */ to get tpl highlighted by plugin
https://marketplace.visualstudio.com/items?itemName=bierner.comment-tagged-templates
|
2019-04-21 18:33:20 -04:00 |
|
oc
|
0d49777e1a
|
Fix blockly searchInput
|
2019-04-17 16:02:17 +08:00 |
|
oc
|
cbd2f650a5
|
type:autosave
|
2019-04-17 13:30:36 +08:00 |
|
oc
|
94374d7e81
|
map category & type:restart
|
2019-04-15 20:52:42 +08:00 |
|
oc
|
2e34fd267f
|
drawChoices offset
|
2019-04-12 23:59:39 +08:00 |
|
oc
|
f93c6d03f0
|
Fix bug: follow, callBook & dowhile
|
2019-04-09 23:13:43 +08:00 |
|
oc
|
a60b6ff3db
|
if_1_s
|
2019-04-05 22:16:39 +08:00 |
|
oc
|
88a60d6995
|
type:confirm
|
2019-04-04 23:15:24 +08:00 |
|
Zhang Chen
|
5d58f1bf67
|
Merge pull request #339 from zhaouv/refactoring-editor
confirm_s
|
2019-04-04 22:12:40 +08:00 |
|
YouWei Zhao
|
9b5acbcdc4
|
nobreak
|
2019-04-03 18:21:48 -04:00 |
|
YouWei Zhao
|
bfa3f3e075
|
confirm_s
|
2019-04-03 13:54:19 -04:00 |
|
oc
|
9ecbd2aa42
|
api for actions & control
|
2019-04-02 02:38:37 +08:00 |
|
oc
|
b3fb8cf98a
|
remove double click unknow_s
|
2019-03-31 00:35:35 +08:00 |
|
oc
|
8aca0760c0
|
commonEventShop
|
2019-03-31 00:22:26 +08:00 |
|
YouWei Zhao
|
6e5e8f46ab
|
shop_event & unknow_event
|
2019-03-30 11:13:11 -04:00 |
|
oc
|
16980c527a
|
quickCommonEvents
|
2019-03-30 19:18:57 +08:00 |
|
oc
|
9813dc3115
|
lineHeight, showImage, splitImage
|
2019-03-25 00:29:18 +08:00 |
|
YouWei Zhao
|
74b168a285
|
onmousewheel
滚轮的行为从滚动百分比改为滚动固定的3行
修改.g4文件的位置
|
2019-03-23 14:58:16 -04:00 |
|
Zhang Chen
|
3a1d068308
|
Merge pull request #327 from zhaouv/remove-vue
Remove vue
|
2019-03-21 23:30:31 +08:00 |
|
oc
|
20781645d4
|
type:closeDoor
|
2019-03-21 22:31:13 +08:00 |
|
YouWei Zhao
|
b61a9afea8
|
selectBox
|
2019-03-19 22:25:14 -04:00 |
|
ckcz123
|
911c2c5159
|
updateDamage, addValue
|
2019-03-18 19:21:23 +08:00 |
|
oc
|
42e04f58be
|
setValue2
|
2019-02-27 21:19:43 +08:00 |
|
oc
|
337827c17a
|
icon in choices
|
2019-02-27 21:04:25 +08:00 |
|
oc
|
4372981cb3
|
draw icons in toolbox
|
2019-02-27 04:53:26 +08:00 |
|
oc
|
49daef63fb
|
resume bgm
|
2019-02-21 20:41:50 +08:00 |
|
oc
|
2b92921e43
|
color in choices
|
2019-02-20 23:36:26 +08:00 |
|
oc
|
943b70faa1
|
floorImg animate
|
2019-02-04 17:14:57 +08:00 |
|
oc
|
7586b3fe45
|
stopSound
|
2019-02-03 18:21:28 +08:00 |
|
oc
|
3f44807a06
|
commonEvents
|
2019-02-02 14:08:55 +08:00 |
|
YouWei Zhao
|
08315af63d
|
common event blockly
delete legacy point_m
add commentEvent_m
|
2019-01-31 17:11:05 -05:00 |
|
oc
|
fb8145a9f4
|
pauseBgm
|
2019-01-21 22:25:43 +08:00 |
|
oc
|
a199477b8a
|
useItem event
|
2019-01-16 22:14:58 +08:00 |
|
ckcz123
|
5e563ab410
|
bgmStatus
|
2019-01-03 13:09:18 +08:00 |
|
oc
|
c8ca08cb78
|
callBook & callSave/Load
|
2018-12-30 00:38:24 +08:00 |
|
Zhang Chen
|
ea8ec4fcfa
|
Merge branch 'colorpicker' into v2.0
|
2018-12-27 20:33:42 +08:00 |
|
oc
|
6db27f27ce
|
setGlobalFlag
|
2018-12-26 14:03:46 +08:00 |
|
Zhang Chen
|
75435ea3a8
|
Merge pull request #296 from ckcz123/v2.0
V2.0
|
2018-12-25 19:36:50 +08:00 |
|
ckcz123
|
8e2cb367df
|
Independent Switch
|
2018-12-25 18:39:18 +08:00 |
|
YouWei Zhao
|
a536c9958b
|
blockly-comment
|
2018-12-23 18:21:44 -05:00 |
|
tocque
|
c7f30538d8
|
screenFlash
|
2018-12-19 16:36:42 +09:00 |
|
oc
|
82490f352b
|
Cache bgms
|
2018-12-17 00:31:43 +08:00 |
|
ckcz123
|
65f9fcb612
|
Dynamic canvas
|
2018-12-14 20:52:55 +08:00 |
|
tocque
|
19e652c51d
|
Merge branch 'dev' into dev
|
2018-12-14 01:54:07 +09:00 |
|
oc
|
8d31055c52
|
Search Blockly
|
2018-12-13 22:43:28 +08:00 |
|
ckcz123
|
71f03ffbfe
|
Search
|
2018-12-13 20:41:20 +08:00 |
|
tocque
|
07bcfafe27
|
dynamic canvas
|
2018-12-13 20:02:03 +09:00 |
|
ckcz123
|
ecdea07856
|
Frequently & Last Used Blocks
|
2018-12-13 15:26:01 +08:00 |
|
ckcz123
|
5669197fbc
|
Last Used Items
|
2018-12-13 15:10:55 +08:00 |
|
YouWei Zhao
|
560c6136f7
|
fix
|
2018-12-12 18:33:57 -05:00 |
|
YouWei Zhao
|
556dd15dc2
|
delete console.log(...)
|
2018-12-12 18:31:59 -05:00 |
|
YouWei Zhao
|
682873673b
|
lastusedblocks
|
2018-12-12 18:27:34 -05:00 |
|
ckcz123
|
09f130e049
|
scrollText
|
2018-12-09 18:28:02 +08:00 |
|
oc
|
b970002b4f
|
\f drawImage in TextBox
|
2018-12-03 21:56:17 +08:00 |
|
oc
|
4ee795a3c3
|
eachArrive
|
2018-12-02 22:15:22 +08:00 |
|
oc
|
a830e14614
|
waitAsync
|
2018-12-02 21:47:03 +08:00 |
|
oc
|
a6a8b91863
|
show/hide status bar
|
2018-12-01 14:48:52 +08:00 |
|
oc
|
d727a4d9d1
|
setGlobalAttribute & setGlobalValue
|
2018-12-01 14:12:42 +08:00 |
|
ckcz123
|
d6eb3bab65
|
autoText
|
2018-11-27 17:19:24 +08:00 |
|
tocque
|
a8554c21e2
|
levelUp event
|
2018-11-24 22:30:54 +09:00 |
|
oc
|
d3d63ff6d8
|
\v -> \r Fix
|
2018-11-22 01:28:48 +08:00 |
|
oc
|
7e7d5dd563
|
type:insert
|
2018-11-21 22:57:08 +08:00 |
|
ckcz123
|
19d7ed2cac
|
gray on unvisited quickshop
|
2018-11-21 19:52:08 +08:00 |
|
YouWei Zhao
|
b2776328bd
|
fix switch
|
2018-11-12 21:32:01 +08:00 |
|
tocque
|
3b5e7a0e30
|
switch
|
2018-11-09 22:48:07 +09:00 |
|
ckcz123
|
d98a21f7f9
|
Event: Comment
|
2018-10-31 17:36:32 +08:00 |
|
ckcz123
|
755919307d
|
Event: Comment
|
2018-10-31 17:34:41 +08:00 |
|
oc
|
082f57303f
|
setFloor
|
2018-10-19 00:59:44 +08:00 |
|
ckcz123
|
095aedf1e1
|
Bgmap & Fgmap events
|
2018-09-13 16:08:17 +08:00 |
|
ckcz123
|
f43ed04b1c
|
input2
|
2018-09-06 13:46:33 +08:00 |
|
oc
|
75d5b9dd29
|
show/hide floor images
|
2018-08-29 23:07:01 +08:00 |
|
YouWei Zhao
|
a6c602f4e2
|
editor : blockly
response to feedback
|
2018-08-27 17:02:26 +08:00 |
|
ckcz123
|
e987725523
|
V2.3.3
|
2018-07-21 14:59:45 +08:00 |
|
oc
|
1d70bcd131
|
Move enemy functions to proect
|
2018-07-19 02:08:04 +08:00 |
|
YouWei Zhao
|
2798c0cf58
|
fix resize
|
2018-07-09 14:31:18 +08:00 |
|
YouWei Zhao
|
7901113564
|
fix resize bug
|
2018-07-08 11:20:00 +08:00 |
|
YouWei Zhao
|
0288f42c8d
|
fix getCategory
修复了getCategory,因为命名不一致带来bug的可能, 方便添加新分类
|
2018-07-05 20:39:32 +08:00 |
|
ckcz123
|
74d3fd070e
|
Follow Effect
|
2018-07-03 18:56:35 +08:00 |
|
YouWei Zhao
|
9ddefed070
|
hide point_m
隐藏入口方块中的加点
入口方块类型错误时同步的报错
|
2018-06-29 23:11:08 +08:00 |
|
YouWei Zhao
|
a9d92e7996
|
fix bug in editor
1.比如道具效果 useItemEffect
等，在新注册后默认是null；如果要编辑需要先改成空的双引号""，然后再双击编辑；否则直接双击的话系统会认为是一个JSON，写脚本就会出错
2.事件编辑器保存时检测用的框是否是正确
|
2018-06-29 22:57:49 +08:00 |
|
oc
|
33325dc902
|
MoveBlock & move hero
|
2018-06-25 01:02:31 +08:00 |
|
Zhang Chen
|
206b763b88
|
Merge pull request #138 from zhaouv/v2.x
V2 x
|
2018-06-05 22:00:17 +08:00 |
|
YouWei Zhao
|
a7f156b73b
|
blockly侧边栏改成中文
|
2018-06-05 14:29:09 +08:00 |
|
oc
|
87532e268a
|
__door__
|
2018-05-25 11:02:55 +08:00 |
|
oc
|
9f86b525f6
|
Update docs
|
2018-05-25 10:52:36 +08:00 |
|
oc
|
c0fb3621ca
|
new door & remove dragon
|
2018-05-18 00:50:47 +08:00 |
|
YouWei Zhao
|
8518acf234
|
blockly:while break continue
|
2018-05-09 01:41:35 +08:00 |
|
oc
|
91b5f740a6
|
Move Image
|
2018-05-06 01:27:27 +08:00 |
|
oc
|
eafcfa4deb
|
setVolume
|
2018-05-05 01:54:57 +08:00 |
|
Zhang Chen
|
669c59ff41
|
Merge pull request #111 from zhaouv/v2.0-20180428
V2 0 20180428
|
2018-04-29 13:32:34 +08:00 |
|
YouWei Zhao
|
d4a427b477
|
blockly: shop
|
2018-04-29 13:12:26 +08:00 |
|
oc
|
fd57f77c95
|
event:wait
|
2018-04-28 23:31:18 +08:00 |
|
ckcz123
|
e6ccdf75ed
|
setHero -> setHeroIcon
|
2018-04-25 17:46:28 +08:00 |
|
oc
|
01c4ea4d31
|
setHeroIcon
|
2018-04-25 15:26:44 +08:00 |
|
ckcz123
|
8e68f1fbdf
|
Animate image & Gif support
|
2018-04-18 18:11:21 +08:00 |
|
oc
|
81df4a9b19
|
Reformat _server & delete map
|
2018-04-18 00:28:53 +08:00 |
|
YouWei Zhao
|
5e706e1111
|
fix bug && 细节调整
editor编辑设为自动保存
全塔属性保存后，切到其他标签切回来不变
Ctrl+Z
调整blockly滚轮方向
|
2018-03-22 16:57:32 +08:00 |
|
Zhang Chen
|
7f3b86e2f7
|
Merge pull request #91 from zhaouv/v2.0-comment-20180316
V2 0 comment 20180316
|
2018-03-17 22:07:47 +08:00 |
|
YouWei Zhao
|
c192a2b62c
|
重构comment
|
2018-03-17 17:40:13 +08:00 |
|
YouWei Zhao
|
12a7d213f2
|
调整blockly滚动条
|
2018-03-17 01:24:06 +08:00 |
|
YouWei Zhao
|
1eab391b5b
|
type:function的lint
|
2018-03-16 19:07:52 +08:00 |
|
YouWei Zhao
|
e1786c40eb
|
判断是否开启lint和自动补全
|
2018-03-16 00:45:23 +08:00 |
|
YouWei Zhao
|
4d9327854d
|
Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313
# Conflicts:
# _server/editor_blockly.js
|
2018-03-16 00:28:17 +08:00 |
|
YouWei Zhao
|
7403fa72c7
|
修改滚轮行为
|
2018-03-16 00:25:56 +08:00 |
|
oc
|
7f5752ee94
|
options
|
2018-03-15 23:02:09 +08:00 |
|
ckcz123
|
955476285d
|
Shop Template
|
2018-03-15 21:07:53 +08:00 |
|
YouWei Zhao
|
875726cbbe
|
Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-docs-20180313
|
2018-03-15 18:26:18 +08:00 |
|
ckcz123
|
a02682cb7e
|
Autocomplete & Css
|
2018-03-15 18:21:54 +08:00 |
|
YouWei Zhao
|
1c45bfee3f
|
修复点confirm事件编辑器的输入文本不消失的bug
|
2018-03-15 16:45:17 +08:00 |
|
oc
|
27b44b874f
|
Fix V2.0 Bug
|
2018-03-14 22:14:10 +08:00 |
|
YouWei Zhao
|
b86d734655
|
不打印调试信息;修改事件的trigger
|
2018-03-14 00:18:19 +08:00 |
|
YouWei Zhao
|
fd5e0032ab
|
editor在编辑enemy.js时一个怪物一行
修复了codeAreaHL不是全局量导致的bug
|
2018-03-11 19:56:21 +08:00 |
|
YouWei Zhao
|
ae0a8be8f1
|
editor细节调整
|
2018-03-10 21:00:18 +08:00 |
|
YouWei Zhao
|
9ee85323df
|
editor实现$range以及细节调整
|
2018-03-10 13:27:13 +08:00 |
|
YouWei Zhao
|
8e3c1b5c67
|
表格css以及编辑细节调整
|
2018-03-09 20:46:34 +08:00 |
|
YouWei Zhao
|
05982bfaf4
|
issue #57
#57
|
2018-03-07 22:44:57 +08:00 |
|
YouWei Zhao
|
39db1cd235
|
blockly改为弹窗
|
2018-03-07 17:35:15 +08:00 |
|
YouWei Zhao
|
ddd43a1dbc
|
Update blockly
|
2018-03-05 09:50:08 +08:00 |
|
YouWei Zhao
|
5da6ad56d0
|
Update blockly
|
2018-02-28 17:59:03 +08:00 |
|
YouWei Zhao
|
7b2c7c3509
|
Update editor-blockly-template
事件模板中添加
检测音乐如果没有开启则系统提示开启
|
2018-02-23 16:28:49 +08:00 |
|
YouWei Zhao
|
89bd795cf0
|
blockly中支持show hide多事件以及type:input
|
2018-02-20 20:45:18 +08:00 |
|
YouWei Zhao
|
d003dbf84b
|
editor:修改成功或失败会有相应的提示
不再时只是throw错误
|
2018-02-19 10:26:23 +08:00 |
|
YouWei Zhao
|
93160d2156
|
引入CodeMirror作为多行文本编辑器
|
2018-02-17 17:16:05 +08:00 |
|
YouWei Zhao
|
7c33ce6b1f
|
fix bug
可以正确的处理null了
|
2018-02-15 10:00:02 +08:00 |
|
YouWei Zhao
|
2b069b7614
|
集成blockly的事件编辑器
目前只能在正确的事件上工作,尚未处理null
|
2018-02-15 00:18:00 +08:00 |
|