Commit Graph

2399 Commits

Author SHA1 Message Date
oc
414dd86c81 previewUI part 1 2019-05-27 23:23:32 +08:00
oc
ba7eccbf5e toolboxReplay 2019-05-27 21:56:28 +08:00
oc
6b23361b61 uievents 2019-05-26 23:26:50 +08:00
oc
0c6176f5f6 uievents 2019-05-26 23:10:28 +08:00
oc
1e96491dd4 uievents 2019-05-26 23:06:21 +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
a6f3e18efc uievent runtime 2019-05-26 14:10:17 +08:00
oc
304bd80bbc uievent runtime 2019-05-26 13:58:08 +08:00
oc
a57771d1bf changeFloor symmetry point 2019-05-26 12:01:39 +08:00
ckcz123
22f8927708 getEnemyInfo query cache 2019-05-24 11:34:55 +08:00
ckcz123
a778dda4de quickLoadEquip 2019-05-23 17:08:06 +08:00
Zhang Chen
3db93163d1
Merge pull request #374 from ckcz123/v2.x
V2.x
2019-05-23 12:57:30 +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
Zhang Chen
a9244c1f70
Merge pull request #373 from ckcz123/v2.x
V2.x
2019-05-21 16:42:57 +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
d5239f613b Merge branch 'v2.x' 2019-05-11 15:53:19 +08:00
oc
8f03393eb2 python comment 2019-05-07 23:33:21 +08:00
oc
392b02ea0f Merge branch 'v2.x' 2019-05-07 23:18: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
e0060cc486 Merge branch 'v2.x' 2019-05-04 23:31:19 +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
Zhang Chen
bb28f23bdb
Merge pull request #370 from ckcz123/v2.x
Fix bug
2019-05-02 23:53:47 +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
YouWei Zhao
72a114fb8c Merge remote-tracking branch 'refs/remotes/ckcz123/v2.x' into v2.x 2019-05-02 10:06:39 -04:00
Zhang Chen
8a16a48420
Merge pull request #369 from ckcz123/v2.x
V2.x
2019-05-02 21:35:01 +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