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

457 Commits

Author SHA1 Message Date
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen fbe4e505fd Update AUTHORS [ci skip] 2013-06-13 15:01:52 +08:00
James Chen b429d1a387 Update AUTHORS [ci skip] 2013-06-13 14:54:22 +08:00
minggo ef319da264 Update AUTHORS 
[ti ignore]
 2013-06-11 21:50:02 +08:00
James Chen 13c70281f7 Update AUTHORS [ci skip] 2013-06-08 15:03:31 +08:00
James Chen e1b6832a79 Update AUTHORS [ci skip] 2013-06-08 10:59:32 +08:00
James Chen 96bcfcbf19 Update AUTHORS [ci skip] 2013-06-08 10:45:57 +08:00
James Chen c4b051a885 Update AUTHORS [ci skip] 2013-06-08 10:39:26 +08:00
James Chen 4f13ac2ea6 Update AUTHORS [ci skip] 2013-06-07 10:55:56 +08:00
James Chen 991daa8b65 Update AUTHORS [ci skip] 2013-06-07 10:47:03 +08:00
James Chen 8874699cbb Update AUTHORS [ci skip] 2013-06-04 17:17:04 +08:00
James Chen c678664085 Update AUTHORS [ci skip] 2013-06-04 17:12:13 +08:00
James Chen 5484583d82 Updating AUTHORS. 2013-06-04 15:09:20 +08:00
James Chen 22a0605342 Updating AUTHORS. 2013-06-04 15:08:06 +08:00
James Chen 0820013740 Update AUTHORS [ci skip] 2013-06-04 13:22:16 +08:00
James Chen a4802c3466 Update AUTHORS [ci skip] 2013-06-04 14:17:14 +09:00
minggo 9ca77def9d Update AUTHORS 
[ci ignore]
 2013-06-04 10:42:18 +08:00
minggo fdcd14594f Update AUTHORS 
[ci ignore]
 2013-05-30 15:00:17 +09:00
minggo 24b580adb6 Update AUTHORS 
[ci ignore]
 2013-05-30 10:42:17 +08:00
minggo 0487b782e7 Update AUTHORS 
[ci ignore]
 2013-05-30 10:35:30 +08:00
minggo 82e56774dd Update AUTHORS 
[ci ignore]
 2013-05-29 17:12:19 +08:00
minggo fdce4038e1 Update AUTHORS 
[ci ignore]
 2013-05-29 16:55:57 +08:00
minggo 0ca5d99a30 Update AUTHORS 
[ci ignore]
 2013-05-29 16:44:14 +08:00
minggo 7ac1a68968 Update AUTHORS 
[ci ignore]
 2013-05-22 10:42:40 +08:00
minggo d6b0170217 Update AUTHORS 
[ci ignore]
 2013-05-22 10:40:39 +08:00
James Chen 580457d909 Merge pull request #2596 from pyrasis/tizen_description 
Adding description for Tizen and Modify AUTHORS file. [ci skip]
 2013-05-21 00:40:31 -07:00
James Chen eccbbcb2a1 Update AUTHORS [ci skip] 2013-05-21 15:32:53 +08:00
Lee, Jae-Hong 9ac3de134b Adding description for Tizen platform and change order between Korean name and ID. 2013-05-21 15:13:25 +09:00
James Chen b20c002751 Update AUTHORS [ci skip] 2013-05-21 11:21:31 +08:00
James Chen 1e6e60a56f Update AUTHORS [ci skip] 2013-05-21 11:10:11 +08:00
James Chen 07c62519c2 Update AUTHORS [ci skip] 2013-05-20 21:21:17 +08:00
James Chen d7b97bea25 Update AUTHORS [ci skip] 2013-05-20 12:59:41 +09:00
minggo 2a0eb8b0f5 Update AUTHORS 
[ci ignore]
 2013-05-17 11:03:44 +08:00
minggo 245cf4b3d9 Update AUTHORS 
[ci ignore]
 2013-05-16 14:50:27 +08:00
minggo e45e08547b Update AUTHORS 
[ci ignore]
 2013-05-16 14:37:40 +08:00
minggo 1a577b13aa Update AUTHORS 2013-05-16 11:10:26 +08:00
minggo 392c33cb7a Update AUTHORS 2013-05-15 09:53:53 +08:00
James Chen 7f7ff26750 Update AUTHORS [ci skip] 2013-05-14 11:23:14 +08:00
James Chen bd8132d062 Update AUTHORS [ci skip] 2013-05-13 22:15:31 +08:00
James Chen 9842b1ae53 Update AUTHORS [ci skip]. 2013-05-13 21:32:04 +08:00
James Chen 21226da0f7 fixed #2150: Updating AUTHORS. 2013-05-13 17:58:51 +08:00
James Chen efaa625613 Update AUTHORS 2013-05-13 16:06:30 +08:00
James Chen 2ca0334765 Update AUTHORS 2013-05-13 11:48:02 +08:00
minggo 6de50e2420 Update AUTHORS 2013-05-13 11:40:30 +08:00
minggo b10e896423 Update AUTHORS 2013-05-13 10:55:12 +08:00
James Chen c25c89e5a8 Update AUTHORS 2013-05-09 18:36:25 +08:00
James Chen 7900979f0b Update AUTHORS 2013-05-09 08:55:22 +08:00
minggo c4965f8ca5 Update AUTHORS 2013-05-08 22:32:57 +08:00
minggo 87a15d1089 Update AUTHORS 2013-05-08 13:56:16 +08:00
James Chen 576ac4d803 Update AUTHORS 2013-05-08 09:59:40 +08:00
James Chen bdecd6f4a9 Update AUTHORS 2013-05-07 16:42:20 +08:00
James Chen d8d9e89601 Update AUTHORS 2013-05-07 15:55:35 +08:00
minggo df1c112541 Update AUTHORS 2013-05-07 15:29:43 +08:00
minggo 0a9e100496 Update AUTHORS 2013-05-07 14:59:28 +08:00
minggo fab0857d6e Update AUTHORS 2013-05-07 14:58:06 +08:00
James Chen fe5cae77e8 Update AUTHORS 2013-05-07 14:55:27 +08:00
minggo 1166a02e13 resolve conflict for #2505 2013-05-07 14:31:00 +08:00
James Chen ff610eea2f Update AUTHORS 2013-05-07 14:08:13 +08:00
James Gregory 0a4c4b13ef Merge fix 2013-05-06 21:30:03 -07:00
James Gregory d68d0e6d78 Add myself to authors so folks know who to blame :) 2013-05-06 21:29:44 -07:00
James Gregory c1ed7504fe Add myself to authors so folks know who to blame :) 2013-05-06 21:29:41 -07:00
James Chen 363550167a Update AUTHORS 2013-05-06 21:17:53 -07:00
James Gregory a2a394ebf4 Add myself to authors so folks know who to blame :) 2013-05-06 21:17:22 -07:00
James Gregory 45c832e550 Add myself to authors so folks know who to blame :) 2013-05-06 21:00:39 -07:00
minggo 877e6032dc Update AUTHORS 2013-05-07 11:08:53 +08:00
James Chen dc4673a8b3 Update AUTHORS 2013-05-07 11:04:08 +08:00
minggo e6afc9a180 Update AUTHORS 2013-05-06 18:03:35 +08:00
minggo 265168dac2 Update AUTHORS 2013-05-06 14:57:51 +08:00
minggo 2c9c5a02e5 Update AUTHORS 2013-05-06 14:54:12 +08:00
minggo 9c1dfa12c8 Update AUTHORS 2013-05-06 14:46:22 +08:00
James Chen 0868a18751 Update AUTHORS 2013-05-06 11:04:42 +08:00
minggo 26081961c4 Update AUTHORS 2013-05-06 10:20:20 +08:00
minggo 587dfb8e9f Update AUTHORS 2013-05-04 23:56:29 +08:00
minggo f7053d0f9d Update AUTHORS 2013-05-02 09:20:52 +08:00
minggo cd6d74f8b1 Update AUTHORS 2013-05-02 09:07:01 +08:00
minggo 60e4730122 Update AUTHORS 2013-04-29 23:26:18 +08:00
minggo 159e33f202 Update AUTHORS 2013-04-29 23:03:31 +08:00
minggo 38e96cbe24 Update AUTHORS 2013-04-27 23:53:31 +08:00
James Chen ec26e52278 Update AUTHORS 2013-04-25 10:37:36 +08:00
James Chen 827f3d6482 Update AUTHORS 2013-04-19 10:46:56 +08:00
James Chen 69d73d476e Update AUTHORS 2013-04-19 10:25:48 +08:00
James Chen e1e6f7acb9 Update AUTHORS 2013-04-19 10:03:45 +08:00
James Chen 0ea0ad6382 Update AUTHORS 2013-04-18 15:32:18 +08:00
minggo 9d939ee686 Update AUTHORS 2013-04-18 10:12:06 +08:00
James Chen ee8f8f0de4 Update AUTHORS 2013-04-18 09:45:19 +08:00
minggo 2d92ba4d6a Update AUTHORS 2013-04-17 15:44:02 +08:00
James Chen 3ecdb66553 Update AUTHORS 2013-04-17 13:01:47 +08:00
James Chen 19b06c6b5d Update AUTHORS 2013-04-17 12:58:21 +08:00
James Chen f478da6e2f Update AUTHORS 2013-04-15 23:11:57 +08:00
James Chen d1b1c6972b Update AUTHORS 2013-04-15 13:40:02 +08:00
James Chen d89b5cbcb2 Merge pull request #2370 from dumganhar/iss2054-s9sp-anchorpoint-ccb 
Fixed #2054: AnchorPoint property of CCScale9Sprite doesn't work in CCBReader.
 2013-04-14 20:54:02 -07:00
James Chen 7a676982db Updating AUTHORS. 2013-04-15 11:51:47 +08:00
James Chen 233a987265 Update AUTHORS 2013-04-15 11:12:44 +08:00
James Chen 028bba3959 Update AUTHORS 2013-04-15 10:47:17 +08:00
James Chen 9dcb69d53b Update AUTHORS 2013-04-13 17:49:58 +08:00
minggo 1e689f6be8 Update AUTHORS 2013-04-11 10:34:29 +08:00
James Chen 448096cbfd Updating AUTHORS. 2013-04-10 16:40:59 +08:00
James Chen 0c0cea791b Update AUTHORS 2013-04-10 15:54:00 +08:00
James Chen d252cd4cff Update AUTHORS 2013-04-10 14:41:27 +08:00
James Chen 223ff18c56 Update AUTHORS 2013-04-10 12:52:13 +08:00
James Chen 59d8356eae Update AUTHORS 2013-04-09 12:57:07 +08:00
James Chen f50b26dff4 Update AUTHORS 2013-04-09 11:47:54 +08:00
James Chen f81c0d0483 Update AUTHORS 2013-04-08 22:50:48 +08:00
James Chen 935b7af11c Merge branch 'openal' of https://github.com/azmeuk/cocos2d-x into azmeuk-openal 
Conflicts:
	AUTHORS
 2013-04-08 17:53:14 +08:00
James Chen 54977fe444 Update AUTHORS 2013-04-08 17:34:56 +08:00
James Chen 52f5c7c07d Update AUTHORS 2013-04-08 17:01:16 +08:00
James Chen 309be9b690 Update AUTHORS 2013-04-08 14:57:15 +08:00
minggo d126cd8e5f Update AUTHORS 2013-04-08 10:09:23 +08:00
minggo 26d69fa9b2 Update AUTHORS 2013-04-08 10:03:56 +08:00
minggo 7456c5d791 Update AUTHORS 2013-04-07 10:12:04 +08:00
James Chen af6f0c1616 Update AUTHORS 2013-04-04 10:00:49 +08:00
James Chen ff1568d813 Update AUTHORS 2013-04-03 22:38:51 +08:00
James Chen 8d5ec65cc8 Update AUTHORS 2013-04-03 11:18:15 +08:00
minggo e30559b038 Update AUTHORS 2013-04-02 13:52:34 +08:00
minggo ee1365c13f Update AUTHORS 2013-04-02 10:59:48 +08:00
James Chen 65720983d8 Update AUTHORS 2013-04-01 13:52:42 +08:00
James Chen 8d5ff2b911 Update AUTHORS 2013-03-29 17:16:03 +08:00
Éloi Rivard 2fca3b618f Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into openal 2013-03-29 09:37:32 +01:00
James Chen 8380eec235 Update AUTHORS 2013-03-29 11:59:21 +08:00
Éloi Rivard 8c013fe619 * Basic Linux OpenAL support. 2013-03-28 12:07:09 +01:00
James Chen 4e37161c7a Update AUTHORS 2013-03-28 10:10:01 +08:00
James Chen 166ffbd218 Update AUTHORS 2013-03-26 10:12:44 +08:00
James Chen f1a52c2df8 Update AUTHORS 2013-03-25 12:02:40 +08:00
James Chen 79f88fcf77 Update AUTHORS 2013-03-24 17:08:13 +08:00
James Chen 80e863097c Update AUTHORS 2013-03-20 09:56:13 +08:00
James Chen 97a91c5294 Update AUTHORS 2013-03-19 13:00:10 +08:00
minggo a3ea9b782a Update AUTHORS 2013-03-19 10:00:39 +08:00
James Chen d9ee848246 Update AUTHORS 2013-03-15 10:38:11 +08:00
James Chen 8924eaf34e Update AUTHORS 2013-03-15 10:09:24 +08:00
James Chen 384ec64a88 Update AUTHORS 2013-03-14 14:51:07 +08:00
James Chen 0bccb2caff Update AUTHORS 2013-03-11 14:15:52 +08:00
James Chen faf4e63ee4 Update AUTHORS 2013-03-11 13:43:49 +08:00
James Chen 6ac16d9db5 Update AUTHORS 2013-03-11 11:19:54 +08:00
James Chen 8b56396ee2 Update AUTHORS 2013-03-11 11:06:12 +08:00
James Chen b8a97463fe Update AUTHORS 2013-03-11 10:52:57 +08:00
minggo 73c168239c Update AUTHORS 2013-03-08 12:52:21 +08:00
minggo ee156bd898 Update AUTHORS 2013-03-07 11:12:49 +08:00
minggo 21722da7c4 Update AUTHORS 2013-03-06 14:43:46 +08:00
minggo 2e17e8c98b Update AUTHORS 2013-03-05 14:08:23 +08:00
James Chen 288f8ced59 Update AUTHORS 2013-03-04 11:16:11 +08:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
Zhe Wang 7469fcf033 Fix typo in AUTHORS 
Jianfeng Zhou (NetGragon) -> Jianfeng Zou (NetDragon)
 2013-03-02 22:14:09 +08:00
James Chen 201fda1f58 Update AUTHORS 2013-02-25 22:55:13 +08:00
James Chen 953cbcc82b Update AUTHORS 2013-02-25 10:33:03 +08:00
James Chen af75651abc Update AUTHORS 2013-02-23 10:35:58 +08:00
James Chen 2b7c4348dc Update AUTHORS 2013-02-22 16:20:24 +08:00
James Chen 49fc92e112 Update AUTHORS 2013-02-22 16:19:52 +08:00
James Chen b230afa6bf Update AUTHORS 2013-02-22 11:04:13 +08:00
minggo 86e9cfb782 Update AUTHORS 2013-02-22 10:10:30 +08:00
James Chen a3b4bdaecd Update AUTHORS 2013-02-22 09:57:54 +08:00
James Chen ed19b66f48 Update AUTHORS 2013-02-18 18:22:54 +08:00
James Chen 87f5e51621 Update AUTHORS 2013-02-16 11:50:57 +08:00
James Chen 2c0eab24a9 Update AUTHORS 2013-02-16 11:09:25 +08:00
minggo d2f6d1198d Update AUTHORS 2013-02-16 09:57:30 +08:00
James Chen 9d4117bbec Update AUTHORS 2013-02-07 11:26:21 +08:00
James Chen 92c7e14257 Update AUTHORS 2013-02-07 11:19:25 +08:00
minggo 64a107d2f6 Update AUTHORS 2013-02-03 11:19:35 +08:00
James Chen 15002030c2 Update AUTHORS 2013-02-01 16:11:58 +08:00
James Chen ba3b2b7aa6 Update AUTHORS 2013-01-30 14:26:56 +08:00
James Chen 9b21aac263 Update AUTHORS 2013-01-24 10:31:45 +08:00
James Chen 7aa1c0152e Updated AUTHORS. 2013-01-21 11:37:14 +08:00
minggo 591cd4a401 Update AUTHORS 2013-01-14 19:24:27 +08:00
James Chen 441d1d9920 Update AUTHORS 2013-01-14 11:35:13 +08:00
James Chen 02a1be178a Update AUTHORS 2013-01-09 23:01:20 +08:00
minggo 4bcc352379 Update AUTHORS 2013-01-04 11:33:38 +08:00
James Chen 38a1e52bed Update AUTHORS 2012-12-10 17:31:27 +08:00
James Chen d99a278c23 Update AUTHORS 2012-12-07 10:45:06 +08:00
fape ce87451fbc cosmetic AUTHORS 2012-12-06 10:39:42 +01:00
James Chen 2ec34d6011 Update AUTHORS 2012-12-06 10:30:46 +08:00
minggo 6bf52b22b8 Update AUTHORS 2012-12-06 09:41:23 +08:00
minggo c620b0f5bf Update AUTHORS 2012-12-05 14:45:06 +08:00
fape ccf134864e update AUTHORS 2012-12-02 17:28:16 +01:00
James Chen 5d5eda1b3d Update AUTHORS 2012-11-12 11:08:19 +08:00
minggo 3eb2e7cd85 Update AUTHORS 2012-11-12 10:57:53 +08:00
minggo f9dac4d804 Update AUTHORS 2012-11-07 13:43:01 +08:00
James Chen 6f8187a20e Updated AUTHORS. 2012-10-31 15:15:37 +08:00
minggo c99c9baf6d Update AUTHORS 2012-10-25 17:07:18 +08:00
minggo 77c2f530f3 Update AUTHORS 2012-10-22 09:52:07 +08:00
minggo f0e7d5a87b Update AUTHORS 2012-10-17 09:33:56 +08:00
minggo 9d9f69186e Update AUTHORS 2012-09-29 15:39:38 +08:00
Walzer 70e16a5835 Update AUTHORS 2012-09-26 19:31:01 +08:00
minggo 25d3f4215f update AUTHORS and CHANGELOG 2012-09-26 16:04:22 +08:00
minggo d5565eeceb update AUTHORS and CHANGELOG 2012-08-28 14:03:00 +08:00
qingyun dc35596ce9 add greathqy to AUTHORS 2012-08-04 18:12:39 +08:00
Walzer 824162f69e add Nat Weiss, author of mac port into AUTHORS 2012-07-30 23:35:58 +08:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
minggo a9e3931f47 Update AUTHORS 2012-05-29 10:34:15 +08:00
Di Wu 6e7a012f0e Added some detail in AUTHORS 2012-05-29 09:16:30 +08:00
Walzer df98ed4792 Merge pull request #914 from walzer/gles20 
javascript binding!
 2012-05-24 03:48:14 -07:00
Walzer fecab7f3b1 fixed #1258, all js test cases passed. 2012-05-24 18:34:00 +08:00
Nicolas Gramlich ff71f07ac3 Updated AUTHORS. 2012-05-21 17:38:36 -07:00
Walzer 1a73064055 issue #1205, refactor the tricky cpp reflection to easier approach, add cocos2d::extension namespace for CCBReader, add doxygen comments. Todo: CCB support on android 2012-05-07 18:14:15 +08:00
James Chen b6a1e89aa5 fixed #1211: Translated Chinese comments to English for CCTextureWatcher and CCListView. And Updated AUTHORS file. 2012-05-03 11:09:27 +08:00
James Chen 74690603cf issue #1114: Updated AUTHORS file. 2012-04-17 17:27:49 +08:00
minggo e3bc4471ff update authors, changelog 2012-03-02 15:39:03 +08:00
minggo 0cedaae58c update AUTHORS 2012-02-21 17:04:50 +08:00
James Chen f8ff388e8d rename Resource(in HelloLua and HelloWorld project) and Res(in tests project) to Resources. 
test ok on win32 and android
 2012-02-14 18:04:56 +08:00
gzito e3c5d6886e Added authors info 2011-12-19 22:57:04 +01:00
dumganhar 0a9e922e8f #fixed 908: Merge marmalade to latest cocos2d-x source 
add blackberry author.
 2011-12-13 10:09:06 +08:00
Eli Yukelzon 132a4cf7ef Update AUTHORS 2011-11-01 13:43:52 +02:00
Walzer 350d42c105 update authors, use the format of "real name (nickname)" 2011-10-21 09:34:02 +08:00
Walzer 8179d79061 update ChangeLog & Authors for v0.9.2 2011-10-20 17:49:43 +08:00
minggo 82af2051e0 add ciaranj into AUTHORS 2011-09-28 14:55:42 +08:00
Walzer 82afec843b changelog & authors for 0.9.1 2011-08-17 20:12:46 +08:00
Walzer d73e8a5fd0 update authors, add zhuoshishun 2011-08-17 11:36:09 +08:00
Walzer b3538884ea fix typo in authors & changelog 2011-07-13 22:36:37 +08:00
Walzer 4fb5633c77 add authors 2011-07-13 13:41:34 +08:00