Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,988 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

816 Commits

Author SHA1 Message Date
minggo 56e4ad8e6d [ci skip] Update CHANGELOG 2015-01-21 10:03:44 +08:00
minggo 7507336b50 [ci skip] Update CHANGELOG 2015-01-20 11:17:31 +08:00
Huabing.Xu 45405c2380 [ci skip]Update CHANGELOG 2015-01-16 23:01:00 +08:00
minggo fa7b6970e8 [ci skip] Update CHANGELOG 2015-01-14 17:09:14 +08:00
minggo 1a121b4633 [ci skip] Update CHANGELOG 2015-01-14 16:29:37 +08:00
Huabing.Xu 9039592423 [ci skip] update changelog 2015-01-14 14:01:44 +08:00
minggo 13085c3841 [ci skip] Update CHANGELOG 2015-01-14 11:43:50 +08:00
Huabing.Xu 861b608327 [ci skip] update changelog 2015-01-14 11:09:38 +08:00
minggo 4f34e228eb [ci skip] Update CHANGELOG 2015-01-14 11:04:29 +08:00
minggo e5204ed89f [ci skip] Update CHANGELOG 2015-01-12 19:40:40 +08:00
Huabing.Xu 20f6839821 [ci skip] update CHANGELOG(fix typo) 2015-01-12 10:25:15 +08:00
Huabing.Xu ad42e15b62 [ci skip]Update CHANGELOG 2015-01-09 21:22:55 +08:00
minggo 15220c7499 [ci skip] Update CHANGELOG 2015-01-09 19:29:50 +08:00
minggo e04087ea41 [ci skip] Update CHANGELOG 2015-01-09 19:09:43 +08:00
minggo 2c1f9f39de [ci skip] Update CHANGELOG 2015-01-09 15:35:02 +08:00
minggo 4715de4591 [ci skip] Update CHANGELOG 2015-01-09 15:07:06 +08:00
Huabing.Xu 8f0eb300e0 [ci skip] update changelog 2015-01-09 14:32:53 +08:00
Huabing.Xu 275c7d180c [ci skip] update changelogs 2015-01-09 14:31:31 +08:00
minggo 7514ce4d62 [ci skip] Update CHANGELOG 2015-01-09 14:20:26 +08:00
Huabing.Xu 0c4a180c2b [ci skip] update changelog 2015-01-08 11:02:24 +08:00
minggo 019cda3110 [ci skip] Update CHANGELOG 2015-01-06 14:12:31 +08:00
minggo 7fa3c2e078 [ci skip] Update CHANGELOG 2015-01-06 14:08:05 +08:00
minggo 44b51c0114 [ci skip] Update CHANGELOG 2015-01-06 09:47:45 +08:00
yangxiao c320bd46dd add node quaternion to changelog 2015-01-05 17:42:36 +08:00
minggo 82db989432 [ci skip] Update CHANGELOG 2015-01-05 14:30:58 +08:00
minggo ab2b1976a0 [ci skip] Update CHANGELOG 2015-01-05 13:57:38 +08:00
minggo c9a2860ce2 [ci skip] Update CHANGELOG 2015-01-04 14:51:00 +08:00
minggo 2ea89c0b3f [ci skip] Update CHANGELOG 2015-01-04 10:41:23 +08:00
Huabing.Xu 70ac38d09b [ci skip]update changelog 2014-12-31 22:20:28 +08:00
Huabing.Xu 59e4d817a6 [ci skip]update changelog 2014-12-31 22:18:48 +08:00
minggo 5982a4ec90 [ci skip] Update CHANGELOG 2014-12-31 18:23:40 +08:00
andyque 71c6f92903 update changelog 2014-12-31 16:45:09 +08:00
Huabing.Xu a9cc40cc6a [ci skip] update changeLog 2014-12-31 10:34:42 +08:00
minggo 7ab4e0de3a Merge pull request #9634 from andyque/fixIssue9628 
fix setTitleColor calls method setColor instead of setTextColor of title label.
 2014-12-29 11:24:36 +08:00
minggo 216f0d5a31 [ci skip] Update CHANGELOG 2014-12-29 11:20:02 +08:00
minggo 696e2ffad8 [ci skip] Update CHANGELOG 2014-12-26 09:33:41 +08:00
andyque 4398710207 modify changelog 2014-12-25 16:21:31 +08:00
minggo 6949f468f2 [ci skip] Update CHANGELOG 2014-12-24 15:36:23 +08:00
minggo 3254339007 [ci skip] Update CHANGELOG 2014-12-24 15:34:57 +08:00
minggo 9af7efa922 [ci skip] Update CHANGELOG 2014-12-24 15:32:37 +08:00
Ricardo Quesada 92584bbc7f Merge pull request #9547 from mannewalis/mem_alloc_again 
Mem alloc again
 2014-12-19 14:35:26 -08:00
mannewalis 0d590604f9 updating changelog 2014-12-19 12:39:49 -05:00
minggo 851e8e9669 [ci skip] Update CHANGELOG 2014-12-19 09:55:41 +08:00
minggo cd7e8a6dac [ci skip] Update CHANGELOG 2014-12-16 18:32:43 +08:00
minggo 26d555cd0b [ci skip] Update CHANGELOG 2014-12-16 09:50:37 +08:00
minggo 0408c03903 [ci skip] Update CHANGELOG 2014-12-10 18:56:07 +08:00
minggo 15948e7748 [ci skip] Update CHANGELOG 2014-12-08 18:14:56 +08:00
minggo 71511078c6 [ci skip] Update CHANGELOG 2014-12-08 18:10:20 +08:00
minggo 191e84f531 [ci skip] Update CHANGELOG 2014-12-04 15:39:44 +08:00
minggo dbf299bec7 [ci skip] Update CHANGELOG 2014-12-04 15:23:38 +08:00
minggo c1866adf4e [ci skip] Update CHANGELOG 2014-12-04 15:13:07 +08:00
minggo d179ced1b4 [ci skip] Update CHANGELOG 2014-12-04 10:08:43 +08:00
minggo 741884014b [ci skip] Update CHANGELOG 2014-12-02 15:52:46 +08:00
minggo dd0339f551 [ci skip] Update CHANGELOG 2014-12-02 14:47:48 +08:00
Huabing.Xu 24fe7d9829 udpate changeLog 2014-11-29 22:30:54 +08:00
Ricardo Quesada 154a059d1c mend 2014-11-27 10:53:29 -08:00
Ricardo Quesada 83f9d5d536 Updates CHANGELOG 2014-11-27 10:51:46 -08:00
minggo b7abbb0de3 [ci skip] Update CHANGELOG 2014-11-27 10:20:18 +08:00
minggo cf8b88a19b [ci skip] Update CHANGELOG 2014-11-26 20:07:42 +08:00
minggo 7e6594f5dd [ci skip] Update CHANGELOG 2014-11-26 13:50:33 +08:00
minggo 0d9b679bb7 [ci skip] Update CHANGELOG 2014-11-26 11:52:32 +08:00
James Chen 59a9d7e4c2 Update CHANGELOG 2014-11-25 16:19:09 +08:00
minggo 2a0c3983e5 [ci skip] Update CHANGELOG 2014-11-24 15:18:31 +08:00
minggo 48c67899bb [ci skip] Update CHANGELOG 2014-11-20 11:15:25 +08:00
minggo 97a3e912a3 [ci skip] Update CHANGELOG 2014-11-20 10:49:07 +08:00
minggo 596537ebcc [ci skip] Update CHANGELOG 2014-11-13 19:03:08 +08:00
minggo 6536862e34 [ci skip] Update CHANGELOG 2014-11-13 16:05:37 +08:00
minggo 4bb42a5825 [ci skip] Update CHANGELOG 2014-11-13 15:18:02 +08:00
minggo 0f2651b6f4 [ci skip] Update CHANGELOG 2014-11-13 14:48:13 +08:00
minggo 6ac6e07a4d [ci skip] Update CHANGELOG 2014-11-09 23:30:39 +08:00
Summoner 3109b40df9 Update CHANGELOG 
fix typo
 2014-11-06 09:13:47 +08:00
minggo 7123902f11 [ci skip] Update CHANGELOG 2014-11-05 17:51:35 +08:00
minggo dd7ef28145 Merge pull request #8954 from andyque/modifyChangeLog 
modify changelog
 2014-11-05 17:49:12 +08:00
minggo d2c36d604f [ci skip] Update CHANGELOG 2014-10-29 16:11:00 +08:00
andyque 3f79d67f01 modify changelog 2014-10-29 10:33:31 +08:00
minggo 941166d9c7 [ci skip] Update CHANGELOG 2014-10-27 11:56:10 +08:00
minggo 15e92411f9 [ci skip] Update CHANGELOG 2014-10-27 11:51:04 +08:00
minggo 521f5396cc [ci skip] Update CHANGELOG 2014-10-27 11:39:58 +08:00
minggo 354147260c [ci skip] Update CHANGELOG 2014-10-27 11:32:30 +08:00
minggo 7ccf684a3e [ci skip] Update CHANGELOG 2014-10-27 11:15:36 +08:00
minggo c3afa7a29f [ci skip] Update CHANGELOG 2014-10-25 15:49:27 +08:00
minggo d4bcbf9519 [ci skip] Update CHANGELOG 2014-10-24 21:49:03 +08:00
minggo 66b693bf66 [ci skip] Update CHANGELOG 2014-10-20 14:11:48 +08:00
minggo 5a6e7150e0 [ci skip] Update CHANGELOG 2014-10-17 13:42:40 +08:00
minggo a52d75f15d [ci skip] Update CHANGELOG 2014-10-16 21:08:16 +08:00
minggo 7caac8f276 [ci skip] Update CHANGELOG 2014-10-16 21:03:04 +08:00
minggo cbfe2b586f [ci skip] Update CHANGELOG 2014-10-16 19:38:43 +08:00
minggo 41d280893f [ci skip] Update CHANGELOG 2014-10-16 15:40:34 +08:00
minggo eeabb52ceb [ci skip] Update CHANGELOG 2014-10-16 12:00:42 +08:00
minggo 41d2929060 [ci skip] Update CHANGELOG 2014-10-15 15:33:20 +08:00
minggo 9affecb0e4 [ci skip] Update CHANGELOG 2014-10-13 13:52:20 +08:00
minggo 4624018ae9 [ci skip] Update CHANGELOG 2014-10-11 16:27:45 +08:00
minggo 985b2a72b7 [ci skip] Update CHANGELOG 2014-10-10 16:30:26 +08:00
minggo 00f8f84552 [ci skip] Update CHANGELOG 2014-10-10 15:56:15 +08:00
minggo c774867f3e [ci skip] Update CHANGELOG 2014-10-10 15:37:08 +08:00
minggo a11091a10d [ci skip] Update CHANGELOG 2014-10-10 15:30:30 +08:00
minggo 8964c8860a [ci skip] Update CHANGELOG 2014-10-10 15:27:12 +08:00
minggo d7d52a7cf0 [ci skip] Update CHANGELOG 2014-10-10 10:19:07 +08:00
minggo db72756d02 [ci skip] Update CHANGELOG 2014-10-09 16:08:56 +08:00
minggo 52ebad885b [ci skip] Update CHANGELOG 2014-10-09 15:53:04 +08:00
minggo 640ad4a422 [ci skip] Update CHANGELOG 2014-10-08 13:50:22 +08:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Ricardo Quesada 42ace3e59c Adds lambda support in node 
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
 2014-10-02 21:25:55 -07:00
minggo d423e8f800 [ci skip] Update CHANGELOG 2014-09-30 15:21:54 +08:00
minggo f9005868d4 [ci skip] Update CHANGELOG 2014-09-30 15:11:51 +08:00
minggo ef221ce323 [ci skip] Update CHANGELOG 2014-09-30 11:17:03 +08:00
minggo 4736124357 [ci skip] Update CHANGELOG 2014-09-29 18:04:10 +08:00
minggo f7fcb047aa [ci skip] Update CHANGELOG 2014-09-29 18:00:29 +08:00
minggo f2fe4efdee [ci skip] Update CHANGELOG 2014-09-29 17:52:10 +08:00
minggo 913102d923 [ci skip] Update CHANGELOG 2014-09-28 17:25:04 +08:00
minggo ab8db5aced [ci skip] Update CHANGELOG 2014-09-28 16:45:38 +08:00
minggo 0cbe889030 [ci skip] Update CHANGELOG 2014-09-26 11:51:59 +08:00
minggo 995b09cb28 [ci skip] Update CHANGELOG 2014-09-26 11:01:18 +08:00
minggo e281f9f6b3 [ci skip] Update CHANGELOG 2014-09-25 14:47:03 +08:00
minggo df7685d237 [ci skip] Update CHANGELOG 2014-09-25 13:52:20 +08:00
minggo 26cbfaa29b [ci skip] 2014-09-25 13:46:12 +08:00
minggo b56b0d1eae [ci skip] 2014-09-25 10:55:18 +08:00
minggo 260cdd4eaa [ci skip] 2014-09-25 10:53:34 +08:00
minggo cebde4181b [ci skip] 2014-09-25 09:43:11 +08:00
minggo f88685be8e [ci skip] 2014-09-24 15:02:03 +08:00
minggo bb1771a000 [ci skip] 2014-09-23 11:18:56 +08:00
minggo 0368d5ace4 [ci skip] 2014-09-22 09:33:09 +08:00
minggo a1c0761107 [ci skip] 2014-09-19 17:04:41 +08:00
minggo a1052e0384 [ci skip] 2014-09-19 17:02:09 +08:00
minggo bffcf79737 [ci skip] 2014-09-17 11:33:41 +08:00
minggo 71325220bc [ci skip] 2014-09-17 10:26:03 +08:00
Ricardo Quesada c89f7ec6c4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into english_fixes 
Conflicts:
	CHANGELOG
 2014-09-15 09:34:11 -07:00
Ricardo Quesada 38cdee45f8 English fixes 2014-09-15 09:33:07 -07:00
minggo fc06916689 [ci skip] 2014-09-15 14:39:19 +08:00
minggo cd9611a0a6 [ci skip] 2014-09-15 09:55:38 +08:00
minggo 4aad03c449 [ci skip] 2014-09-15 09:54:42 +08:00
minggo 2b3bdbf56d [ci skip] 2014-09-12 18:06:33 +08:00
minggo 92325d30e5 [ci skip] 2014-09-12 17:17:28 +08:00
minggo 7256865f76 [ci skip] 2014-09-12 15:19:31 +08:00
minggo 2f5a3b6f8c [ci skip] 2014-09-12 15:09:50 +08:00
minggo 4106596f9d [ci skip] 2014-09-11 15:24:22 +08:00
minggo 04d4df54c0 [ci skip] 2014-09-11 15:10:45 +08:00
Ricardo Quesada 1e79cacf26 Updates CHANGELOG 2014-09-09 18:25:47 -07:00
minggo fd7bb349bb [ci skip] 2014-09-09 10:29:59 +08:00
Chuanren Wu 0b58ff7fce introduce substeps for accurate physics 2014-09-08 00:14:40 +02:00
minggo a2ee559244 [ci skip] 2014-09-04 22:38:26 +08:00
minggo d26446c73f [ci skip] 2014-09-04 14:02:20 +08:00
minggo 9cd21f19c9 [ci skip] 2014-09-04 13:39:17 +08:00
minggo cef9a21324 [ci skip] 2014-09-04 10:10:26 +08:00
minggo 8fd8ba97db [ci skip] 2014-09-03 11:27:45 +08:00
minggo 05c767be3b [ci skip] 2014-08-29 16:51:40 +08:00
minggo ffd81d8b0f [ci skip] 2014-08-29 13:43:42 +08:00
minggo 1d92d911d8 [ci skip] 2014-08-28 14:54:27 +08:00
minggo 966ea72263 [ci skip] 2014-08-28 14:35:50 +08:00
minggo 56392a080c [ci skip] 2014-08-28 14:33:31 +08:00
minggo d3227d0726 [ci skip] 2014-08-28 14:30:01 +08:00
minggo 50bbe6c91b [ci skip] 2014-08-28 14:29:06 +08:00
minggo d143754034 [ci skip] 2014-08-28 10:21:43 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
minggo abf4fb2319 [ci skip] 2014-08-25 09:47:13 +08:00
minggo d358a06716 [ci skip] 2014-08-22 23:47:53 +08:00
minggo eb1da8a0f9 [ci skip] 2014-08-22 23:34:46 +08:00
minggo 7fd1521bbf update version 2014-08-22 11:48:14 +08:00
minggo 2fc3be2720 [ci skip] 2014-08-21 10:33:57 +08:00
minggo 5ef8938217 [ci skip] 2014-08-20 13:45:08 +08:00
minggo fa95bda629 [ci skip] 2014-08-20 11:23:50 +08:00
minggo eecaac3384 [ci skip] 2014-08-20 09:48:39 +08:00
minggo 36113c65ac [ci skip] 2014-08-18 22:56:47 +08:00
minggo 6d21420755 [ci skip] 2014-08-15 16:05:12 +08:00
minggo 8d69d4b05c [ci skip] 2014-08-15 15:20:05 +08:00
minggo 64f6b9a8cc [ci skip] 2014-08-15 15:02:09 +08:00
minggo 186fd78729 [ci skip] 2014-08-14 10:06:32 +08:00
minggo 55e9487dbd [ci skip] 2014-08-14 09:42:59 +08:00
minggo c809c8806a [ci skip] 2014-08-14 09:36:29 +08:00
minggo b2dad11f7c [ci skip] 2014-08-14 09:33:32 +08:00
minggo a2cafa29e5 [ci skip] 2014-08-13 10:06:14 +08:00
minggo bdc5a7b306 [ci skip] 2014-08-13 09:30:33 +08:00
minggo 66c5d996dc [ci skip] 2014-08-12 13:39:10 +08:00
minggo e4faa4f9b1 [ci skip] 2014-08-11 10:37:23 +08:00
minggo 63ec1f894b [ci skip] 2014-08-11 09:50:46 +08:00
minggo 3031b17ba8 [ci skip] 2014-08-08 15:57:18 +08:00
minggo f677210746 [ci skip] 2014-08-08 14:07:49 +08:00
minggo 49ea910d94 [ci skip] 2014-08-08 11:59:39 +08:00
minggo 92a4a8c42c [ci skip] 2014-08-08 11:55:26 +08:00
minggo 83a204a720 [ci skip] 2014-08-08 11:48:06 +08:00
minggo beb74599c9 [ci skip] 2014-08-07 10:54:34 +08:00
minggo 8565d2734f [ci skip] 2014-08-07 10:25:16 +08:00
minggo d8aefffe3c [ci skip] 2014-08-06 14:36:37 +08:00
minggo b39954ad92 [ci skip] 2014-08-06 09:52:41 +08:00
minggo 6771ee10a5 [ci skip] 2014-08-05 13:34:41 +08:00
minggo 99f9a0fb19 [ci skip] 2014-08-05 11:55:06 +08:00
minggo a6a90e4090 [ci skip] 2014-08-05 10:10:17 +08:00
minggo a42bbaebf9 [ci skip] 2014-08-05 09:35:13 +08:00
minggo cad0c40cd2 [ci skip] 2014-08-04 16:33:44 +08:00
minggo aa78d878e1 [ci skip] 2014-08-04 15:37:17 +08:00
minggo 780549e5a7 [ci skip] 2014-08-01 11:59:44 +08:00
minggo eb3b58edc4 [ci skip] 2014-07-31 13:44:22 +08:00
minggo 57859beb68 [ci skip] 2014-07-30 09:51:18 +08:00
minggo 21ea77fb6f [ci skip] 2014-07-29 14:04:36 +08:00
minggo cb68b00634 [ci skip] 2014-07-28 14:16:39 +08:00
minggo 4249311c0c [ci skip] 2014-07-28 14:07:40 +08:00
minggo af3955f60c [ci skip] 2014-07-28 11:37:59 +08:00
minggo a878bd27db [ci skip] 2014-07-28 10:50:13 +08:00
minggo 6217748f1c [ci skip] 2014-07-25 23:16:27 +08:00
minggo 98f9395728 [ci skip] 2014-07-25 11:21:52 +08:00
minggo ae522f08fb [ci skip] 2014-07-24 23:06:42 +08:00
minggo 991fcffbf1 [ci skip] 2014-07-24 22:09:13 +08:00
minggo 92a6aab146 [ci skip] 2014-07-23 18:34:53 +08:00
minggo 2b2a00f0b3 [ci skip] 2014-07-23 11:33:12 +08:00
minggo d005ea2404 [ci skip] 2014-07-22 21:33:24 +08:00
minggo 033bbbe440 [ci skip] 2014-07-22 21:25:20 +08:00
minggo 42eb69655e [ci skip] 2014-07-21 14:57:06 +08:00
minggo 6fe58b4153 [ci skip] 2014-07-18 18:38:16 +08:00
minggo da6b8aae3d [ci skip] 2014-07-18 18:09:20 +08:00
minggo e2aedc05d3 [ci skip] 2014-07-17 22:16:46 +08:00
minggo b92fc24cc4 [ci skip] 2014-07-17 22:13:41 +08:00
minggo 10dc7cc563 [ci skip] 2014-07-17 22:06:24 +08:00
minggo c38cda6248 [ci skip] 2014-07-17 21:35:22 +08:00
minggo 8181ef9918 [ci skip] 2014-07-17 21:31:58 +08:00
minggo f418217b56 [ci skip] 2014-07-17 21:25:31 +08:00
minggo f8ecceff25 [ci skip] 2014-07-17 18:06:48 +08:00
minggo 0b7ecc769e [ci skip] 2014-07-17 17:31:32 +08:00
minggo 30f4a5cced [ci skip] 2014-07-17 16:41:32 +08:00
minggo a85e54cb69 [ci skip] 2014-07-17 12:03:59 +08:00
minggo d8a2acfdea [ci skip] 2014-07-17 11:57:11 +08:00
minggo 7ef77027d1 [ci skip] 2014-07-17 11:50:09 +08:00
minggo f17817b9ac [ci skip] 2014-07-15 17:00:16 +08:00
minggo 65f252785e [ci skip] 2014-07-15 15:02:23 +08:00
minggo e2bbc3d54d [ci skip] 2014-07-15 11:48:55 +08:00
minggo 337fc03f3a [ci skip] 2014-07-10 22:06:29 +08:00
minggo d2bcf9e9d1 [ci skip] 2014-07-10 15:49:29 +08:00
minggo ddb72228d3 [ci skip] 2014-07-10 09:57:16 +08:00
minggo fc515428bf [ci skip] 2014-07-08 22:19:54 +08:00
minggo 3e658216da [ci skip] 2014-07-08 22:08:28 +08:00
minggo 08027a65a7 [ci skip] 2014-07-08 21:21:26 +08:00
minggo 81e6fdabba [ci skip] 2014-07-08 20:38:58 +08:00
minggo 211096816b [ci skip] 2014-07-08 20:18:55 +08:00
minggo ca59f663a5 [ci skip] 2014-07-08 15:31:48 +08:00
minggo 92e113a602 [ci skip] 2014-07-08 10:59:50 +08:00
minggo aca498b06f [ci skip] 2014-07-08 10:53:07 +08:00
minggo f525500a41 [ci skip] 2014-07-03 14:20:31 +08:00
minggo aa80776eaa [ci skip] 2014-07-02 09:41:50 +08:00
minggo d6c516b62d [ci skip] 2014-07-01 16:20:55 +08:00
minggo 41379fb551 [ci skip] 2014-06-30 11:35:03 +08:00
minggo c85c6928b4 [ci skip] 2014-06-30 11:09:00 +08:00
minggo 707f5c2c93 [ci skip] 2014-06-30 11:08:13 +08:00
minggo 26db31ebc6 [ci skip] 2014-06-30 09:44:50 +08:00
minggo 496de72d6e [ci skip] 2014-06-30 09:39:38 +08:00
minggo fcde912273 [ci skip] 2014-06-27 18:09:57 +08:00
minggo 145ae387c9 [ci skip] 2014-06-27 16:38:41 +08:00
minggo 6b8fded088 [ci skip] 2014-06-26 22:59:20 +08:00
minggo 08c68e12c3 [ci skip] 2014-06-26 16:08:25 +08:00
minggo 013cf6de28 [ci skip] 2014-06-26 15:21:10 +08:00
minggo eb67d9deff [ci skip] 2014-06-25 17:59:30 +08:00
minggo ae346a741e [ci skip] 2014-06-25 17:14:57 +08:00
minggo 07c5e219d5 [ci skip] 2014-06-25 14:42:12 +08:00
minggo e44dafb9f9 [ci skip] 2014-06-25 14:33:42 +08:00
minggo 5dcc6e6707 [ci skip] 2014-06-25 14:13:50 +08:00
minggo cd2d56f5d9 [ci skip] 2014-06-25 14:11:16 +08:00
minggo e2fd768989 [ci skip] 2014-06-25 13:59:41 +08:00
minggo aa7e48794b [ci skip] 2014-06-24 10:50:09 +08:00
minggo d9c99e6251 [ci skip] 2014-06-24 10:47:50 +08:00
minggo 0a61932730 [ci skip] 2014-06-24 10:30:36 +08:00
minggo 8991ff739b [ci skip] 2014-06-23 17:22:56 +08:00
minggo dc96be969f [ci skip] 2014-06-23 16:45:47 +08:00
minggo 079e612ef2 [ci skip] 2014-06-19 22:07:25 +08:00
minggo 44e8df0ec6 [ci skip] 2014-06-19 22:05:52 +08:00
minggo 56777e6d61 [ci skip] 2014-06-19 09:47:01 +08:00
minggo c9492cbbef [ci skip] 2014-06-18 11:31:16 +08:00
minggo ba54f8c92c [ci skip] 2014-06-18 10:34:57 +08:00
minggo 9b6d58118c update changelog and release note 2014-06-17 21:13:49 +08:00
minggo 17bbb675df [ci skip] 2014-06-17 20:23:26 +08:00
minggo ec632a54b2 [ci skip] 2014-06-17 18:50:47 +08:00
minggo caafc0ebc5 [ci skip] 2014-06-17 18:38:33 +08:00
minggo 7ebb639763 [ci skip] 2014-06-17 13:51:11 +08:00
minggo ed40e48607 [ci skip] 2014-06-16 10:46:16 +08:00
minggo 1b24af95f1 [ci skip] 2014-06-12 18:23:31 +08:00
minggo 1187cfff6d [ci skip] 2014-06-12 16:19:05 +08:00
minggo bb5471ca8b [ci skip] 2014-06-12 15:07:29 +08:00
minggo 22f445d56f [ci skip] 2014-06-12 14:47:42 +08:00
minggo cc683ff00f [ci skip] 2014-06-12 11:40:41 +08:00
minggo 70147e9a20 [ci skip] 2014-06-12 11:38:28 +08:00
minggo 0ad57bdde7 [ci skip] 2014-06-11 14:50:33 +08:00
minggo 8222cdd8aa [ci skip] 2014-06-10 13:53:41 +08:00
minggo 9ef1272de7 [ci skip] 2014-06-09 17:18:55 +08:00
minggo 6ea42dd6ad [ci skip] 2014-06-09 16:34:41 +08:00
minggo f0021d7dae [ci skip] 2014-06-09 15:29:16 +08:00
minggo 4e299099d2 [ci skip] 2014-06-09 15:19:58 +08:00
minggo 2230431582 [ci skip] 2014-06-09 14:21:14 +08:00
minggo 6a4322eeac [ci skip] 2014-06-09 11:49:25 +08:00
minggo e0238c107e [ci skip] 2014-06-06 13:41:40 +08:00
minggo 11320a0ef5 [ci skip] 2014-06-06 11:40:32 +08:00
minggo 4c7628f69e [ci skip] 2014-06-05 11:51:02 +08:00
minggo 0c24c639aa [ci skip] 2014-06-05 11:01:43 +08:00
Ricardo Quesada 79ebc546f8 Merge remote-tracking branch 'cocos2d/v3' into normalized_position 
Conflicts:
	CHANGELOG
	cocos/ui/UILayout.cpp
 2014-06-04 09:19:22 -07:00
minggo a4f421a779 [ci skip] 2014-06-04 17:21:12 +08:00
minggo 539fed65fb [ci skip] 2014-06-04 15:29:54 +08:00
minggo 9c5b5924ed [ci skip] 2014-06-04 14:09:56 +08:00
minggo ef175e5999 [ci skip] 2014-06-04 13:55:00 +08:00
minggo 7641790185 [ci skip] 2014-06-04 10:05:28 +08:00
minggo 8a6a0968ef [ci skip] 2014-06-03 18:20:01 +08:00
minggo a6a686bef1 [ci skip] 2014-06-03 18:17:37 +08:00
minggo 3d576d8068 [ci skip] 2014-06-03 18:02:37 +08:00
minggo c1bb5d8803 [ci skip] 2014-06-03 16:58:53 +08:00
minggo 96d697a670 [ci skip] 2014-06-03 14:40:20 +08:00