Commit Graph

1224 Commits

Author SHA1 Message Date
YouWei Zhao
5ad2835914 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into editor-tilesets 2018-09-27 14:05:56 +08:00
oc
1aef219f53 Equipment Buff 2018-09-27 10:58:32 +08:00
oc
9941d12689 Equipment Buff 2018-09-27 10:53:10 +08:00
oc
83a8ccbad7 clearStatus 2018-09-27 09:41:45 +08:00
Zhang Chen
0d25f7e45e
Merge pull request #225 from zhaouv/editor-tilesets
editor-tilesets
2018-09-27 00:36:08 +08:00
YouWei Zhao
8e6e301bae editor-tilesets:check <img>.[height/width] mod 32 2018-09-27 00:05:49 +08:00
YouWei Zhao
458e464f73 editor-tilesets 2018-09-26 23:39:36 +08:00
ckcz123
f1c4ab8dd4 hideBlock 2018-09-26 20:25:19 +08:00
ckcz123
1f4a78848f EraseBlockgit add . 2018-09-26 20:24:00 +08:00
ckcz123
f710f7c04e Add support for Tilesets 2018-09-26 20:15:02 +08:00
ckcz123
1b80adcaf1 Add support for Tilesets 2018-09-26 19:58:39 +08:00
oc
fb069ff78f Sync SL Panel 2018-09-26 11:31:53 +08:00
Zhang Chen
f0de78b0cd
Merge pull request #223 from ckcz123/v2.0
V2.0
2018-09-24 19:03:34 +08:00
ckcz123
4702919b44 textalign: center in UI 2018-09-24 19:02:46 +08:00
Zhang Chen
650c8c1fca
Merge pull request #222 from zhaouv/editor
editor: fine tuning
2018-09-24 14:51:20 +08:00
YouWei Zhao
914874e5af editor: fine tuning 2018-09-24 14:35:30 +08:00
Zhang Chen
80f29f8a00
Merge pull request #221 from ckcz123/v2.0
V2.0
2018-09-23 15:10:45 +08:00
ckcz123
5f947bb588 Fix cannotMove with getNext 2018-09-23 15:09:16 +08:00
oc
3bbd5e523b Fix cannotMove 2018-09-22 19:45:18 +08:00
ckcz123
82a63f7ac0 Fix Border Color 2018-09-21 19:45:00 +08:00
Zhang Chen
6ff2dd2739
Merge pull request #220 from ckcz123/v2.0
Fix Mobile
2018-09-20 11:56:41 +08:00
ckcz123
6d24b98947 Fix Mobile 2018-09-20 11:52:07 +08:00
Zhang Chen
c57fff63a7
Merge pull request #219 from ckcz123/v2.0
V2.0
2018-09-20 08:14:01 +08:00
oc
a6a0ddc76c Fix ChangeFloor Bug 2018-09-20 08:08:59 +08:00
oc
6caab9ae53 Indent in functions 2018-09-19 21:30:36 +08:00
oc
feaa250a9c Async events 2018-09-19 21:17:43 +08:00
Zhang Chen
aac2d2e396
Merge pull request #218 from ckcz123/v2.0
V2.0
2018-09-19 21:16:20 +08:00
oc
8e234d396c Fix Bg/Fg map in floors 2018-09-19 20:40:40 +08:00
Zhang Chen
f11ceb0377
Merge pull request #217 from zhaouv/fix-editor
fix editor:hide bg/fgmap in table ,add some '_range' in comment
2018-09-19 20:21:13 +08:00
YouWei Zhao
e77dac115b fix editor:hide bg/fgmap in table ,add some '_range' in comment 2018-09-19 12:47:11 +08:00
Zhang Chen
5c5d54ff32
Merge pull request #216 from ckcz123/v2.0
Update docs
2018-09-18 20:28:32 +08:00
ckcz123
633aebb278 Update docs 2018-09-18 20:27:45 +08:00
Zhang Chen
fcd47fd58c
Merge pull request #215 from ckcz123/v2.0
Async Animate
2018-09-18 19:10:28 +08:00
ckcz123
ba08f55361 Async Animate 2018-09-18 18:51:24 +08:00
Zhang Chen
4b5a7e54f2
Merge pull request #214 from ckcz123/v2.0
V2.0
2018-09-18 18:06:49 +08:00
ckcz123
99697ddbbf Light Effect & V2.4.1 2018-09-18 18:03:42 +08:00
oc
64e39b8da6 curtain -> canvas 2018-09-18 11:51:55 +08:00
oc
1eca3614e7 Reformat enemys 2018-09-18 11:33:06 +08:00
ckcz123
c57e734b97 Typing effect: display all on click 2018-09-17 19:35:34 +08:00
ckcz123
bc5d4efcf7 Fix textAttribute in save 2018-09-17 18:42:15 +08:00
ckcz123
3a50fb9330 Fix textAttribute in save 2018-09-17 18:39:53 +08:00
ckcz123
6956a27544 Equipment Docs 2018-09-17 18:20:18 +08:00
ckcz123
2ab6661ab1 Equipment Docs 2018-09-17 18:19:34 +08:00
ckcz123
c00ae6e017 Equipment 2018-09-17 16:18:33 +08:00
Zhang Chen
e69eb8bbe5
Merge pull request #213 from ckcz123/v2.0
V2.0
2018-09-16 16:31:39 +08:00
oc
f95b316ff5 V2.4.1 2018-09-16 16:23:27 +08:00
ckcz123
d2af698252 V2.4.1 2018-09-16 04:54:32 +08:00
Zhang Chen
55baa70d3c
Merge pull request #211 from zhaouv/editor-bgfgmap
editor bg/fgmap
2018-09-16 00:34:31 +08:00
Zhang Chen
5337bea4fa
Merge pull request #212 from ckcz123/master
Equipment
2018-09-16 00:34:21 +08:00
Zhang Chen
73a5fd8b78
Merge pull request #209 from tocque/equipbox
Equipment
2018-09-16 00:29:18 +08:00