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

753 Commits

Author SHA1 Message Date
minggo 35533abec0 [ci skip]update CHANGELOG 2015-05-25 16:51:46 +08:00
minggo 41f84c9f11 [ci skip]update CHANGELOG 2015-05-25 16:50:25 +08:00
minggo 42fba34d62 [ci skip]update CHANGELOG 2015-05-25 16:32:52 +08:00
minggo ca3c42362b [ci skip]update CHANGELOG 2015-05-25 15:20:13 +08:00
minggo de5cdb34d5 [ci skip]update CHANGELOG 2015-05-22 14:40:05 +08:00
minggo d7a00b686a [ci skip]update CHANGELOG 2015-05-22 09:53:47 +08:00
minggo ef8e7958cd [ci skip]update CHANGELOG 2015-05-21 10:37:35 +08:00
minggo 6205d043b0 [ci skip]update CHANGELOG 2015-05-20 13:41:59 +08:00
minggo e365c33379 [ci skip]update CHANGELOG 2015-05-20 11:22:51 +08:00
minggo fedd3c46e1 [ci skip]update CHANGELOG 2015-05-19 11:44:06 +08:00
minggo 2489ca176e [ci skip]update CHANGELOG 2015-05-15 10:14:26 +08:00
minggo f090c12030 [ci skip]update CHANGELOG 2015-05-14 10:21:11 +08:00
minggo 9e02b230c7 [ci skip]update CHANGELOG 2015-05-13 17:03:37 +08:00
minggo a587b28e38 Merge pull request #11792 from super626/v3 
particle3d can not be seen when added to scene with terrain
 2015-05-13 09:38:21 +08:00
minggo 14605301ef [ci skip]update CHANGELOG 2015-05-13 09:33:56 +08:00
yangxiao 2c2589c34f modify change log 2015-05-12 13:25:47 +08:00
minggo 38b0cf7bf1 [ci skip]update CHANGELOG 2015-05-08 17:04:52 +08:00
minggo b6ec472985 [ci skip]update CHANGELOG 2015-05-08 10:43:40 +08:00
minggo 761a35cca2 [ci skip]update CHANGELOG 2015-05-07 09:36:49 +08:00
minggo 14f8c75c8c [ci skip]update CHANGELOG 2015-05-07 09:32:50 +08:00
minggo 1d03579966 [ci skip]update CHANGELOG 2015-05-06 10:03:00 +08:00
minggo 35c25edf37 [ci skip]update CHANGELOG 2015-05-06 09:55:43 +08:00
minggo f843466e8e [ci skip]update CHANGELOG 2015-05-05 18:36:46 +08:00
minggo 0ccdf00726 [ci skip]update CHANGELOG 2015-05-05 09:37:05 +08:00
minggo 3a4a0a47c0 [ci skip]update CHANGELOG 2015-05-05 09:34:33 +08:00
minggo dbc036fef4 [ci skip]update CHANGELOG 2015-04-30 10:51:09 +08:00
minggo d96e19dea8 [ci skip]update CHANGELOG 2015-04-29 09:46:31 +08:00
minggo b9a994f06d [ci skip]update CHANGELOG 2015-04-28 16:44:24 +08:00
minggo e7bbb2b04c [ci skip]update CHANGELOG 2015-04-28 16:42:04 +08:00
minggo 3c2528d323 [ci skip]update CHANGELOG 2015-04-28 16:40:39 +08:00
minggo 2596c8dd28 [ci skip]update CHANGELOG 2015-04-28 16:39:18 +08:00
minggo 30a646f769 [ci skip]update CHANGELOG 2015-04-27 17:41:40 +08:00
minggo 2441e1290f [ci skip]update CHANGELOG 2015-04-27 17:17:36 +08:00
minggo d932d1e7e1 [ci skip]update CHANGELOG 2015-04-27 10:17:56 +08:00
minggo bdce0d955b [ci skip]update CHANGELOG 2015-04-21 17:12:16 +08:00
minggo e55e19923b [ci skip]update CHANGELOG 2015-04-20 13:37:19 +08:00
minggo 707c7170b1 [ci skip]update CHANGELOG 2015-04-20 10:37:40 +08:00
minggo 133ca38513 [ci skip]update CHANGELOG 2015-04-20 09:56:10 +08:00
minggo 425b2b62e1 [ci skip]update CHANGELOG 2015-04-17 17:59:13 +08:00
minggo cfb232f2b0 [ci skip]update CHANGELOG 2015-04-17 17:58:52 +08:00
minggo 5606610b32 [ci skip]update CHANGELOG 2015-04-17 15:24:50 +08:00
minggo 83b9975578 [ci skip]update CHANGELOG 2015-04-16 18:17:37 +08:00
minggo b4acf1beb8 [ci skip]update CHANGELOG 2015-04-16 14:35:10 +08:00
minggo 1803822465 Merge pull request #11446 from super626/v3 
Fix PU clone bug
 2015-04-16 10:13:37 +08:00
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