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

382 Commits

Author SHA1 Message Date
James Chen cfe43cbd1b Update AUTHORS [ci skip] 2013-09-23 18:42:07 +08:00
James Chen 6480b2c95d Update AUTHORS [ci skip] 2013-09-22 22:07:09 +08:00
James Chen 5907e56601 Update AUTHORS [ci skip] 2013-09-16 21:00:24 +08:00
minggo 410125feba [skip ci] 2013-09-10 10:06:06 +08:00
James Chen 3942c12293 Update AUTHORS [ci skip] 2013-08-28 17:31:37 +08:00
James Chen 0d349d75d0 Update AUTHORS [ci skip] 2013-08-20 16:38:03 +08:00
James Chen d79e6dee7a Update AUTHORS [ci skip] 2013-08-20 14:25:45 +08:00
James Chen 0d5042948c Update AUTHORS 2013-08-20 10:04:46 +08:00
James Chen 310cf70114 Update AUTHORS [ci skip] 2013-08-16 11:31:26 +08:00
James Chen 0594bbb1ff closed #2501: Update AUTHORS [ci skip] 2013-08-08 10:57:40 +08:00
Éloi Rivard 13afa85cb9 Refactored toplevel Makefile 2013-08-05 10:42:56 +02:00
James Chen 40332299d1 Merge pull request #3368 from azmeuk/emscripten 
Multi-resolution emscripten html template.
 2013-08-05 01:10:08 -07:00
James Chen 915bb16a72 Update AUTHORS [ci skip] 2013-08-05 15:50:01 +08:00
James Chen 00af9cfa29 Update AUTHORS [ci skip] 2013-08-05 15:47:50 +08:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02:00
minggo ae3af70594 [ci skip] 2013-08-02 11:38:07 +08:00
minggo 5d4aa7bc6d [ci skip] 2013-08-02 11:34:36 +08:00
James Chen f7b9d887bc Update AUTHORS [ci skip] 2013-08-02 10:45:41 +08:00
minggo 26af301776 [ci skip] 2013-08-02 09:26:42 +08:00
James Chen 31d8200e05 Update AUTHORS [ci skip] 2013-07-31 22:10:08 +08:00
minggo d108eca41a [ci skip] 2013-07-31 09:27:32 +08:00
James Chen 3633ebfe0c Merge pull request #3224 from azmeuk/emscripten 
emscripten keyboard support
 2013-07-29 22:50:27 -07:00
minggo 627544418a [ci skip] 2013-07-30 12:01:19 +08:00
Éloi Rivard 4b190c3ddf added emscripten keyboard support 2013-07-29 10:56:09 +02:00
minggo d55c400c0e [ci skip] 2013-07-29 07:52:53 +08:00
minggo 118e339e62 [ci skip] 2013-07-29 07:49:37 +08:00
James Chen f144df7f45 Update AUTHORS [ci skip] 2013-07-26 20:49:59 +08:00
Éloi Rivard 95b826d82a Fixed a bug in emscripten file utils. 2013-07-26 14:19:47 +02:00
Éloi Rivard 3ffc026c6c Added some guards in file utils. 2013-07-26 14:19:20 +02:00
James Chen 306587167d Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	AUTHORS
 2013-07-25 11:28:48 +08:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
James Chen debd1965c9 Merge branch 'deprecation' of https://github.com/azmeuk/cocos2d-x into iss2404-ext-deprecated 
Conflicts:
	cocos2dx/include/CCDeprecated.h
 2013-07-24 16:53:14 +08:00
minggo 9b3f4a604b [ci skip] 2013-07-24 12:04:59 +08:00
minggo a5ea0fe8a7 Update AUTHORS 2013-07-24 11:04:35 +08:00
Éloi Rivard da23893821 Updated AUTHORS 2013-07-23 08:59:03 +02:00
James Chen 8ead893e72 Update AUTHORS [ci skip] 2013-07-23 10:08:15 +08:00
James Chen e03ddfcc06 Update AUTHORS [ci skip] 2013-07-22 18:18:32 +08:00
James Chen 384d3be378 Update AUTHORS 2013-07-22 11:44:39 +08:00
James Chen 9c36d3072e Update AUTHORS 2013-07-17 18:12:43 +08:00
James Chen 7e107a8841 Update AUTHORS [ci skip] 2013-07-17 14:26:10 +08:00
James Chen 84d520c7f9 Update AUTHORS [ci skip] 2013-07-16 17:37:50 +08:00
James Chen a9b1ac829f Update AUTHORS [ci skip] 2013-07-16 14:01:02 +08:00
James Chen 196aa59f37 Update AUTHORS [ci skip] 2013-07-16 13:44:05 +08:00
James Chen 388fb08e28 Update AUTHORS [ci skip] 2013-07-16 13:37:53 +08:00
James Chen 14976a92d6 Update AUTHORS [ci skip] 2013-07-16 10:42:38 +08:00
James Chen c937824051 Update AUTHORS [ci skip] 2013-07-15 11:54:43 +08:00
James Chen 0b6f09f08f Update AUTHORS [ci skip] 2013-07-15 11:42:07 +08:00
minggo e038a7480e [ci skip] 2013-07-15 11:38:56 +08:00
James Chen cfc12d780c Update AUTHORS [ci skip] 2013-07-11 17:11:18 +08:00
minggo 9262af69f2 [ci skip] 2013-07-10 16:01:39 +08:00
Éloi Rivard 05ae6f8518 Fixed some warnings 2013-07-09 16:33:21 +02:00
Éloi Rivard e6354bbf0a Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
minggo 38bb041064 [ci skip] 2013-07-09 10:45:32 +08:00
James Chen f17e6c3d14 Update AUTHORS [ci skip] 2013-07-09 10:21:11 +08:00
James Chen d71db1d582 Update AUTHORS [ci skip] 2013-07-06 15:12:48 +08:00
minggo be422efca2 [ci skip] 2013-07-04 14:29:34 +08:00
James Chen 3fe56a9b49 Update AUTHORS [ci skip] 2013-07-04 10:24:29 +08:00
James Chen 5b698c88cc Update AUTHORS [ci skip] 2013-07-04 10:01:26 +08:00
minggo 63c14b7e19 [ci skip] 2013-07-03 16:01:19 +08:00
minggo ab5e7b4b61 [ci skip] 2013-07-03 15:44:28 +08:00
minggo 3e91ab0133 [ci skip] 2013-07-03 15:31:55 +08:00
minggo eddd2dd839 [ci skip] 2013-07-03 10:43:04 +08:00
James Chen fd72f87b7f Update AUTHORS [ci skip] 2013-07-01 17:13:58 +08:00
James Chen 728f6cd484 Update AUTHORS [ci skip] 2013-07-01 16:56:22 +08:00
minggo 9697c5af9a [ci ignore] 2013-07-01 10:14:12 +08:00
James Chen b4ec9efaf9 Update AUTHORS [ci skip] 2013-06-27 11:50:39 +08:00
James Chen fe8113bd46 Update AUTHORS [ci skip] 2013-06-27 11:35:08 +08:00
James Chen 456f422c8a Update AUTHORS [ci skip] 2013-06-26 14:44:24 +09:00
James Chen bd3106fef2 Update AUTHORS [ci skip] 2013-06-26 13:59:09 +09:00
James Chen 3074dde2e1 Update AUTHORS [ci skip] 2013-06-25 14:18:00 +08:00
James Chen d1e26a46f0 Update AUTHORS [ci skip] 2013-06-21 11:00:14 +09:00
minggo 245dad8cd8 [ti ignore] 2013-06-21 09:25:14 +08:00
James Chen bcd2701b84 Update AUTHORS [ci skip] 2013-06-19 20:05:38 +08:00
James Chen 7b9ee7c8ed Update AUTHORS [ci skip] 2013-06-19 15:57:24 +09:00
James Chen 98c6594eb3 Update AUTHORS [ci skip] 2013-06-19 14:27:13 +08:00
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