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

643 Commits

Author SHA1 Message Date
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