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

759 Commits

Author SHA1 Message Date
minggo d04e05e943 [ci skip]update CHANGELOG 2015-04-16 10:12:12 +08:00
yangxiao 4236d973c0 reset submodule and modify changelog 2015-04-15 16:53:05 +08:00
minggo 7060af7fa7 [ci skip]update CHANGELOG 2015-04-14 18:11:09 +08:00
minggo 561123d4cc [ci skip]update CHANGELOG 2015-04-14 17:49:17 +08:00
minggo fe207fe8e0 [ci skip]update CHANGELOG 2015-04-14 17:02:20 +08:00
minggo 1e4c22c043 [ci skip]update CHANGELOG 2015-04-14 16:39:49 +08:00
minggo 793f7cd1e7 [ci skip]update CHANGELOG 2015-04-14 14:29:49 +08:00
minggo d4d7a3a7b0 [ci skip]update CHANGELOG 2015-04-14 10:01:49 +08:00
minggo f8cf6822b9 [ci skip]update CHANGELOG 2015-04-14 09:38:03 +08:00
minggo 8a160d76a3 [ci skip]update CHANGELOG 2015-04-10 18:34:45 +08:00
minggo 9876f0765e [ci skip]update CHANGELOG 2015-04-10 16:43:21 +08:00
minggo 68fc4ad741 [ci skip]update CHANGELOG 2015-04-10 15:25:46 +08:00
minggo 554901bb12 [ci skip]update CHANGELOG 2015-04-10 15:24:43 +08:00
minggo 16cb5f32d3 [ci skip]update CHANGELOG 2015-04-10 09:37:45 +08:00
minggo 1765d53413 [ci skip]update CHANGELOG 2015-04-09 15:49:34 +08:00
minggo 64c45fa3ca [ci skip]update CHANGELOG 2015-04-08 22:40:18 +08:00
minggo 3ce6602f3a Merge pull request #11335 from super626/v3 
Modify changelog and add getAABBRecursively
 2015-04-08 18:03:48 +08:00
minggo 0b8f9ad269 [ci skip]update CHANGELOG 2015-04-08 17:52:16 +08:00
yangxiao 3b01222787 modify changelog 2015-04-08 16:27:26 +08:00
minggo c8bc8779fd [ci skip]update CHANGELOG 2015-04-08 16:24:18 +08:00
yangxiao 0d0bad186f resolve conflict 2015-04-08 16:23:35 +08:00
yangxiao 427c15e53f modify changelog 2015-04-08 16:13:41 +08:00
yangxiao 37d75654f4 modify changelog 2015-04-08 16:09:13 +08:00
minggo e4fb954fde [ci skip]update CHANGELOG 2015-04-08 14:46:06 +08:00
minggo 6892ec85ee [ci skip]update CHANGELOG 2015-04-08 09:47:01 +08:00
minggo 31b21b56fe [ci skip]update CHANGELOG 2015-04-07 18:18:22 +08:00
lvlong c9014e12b4 Merge branch 'v3' of github.com:super626/cocos2d-x into v3 
Conflicts:
	CHANGELOG
 2015-04-07 16:40:57 +08:00
minggo ec3a114767 [ci skip]update CHANGELOG 2015-04-07 15:30:37 +08:00
minggo c18ba06ec4 [ci skip]update CHANGELOG 2015-04-07 14:07:24 +08:00
lvlong 70048788ea modify change log. 2015-04-07 11:19:48 +08:00
minggo 9fb39284c1 [ci skip]update CHANGELOG 2015-04-07 10:35:09 +08:00
minggo 98682eefe6 [ci skip]update CHANGELOG 2015-04-07 09:52:45 +08:00
minggo 3736d1a6b5 [ci skip]update CHANGELOG 2015-04-07 09:33:32 +08:00
minggo 7a369abeb5 [ci skip]update CHANGELOG 2015-04-04 07:13:59 +08:00
minggo 940c3f2bde [ci skip]update CHANGELOG 2015-03-31 17:56:20 +08:00
minggo 7564e01314 [ci skip]update CHANGELOG 2015-03-31 11:58:09 +08:00
minggo 72f378db71 [ci skip]update CHANGELOG 2015-03-27 11:15:10 +08:00
minggo 0cab686c00 [ci skip]update CHANGELOG 2015-03-27 11:08:01 +08:00
minggo 66394db8ad [ci skip]update CHANGELOG 2015-03-25 16:18:43 +08:00
minggo 6a99fcfc1c [ci skip]update CHANGELOG 2015-03-25 13:42:39 +08:00
minggo 18ba721e97 [ci skip]update CHANGELOG 2015-03-25 13:40:58 +08:00
minggo 27c319b076 [ci skip]update CHANGELOG 2015-03-25 10:10:57 +08:00
Zhe Wang 0adedc7a75 Update CHANGELOG 
fix some typos and English syntax error. Well, my English is also poor. Native English speakers, please feel free to pull request to this changelog if you find something wrong.
 2015-03-23 20:51:08 +08:00
minggo 81c7b84746 [ci skip]update CHANGELOG 2015-03-23 11:11:49 +08:00
Zhe Wang 2d6d7f42f5 Update CHANGELOG 
fix a typo, Romanian languange -> Romanian language
 2015-03-21 22:47:00 +08:00
minggo 43a5a65ff4 [ci skip]update CHANGELOG 2015-03-19 21:24:36 +08:00
minggo a9cafb14cb [ci skip]update CHANGELOG 2015-03-19 21:23:16 +08:00
minggo f5b5521b8f [ci skip]update CHANGELOG 2015-03-16 14:59:26 +08:00
minggo f7624ecca9 [ci skip]update CHANGELOG 2015-03-16 14:54:06 +08:00
minggo d7dc44b86f [ci skip]update CHANGELOG 2015-03-16 14:51:07 +08:00
Huabing.Xu ffa63be60e Update CHANGELOG 2015-03-13 16:48:54 +08:00
Huabing.Xu ac9a5d28e6 Update CHANGELOG 2015-03-13 14:17:33 +08:00
minggo 773eedcaa5 [ci skip]update CHANGELOG 2015-03-11 15:52:01 +08:00
minggo 858178ad8e Merge pull request #10772 from super626/v3 
refactor init method
 2015-03-10 17:50:06 +08:00
minggo 749cb426cb [ci skip]update CHANGELOG 2015-03-10 09:56:06 +08:00
yangxiao 5131a23de4 solve conflict 2015-03-10 09:18:13 +08:00
yangxiao 2c468cbdc6 modify changelog 2015-03-09 17:46:17 +08:00
minggo 25dba56d68 [ci skip]update CHANGELOG 2015-03-09 17:14:06 +08:00
minggo 5999c487a1 [ci skip]update CHANGELOG 2015-03-09 16:43:54 +08:00
yangxiao d451e13c85 add changelog 2015-03-06 11:21:31 +08:00
minggo d092d829be [ci skip]update CHANGELOG 2015-02-28 11:19:07 +08:00
minggo 1a54c302c9 Merge pull request #10626 from super626/v3 
add changelog
 2015-02-27 11:55:35 +08:00
yangxiao 32b0bfeabe add changelog 2015-02-27 11:53:08 +08:00
minggo fdecd20610 [ci skip]update CHANGELOG 2015-02-26 18:12:02 +08:00
minggo 1828f7eb33 [ci skip]update CHANGELOG 2015-02-26 15:45:20 +08:00
minggo 614cb73c1a [ci skip]update CHANGELOG 2015-02-26 10:53:17 +08:00
minggo 31ac484b07 [ci skip]update CHANGELOG 2015-02-26 10:38:10 +08:00
minggo 21fd9113fd [ci skip]update CHANGELOG 2015-02-26 10:36:23 +08:00
minggo 638fa834f9 [ci skip]update CHANGELOG 2015-02-15 19:07:54 +08:00
minggo e276a2b7f0 [ci skip]update CHANGELOG 2015-02-12 15:42:28 +08:00
minggo 6d526b1a66 [ci skip]update CHANGELOG 2015-02-12 15:34:14 +08:00
minggo 1fa09a3af8 [ci skip]update CHANGELOG 2015-01-30 11:27:08 +08:00
minggo f30174bf67 [ci skip]update CHANGELOG 2015-01-29 13:57:27 +08:00
minggo 9a2b4e5e56 [ci skip]update CHANGELOG 2015-01-29 10:15:24 +08:00
minggo b41873bb7e [ci skip]update CHANGELOG 2015-01-28 15:20:22 +08:00
minggo 823ec8812f [ci skip]update CHANGELOG 2015-01-28 10:00:16 +08:00
minggo 81caa9f351 [ci skip] Update CHANGELOG 2015-01-26 18:02:00 +08:00
minggo d94c26006b [ci skip] Update CHANGELOG 2015-01-26 14:11:49 +08:00
minggo b722ea33da [ci skip] Update CHANGELOG 2015-01-26 13:55:57 +08:00
minggo 38a86ad18a [ci skip] Update CHANGELOG 2015-01-26 13:50:36 +08:00
minggo 0d872ae1d7 [ci skip] Update CHANGELOG 2015-01-26 09:49:36 +08:00
minggo 53754221e8 [ci skip] Update CHANGELOG 2015-01-23 16:17:53 +08:00
minggo c0c8af9248 [ci skip] Update CHANGELOG 2015-01-23 15:37:12 +08:00
minggo 938b5dc5c6 [ci skip] Update CHANGELOG 2015-01-23 12:04:55 +08:00
andyque 417f3db20a modify change log 2015-01-23 09:57:26 +08:00
minggo 0c8d10b8dd [ci skip] Update CHANGELOG 2015-01-22 09:49:41 +08:00
minggo 7eaa4fed5d [ci skip] Update CHANGELOG 2015-01-21 21:01:41 +08:00
minggo aab3de0b3e [ci skip] Update CHANGELOG 2015-01-21 16:27:55 +08:00
minggo b1e7d66294 [ci skip] Update CHANGELOG 2015-01-21 15:09:06 +08:00
minggo 4f982693b2 [ci skip] Update CHANGELOG 2015-01-21 11:20:38 +08:00
minggo 6426f31a03 [ci skip] Update CHANGELOG 2015-01-21 11:08:14 +08:00
minggo 6109a075f5 [ci skip] Update CHANGELOG 2015-01-21 10:12:17 +08:00
minggo fd824a4f60 [ci skip] Update CHANGELOG 2015-01-21 10:10:42 +08:00
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