Commit Graph

  • 1eb1e33fe1 Input, Show Multiple blocks, Load oc 2018-02-20 17:51:14 +0800
  • 9d591d50a5 Input, Show Multiple blocks, Load oc 2018-02-20 17:47:44 +0800
  • 7883bc48d5
    Merge pull request #48 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-19 22:42:09 +0800
  • f67b88d38e add tab for appendPic YouWei Zhao 2018-02-19 12:07:49 +0800
  • 84974ee9d5 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-appendPic-20180218' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-19 10:27:19 +0800
  • d003dbf84b editor:修改成功或失败会有相应的提示 YouWei Zhao 2018-02-19 10:26:23 +0800
  • 3686e68f1d
    Merge pull request #47 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-18 18:44:48 +0800
  • cdff0e8abd 修复了添加物品怪物的新id时,没有添加items.js或enemys.js中数据的bug YouWei Zhao 2018-02-18 18:37:39 +0800
  • 604d798af7
    Merge pull request #46 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-17 17:17:46 +0800
  • 93160d2156 引入CodeMirror作为多行文本编辑器 YouWei Zhao 2018-02-17 17:16:05 +0800
  • 7cb9d35929
    Merge pull request #45 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-17 14:17:21 +0800
  • 21998ec1a4 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-17 14:11:23 +0800
  • 169233955a Support constant damage oc 2018-02-16 15:27:47 +0800
  • 9fe928530c fix bug: default floor in floor selecter of editor YouWei Zhao 2018-02-15 19:23:37 +0800
  • e56b92d78e Support \\n oc 2018-02-15 19:01:43 +0800
  • 2f1b5ae829
    Merge pull request #44 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-15 18:47:09 +0800
  • f5260266c4 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-15 18:36:36 +0800
  • b5d8cf5e3f Fix PushBox Bug oc 2018-02-15 18:30:12 +0800
  • 7c33ce6b1f fix bug YouWei Zhao 2018-02-15 10:00:02 +0800
  • 2b069b7614 集成blockly的事件编辑器 YouWei Zhao 2018-02-15 00:18:00 +0800
  • db239bdbe3
    Merge pull request #43 from zhaouv/dev-2.0-201802102001 Zhang Chen 2018-02-14 15:55:18 +0800
  • 5939d27508 add tab for blockly YouWei Zhao 2018-02-14 14:51:10 +0800
  • d0115230d7 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 YouWei Zhao 2018-02-14 13:57:09 +0800
  • 998ed9ddc2 Update Ski & Push Bpx oc 2018-02-14 13:34:44 +0800
  • 3ab73eb5bc Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 YouWei Zhao 2018-02-14 00:15:17 +0800
  • c71f7930d7 Merge remote-tracking branch 'refs/remotes/ckcz123/master' YouWei Zhao 2018-02-14 00:13:27 +0800
  • e44ff57f26 View maps oc 2018-02-13 21:03:01 +0800
  • 5b751aea8a View maps oc 2018-02-13 21:00:38 +0800
  • 903725efde Small bug oc 2018-02-13 16:31:48 +0800
  • d87c306d58
    Merge pull request #42 from zhaouv/dev-2.0-201802102001 Zhang Chen 2018-02-12 17:01:37 +0800
  • e1e9ee2f58 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 YouWei Zhao 2018-02-12 17:00:07 +0800
  • 6829e60d43 Update Autosave Bug oc 2018-02-12 16:41:39 +0800
  • 922ba10c82 Merge remote-tracking branch 'refs/remotes/ckcz123/master' YouWei Zhao 2018-02-12 15:37:14 +0800
  • c5dc50803b Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-201802102001 YouWei Zhao 2018-02-12 15:30:42 +0800
  • 27e6dc802d Fix Shop Bug oc 2018-02-12 14:32:46 +0800
  • f9a147b0ba Fix a Bug oc 2018-02-12 14:18:11 +0800
  • 025f37911b Update doc oc 2018-02-11 21:26:08 +0800
  • 47b0efe4f7
    Merge pull request #41 from zhaouv/2.0-for-merge Zhang Chen 2018-02-10 16:50:38 +0800
  • 85c4d8a622 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into 2.0-for-merge YouWei Zhao 2018-02-10 16:35:38 +0800
  • c644f9f410 Update Map Generator4 oc 2018-02-10 11:47:21 +0800
  • b65e5dcfbb V1.4.1 oc 2018-02-09 21:06:55 +0800
  • c0fcbea201 V1.4.1 oc 2018-02-09 20:56:05 +0800
  • fa5aece101 Fix a small bug oc 2018-02-08 13:38:06 +0800
  • f30ccb5665 update ext oc 2018-02-07 15:23:01 +0800
  • cebdc25c30 Update doc oc 2018-02-06 17:01:46 +0800
  • 3f1a039c86 V1.4 oc 2018-02-06 16:56:27 +0800
  • 9b48c01c9b V1.4 oc 2018-02-06 14:14:23 +0800
  • 96c6c1a353 V1.4 oc 2018-02-06 14:11:56 +0800
  • 6bb839f7db Update oc 2018-02-06 14:07:56 +0800
  • d02f9df848 Support Animate oc 2018-02-06 13:36:18 +0800
  • 99463c6e5e Support Show Image oc 2018-02-05 22:16:55 +0800
  • aab1bfa40b Support Weather oc 2018-02-05 21:22:59 +0800
  • 6b929ffcca Support Weather oc 2018-02-05 21:22:19 +0800
  • c1d2e34317 Support Weather oc 2018-02-05 21:21:50 +0800
  • 05aaa15f85 Conversation oc 2018-02-04 20:33:20 +0800
  • 26e7513c7d Conversation oc 2018-02-04 20:07:08 +0800
  • 9330a18664 Conversation oc 2018-02-04 20:06:31 +0800
  • d212370425 Open book while viewing maps oc 2018-02-04 16:25:50 +0800
  • f26293a7ad Open book while viewing maps oc 2018-02-04 16:22:12 +0800
  • a6045f321d setRequestAnimationFrame oc 2018-02-04 15:37:20 +0800
  • 46fc674b86 setRequestAnimationFrame oc 2018-02-04 15:33:09 +0800
  • a24fc1db38 Fix Hero Bug oc 2018-02-04 12:26:18 +0800
  • 02337f0e64 Fix Hero Bug oc 2018-02-04 12:08:51 +0800
  • 53ca30a913 Modify trigger oc 2018-02-04 12:00:04 +0800
  • e0b7331a1a Cursor oc 2018-02-01 22:00:32 +0800
  • deb465ed5c Single save oc 2018-02-01 10:57:38 +0800
  • 777e296179 Move Directly oc 2018-01-31 20:29:33 +0800
  • aa3d86aaff Move Directly oc 2018-01-31 20:21:41 +0800
  • 528c281bd3 Update oc 2018-01-26 17:26:08 +0800
  • fbb05c4649 MotaAction.g4 && ~~'动作列表'~~ YouWei Zhao 2018-01-26 01:15:20 +0800
  • 875fdc8be8 Fix Replay Time oc 2018-01-25 02:29:29 +0800
  • 32c9d58b65 Replay Control oc 2018-01-25 01:56:00 +0800
  • 1648f6fc64
    Merge pull request #40 from zhaouv/2.0-gui Zhang Chen 2018-01-24 22:17:59 +0800
  • 6ea6bea7a7 blockly YouWei Zhao 2018-01-24 22:14:09 +0800
  • 6cba90599b Use mid compress oc 2018-01-24 20:25:37 +0800
  • 948257de82 Use mid compress oc 2018-01-24 20:24:38 +0800
  • acd634a93b Use mid compress oc 2018-01-24 20:23:56 +0800
  • cfed05335c Fix Enemy UI oc 2018-01-24 20:07:56 +0800
  • 6a0ed4f304 Fix Events.js Bug oc 2018-01-24 20:03:05 +0800
  • 4f283b0ffe Fix Events.js Bug oc 2018-01-24 20:01:46 +0800
  • 346f5b9d71 Merge remote-tracking branch 'refs/remotes/ckcz123/master' YouWei Zhao 2018-01-24 16:02:28 +0800
  • c0bfac2f36 Enemy Vampire oc 2018-01-24 14:33:57 +0800
  • 1cc55f5a11 Prompt & Replay oc 2018-01-22 22:40:49 +0800
  • e4a8c8a3c9 Fix v1.3.2 Bug oc 2018-01-22 22:20:45 +0800
  • df16c42637 Fix v1.3.2 Bug oc 2018-01-22 22:19:23 +0800
  • 6b34e1e126 Fix A small bug oc 2018-01-22 17:06:49 +0800
  • 2c85df01d8 Update Docs oc 2018-01-22 10:27:32 +0800
  • f9d66b4e5c Update V1.3.2 oc 2018-01-21 00:04:48 +0800
  • 18be854d71 Update Server oc 2018-01-21 00:03:09 +0800
  • ad3272f23e Update V1.3.2 oc 2018-01-20 23:49:26 +0800
  • 8a3616c539 V1.3.2 oc 2018-01-20 22:48:45 +0800
  • be0e706f1a Merge branch 'master' of https://github.com/ckcz123/mota-js oc 2018-01-20 22:47:16 +0800
  • 1213a32cc5 Equipment oc 2018-01-20 22:46:24 +0800
  • 439c86418c
    Merge pull request #39 from i2Echo/master Zhang Chen 2018-01-20 14:18:25 +0800
  • 524c8be9a8 fix bug echo 2018-01-20 14:13:32 +0800
  • c7a437e8a8 Merge branch 'v1.3' echo 2018-01-20 14:07:06 +0800
  • f5b8ac521c fix bug echo 2018-01-20 14:06:04 +0800
  • f47eefeea8 fix IE bug echo 2018-01-20 13:56:44 +0800
  • efe8138a2d merge from origin:master echo 2018-01-20 13:39:43 +0800
  • b7cd8c0dc1 fix bug: polyfill old version of IE echo 2018-01-20 13:30:36 +0800