Commit Graph

2138 Commits

Author SHA1 Message Date
ckcz123
a778dda4de quickLoadEquip 2019-05-23 17:08:06 +08:00
ckcz123
63cd2056bb Merge branch 'v2.x' of https://github.com/ckcz123/mota-js into v2.x 2019-05-23 12:53:00 +08:00
ckcz123
272d40315c getNumberById 2019-05-23 12:52:39 +08:00
oc
f90f71db21 drawTextBox lineHeight 2019-05-22 22:34:43 +08:00
oc
42d45233a1 server case sensitive 2019-05-21 19:52:27 +08:00
oc
fa46aef44b fillTextWithMaxWidth 2019-05-21 19:30:35 +08:00
ckcz123
dae1ace3ff toolbox description 2019-05-21 13:34:23 +08:00
oc
58c4600fbd doAction keepUI 2019-05-14 16:51:34 +08:00
oc
e8fd4e211e Merge branch 'v2.x' into refactoring-editor 2019-05-11 15:53:46 +08:00
oc
8f03393eb2 python comment 2019-05-07 23:33:21 +08:00
oc
83250226fa Merge branch 'v2.x' into refactoring-editor 2019-05-07 23:17:56 +08:00
oc
c78a51be6a add python server 2019-05-07 23:13:09 +08:00
oc
280823fa45 _readLoadEquip_playSound 2019-05-07 22:57:39 +08:00
oc
cbf3dfbc36 Merge branch 'v2.x' into refactoring-editor 2019-05-04 23:30:54 +08:00
oc
8ff8f3c349 space exit shop 2019-05-04 23:30:05 +08:00
oc
7534565647 Merge branch 'v2.x' into refactoring-editor 2019-05-04 23:01:38 +08:00
oc
7c6628347f Fix equip bug 2019-05-04 22:59:33 +08:00
oc
0bab9452ac Merge branch 'v2.x' into refactoring-editor 2019-05-02 23:50:17 +08:00
oc
2989f52e86 Fix bug 2019-05-02 23:48:03 +08:00
oc
f04f6ae4b5 Merge branch 'v2.x' into refactoring-editor 2019-05-02 21:26:04 +08:00
oc
f2212672ea v2.6.1 2019-05-02 21:22:46 +08:00
oc
5335a2f858 Merge branch 'v2.x' into refactoring-editor 2019-05-02 21:11:10 +08:00
oc
2c0e0ba307 changeFloorId 2019-05-02 21:06:44 +08:00
oc
330e031bc7 changeFloorId 2019-05-02 21:05:05 +08:00
oc
df683d8fc9 Merge branch 'v2.x' into refactoring-editor 2019-05-02 10:59:39 +08:00
oc
432b5354df setHeroIcon onload 2019-05-02 10:58:34 +08:00
oc
4a3bf0e96a merge v2.x 2019-05-01 16:27:21 +08:00
oc
053665d081 changeId 2019-05-01 16:24:25 +08:00
Zhang Chen
a89aa5f95e
Merge pull request #367 from zhaouv/changeId
change id idnum
2019-05-01 15:23:26 +08:00
oc
d9a4ee1aae fix bugs...... 2019-05-01 15:18:52 +08:00
YouWei Zhao
570f03343d change id idnum 2019-04-30 20:35:11 -04:00
oc
77e66f849d force binarysearch on large turn 2019-04-30 20:36:39 +08:00
oc
2426c8b010 canEquip -> equipCondition 2019-04-30 20:22:06 +08:00
oc
9264e7dfe5 insertAction commonEvent do-while 2019-04-29 20:10:42 +08:00
oc
8769668222 setGlobal & getGlobal 2019-04-29 19:34:27 +08:00
Zhang Chen
54d766f9e5
Merge pull request #365 from zhaouv/refactoring-editor-may-not-runable
Refactoring editor may not runable
2019-04-29 19:09:04 +08:00
Zhang Chen
efe51ce363
Merge pull request #364 from zhaouv/g4-regex-this.xxx
.g4-regex
2019-04-29 19:08:34 +08:00
YouWei Zhao
ca7059bbc2 saveScript 2019-04-28 12:14:59 -04:00
oc
c4a38f4f99 moveBlock forward & backward 2019-04-28 22:38:19 +08:00
oc
929bf1a11b moveBlock forward & backward 2019-04-28 22:35:58 +08:00
YouWei Zhao
45101d43f6 .g4-regex 2019-04-28 10:21:07 -04:00
YouWei Zhao
41b0fc553e editor_file fileMark 2019-04-28 09:54:56 -04:00
oc
9a993b13ca global:xxx -> core.getLocalStorage 2019-04-28 21:50:14 +08:00
oc
6724234133 useShop space & longclick 2019-04-28 21:36:01 +08:00
oc
f6ac9610cc hero any width 2019-04-28 21:14:14 +08:00
oc
9e9025e089 openDoor async & battle loc & trigger keep 2019-04-28 20:29:51 +08:00
oc
ccee812af7 replay animate speed & step replay 2019-04-28 19:23:27 +08:00
YouWei Zhao
5f75a0ad6f editor_file savefloor 2019-04-25 10:26:20 -04:00
Zhang Chen
e61d738f36
Merge pull request #361 from zhaouv/refactoring-editor
editor_file
2019-04-24 11:00:12 +08:00
YouWei Zhao
9861319734 update refactoring.md
更新的重构思路,关于edtior_file的重构思考的(可能)比较清晰了
2019-04-23 17:49:49 -04:00