jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Commit Graph

  • 15cdfa0f23 function调整 YouWei Zhao 2018-03-10 14:10:42 +0800
  • 9ee85323df editor实现$range以及细节调整 YouWei Zhao 2018-03-10 13:27:13 +0800
  • 20fc1f6b53 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 YouWei Zhao 2018-03-10 12:12:08 +0800
  • fbc9926f36 Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 oc 2018-03-10 01:09:29 +0800
  • c9ba70fa9c Replay use full name oc 2018-03-10 01:09:07 +0800
  • 15c3e17b86
         Merge pull request #70 from zhaouv/v2.0-editor-20180304 Zhang Chen 2018-03-10 00:34:19 +0800
  • 38842a7200 editor细节优化 YouWei Zhao 2018-03-09 22:50:59 +0800
  • 882446c442
         Merge pull request #69 from zhaouv/v2.0-editor-20180304 Zhang Chen 2018-03-09 21:12:22 +0800
  • 93ee7f0415 Remove Storage oc 2018-03-09 21:11:58 +0800
  • 8e3c1b5c67 表格css以及编辑细节调整 YouWei Zhao 2018-03-09 20:46:34 +0800
  • 79f0854371 bgm oc 2018-03-08 23:21:33 +0800
  • f557aaf553 x oc 2018-03-08 23:17:31 +0800
  • 3c5e41842e BGM oc 2018-03-08 23:04:13 +0800
  • 6e1d4b61e8
         Merge pull request #68 from zhaouv/v2.0-editor-20180304 Zhang Chen 2018-03-08 19:30:45 +0800
  • e578fba8f0 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into v2.0-editor-20180304 YouWei Zhao 2018-03-08 19:27:05 +0800
  • 5103a84187 update server ckcz123 2018-03-08 19:25:28 +0800
  • a695dcd6cf editor前端上切换模式 YouWei Zhao 2018-03-08 19:00:20 +0800
  • c57f3072bb
         Merge pull request #67 from zhaouv/v2.0-editor-20180304 Zhang Chen 2018-03-07 22:47:28 +0800
  • 05982bfaf4 issue #57 YouWei Zhao 2018-03-07 22:44:57 +0800
  • 39db1cd235 blockly改为弹窗 YouWei Zhao 2018-03-07 17:35:15 +0800
  • 3a62dee1ba Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into v2.0-editor-20180304 YouWei Zhao 2018-03-06 13:28:24 +0800
  • dc2993e40d Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 oc 2018-03-05 19:37:40 +0800
  • 66117ebf08 Support Callback in Editor oc 2018-03-05 19:37:21 +0800
  • ac29908604
         Merge pull request #65 from zhaouv/v2.0-editor-20180304 Zhang Chen 2018-03-05 10:56:42 +0800
  • ddd43a1dbc Update blockly YouWei Zhao 2018-03-05 09:50:08 +0800
  • 3ca7c95231 load mod oc 2018-03-04 12:59:33 +0800
  • fcc71dcf7f
         Merge pull request #64 from zhaouv/v2.0-editor-20180304 Zhang Chen 2018-03-04 12:54:07 +0800
  • df89fd0b7c 调整 editor.file & editor.mode YouWei Zhao 2018-03-04 11:11:52 +0800
  • 2f5caae07c Support Reborn oc 2018-03-03 23:48:46 +0800
  • dcce32f931 Support Reborn oc 2018-03-03 23:46:21 +0800
  • f97495a6b6 Support Reborn oc 2018-03-03 23:34:10 +0800
  • e5ab7bd0ce Merge branch 'v2.0' of https://github.com/ckcz123/mota-js into v2.0 oc 2018-03-03 22:48:41 +0800
  • 43681581e0 1 oc 2018-03-03 22:47:48 +0800
  • 646572f5d8
         Merge pull request #63 from zhaouv/dev-2.0-functions-20180227 Zhang Chen 2018-03-03 22:11:36 +0800
  • 2653b602ee merge YouWei Zhao 2018-03-03 21:59:00 +0800
  • 2dd694bcfa add weather in comment.js YouWei Zhao 2018-03-03 21:56:12 +0800
  • e79da81d50 Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into dev-2.0-functions-20180227 YouWei Zhao 2018-03-03 21:37:53 +0800
  • 0974656ad1 Restructure ckcz123 2018-03-03 21:07:26 +0800
  • 00d697af31
         Fix Bug Zhang Chen 2018-03-03 21:05:29 +0800
  • 890001a9dc
         Merge pull request #62 from zhaouv/dev-2.0-functions-20180227 Zhang Chen 2018-03-03 15:01:16 +0800
  • 68c516d41d Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 YouWei Zhao 2018-03-03 15:00:11 +0800
  • 4e69b4ee10 Win End ckcz123 2018-03-02 21:02:04 +0800
  • b1d9144e52 Add Mid License oc 2018-03-02 13:01:47 +0800
  • 8c484d84d9 fix bug YouWei Zhao 2018-03-01 16:00:38 +0800
  • 90b36b3d27 Fix Small Bug ckcz123 2018-02-28 21:04:27 +0800
  • 7148bc11e5
         Merge pull request #59 from zhaouv/dev-2.0-functions-20180227 Zhang Chen 2018-02-28 20:26:56 +0800
  • 2f50978612 Update blockly YouWei Zhao 2018-02-28 20:25:53 +0800
  • b48b361a15 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 YouWei Zhao 2018-02-28 20:15:09 +0800
  • e39e49613c Merge remote-tracking branch 'refs/remotes/ckcz123/v2.0' into dev-2.0-functions-20180227 YouWei Zhao 2018-02-28 20:13:16 +0800
  • 4d6f50d46e Long Press ckcz123 2018-02-28 20:10:04 +0800
  • 6707e7eca0 Long Press ckcz123 2018-02-28 20:02:40 +0800
  • 5da6ad56d0 Update blockly YouWei Zhao 2018-02-28 17:59:03 +0800
  • e3c0792028 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-functions-20180227 YouWei Zhao 2018-02-28 16:47:57 +0800
  • 205443c64d Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-appendPic-20180218' into dev-2.0-functions-20180227 YouWei Zhao 2018-02-28 16:45:56 +0800
  • ebf42b3227 No cache ckcz123 2018-02-28 16:44:03 +0800
  • 7256878408 Scroll Text ckcz123 2018-02-28 16:38:37 +0800
  • 95ccc2574b Auto Text, Scroll Text ckcz123 2018-02-28 16:22:27 +0800
  • f22ba51023 保持editor中的gameGroup部分与index同形 YouWei Zhao 2018-02-28 15:16:19 +0800
  • b7a8820a75 分离index.html中用户修改的部分 YouWei Zhao 2018-02-28 15:12:29 +0800
  • 321e44f963
         Merge pull request #58 from zhaouv/dev-2.0-appendPic-20180218 Zhang Chen 2018-02-28 14:51:45 +0800
  • d754df5a83 修改event显伤的默认值 YouWei Zhao 2018-02-28 14:48:14 +0800
  • 8f6dbbbe59 分离index.html中用户修改的部分 YouWei Zhao 2018-02-28 14:45:13 +0800
  • 3be76240ff 可设置可不设置的增加null选项 YouWei Zhao 2018-02-28 14:02:34 +0800
  • 9ee573d3af Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-28 13:38:26 +0800
  • d5d131227a Merge remote-tracking branch 'refs/remotes/origin/master' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-28 13:36:49 +0800
  • c02bd41fbb Fix Hide Bug oc 2018-02-27 22:30:17 +0800
  • 85f7bb3073
         Merge pull request #56 from zhaouv/dev-2.0-appendPic-20180218 Zhang Chen 2018-02-27 19:41:50 +0800
  • 6c4bb49459 把events.js和ui.js中需要修改的函数分离出来 YouWei Zhao 2018-02-27 19:13:13 +0800
  • 2334a7dd06 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-27 18:05:31 +0800
  • bfd22c8b83 Use Remote BGM oc 2018-02-27 14:12:21 +0800
  • 3ad7bf528e
         Merge pull request #53 from zhaouv/dev-2.0-appendPic-20180218 Zhang Chen 2018-02-25 15:55:57 +0800
  • 463e715a3b Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-25 15:54:07 +0800
  • 0b548955c4 Fix Move Directly Bug ckcz123 2018-02-25 14:24:32 +0800
  • cdf8d6ccff Fix SetInterval Bug ckcz123 2018-02-25 13:55:10 +0800
  • be2696c406 Fix SetInterval Bug ckcz123 2018-02-25 12:31:13 +0800
  • a2d85bbc63 Fix Move Directly Bug oc 2018-02-25 01:28:09 +0800
  • ef901990a0 Fix Move Directly Bug oc 2018-02-23 23:52:04 +0800
  • 2dc118b753 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-23 16:36:39 +0800
  • 7b2c7c3509 Update editor-blockly-template YouWei Zhao 2018-02-23 16:28:49 +0800
  • ca660b481a Fix SetBlock Bug oc 2018-02-21 23:06:26 +0800
  • 3f2c5c0284
         Merge pull request #51 from zhaouv/dev-2.0-appendPic-20180218 Zhang Chen 2018-02-21 18:22:27 +0800
  • bb6a9e3266 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-21 18:09:39 +0800
  • e436a5f995 追加素材完成 YouWei Zhao 2018-02-21 18:09:19 +0800
  • d5fb1367e0
         Merge pull request #50 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-21 11:10:38 +0800
  • 2fe7150b0e Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-21 11:08:51 +0800
  • 903d2ac165 Fix Load Shop oc 2018-02-21 11:07:15 +0800
  • e6d9eceba9 blockly-setText-bold YouWei Zhao 2018-02-21 00:15:44 +0800
  • 73188765f5 Bold in SetText oc 2018-02-20 23:51:17 +0800
  • 62f09a6ec0 Add Multiple Ending oc 2018-02-20 23:26:11 +0800
  • ce29f46c5a
         Merge pull request #49 from zhaouv/dev-2.0-blockly-20180214 Zhang Chen 2018-02-20 23:03:25 +0800
  • 7e61378d68 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-20 22:56:36 +0800
  • c41f2a49e7 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-20 22:55:58 +0800
  • 8396f28307 Fix setBlock Bug oc 2018-02-20 22:53:57 +0800
  • 0f88227eef Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-20 22:39:54 +0800
  • ce577c56b1 Update oc 2018-02-20 22:05:10 +0800
  • 2bff3f8e4e Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-20 21:21:20 +0800
  • ad398c3560 0-12 -> Int YouWei Zhao 2018-02-20 21:19:19 +0800
  • 11fb1b19c1 Merge remote-tracking branch 'refs/remotes/origin/dev-2.0-blockly-20180214' into dev-2.0-appendPic-20180218 YouWei Zhao 2018-02-20 20:52:35 +0800
  • 89bd795cf0 blockly中支持show hide多事件以及type:input YouWei Zhao 2018-02-20 20:45:18 +0800
  • f1d603e9e6 Merge remote-tracking branch 'refs/remotes/ckcz123/master' into dev-2.0-blockly-20180214 YouWei Zhao 2018-02-20 18:13:48 +0800