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

566 Commits

Author SHA1 Message Date
James Chen cf7377a5bb Update AUTHORS 2014-11-25 16:17:28 +08:00
James Chen 34550422c0 Update AUTHORS 2014-11-21 09:37:07 +08:00
minggo d2fd1a1152 [ci skip]Update Authors 2014-11-09 23:27:13 +08:00
minggo 46972eb477 [ci skip]Update Authors 2014-11-05 17:53:38 +08:00
minggo 363aa4d57f [ci skip]Update Authors 2014-10-30 12:45:22 +08:00
minggo 74fe1d86e6 [ci skip]Update Authors 2014-10-28 22:02:56 +08:00
minggo 34a7f511f0 [ci skip]Update Authors 2014-10-27 11:55:26 +08:00
minggo a60d2ded2d [ci skip]Update Authors 2014-10-27 11:50:02 +08:00
minggo 8eb0f7fa5e [ci skip]Update Authors 2014-10-27 11:30:48 +08:00
minggo b3ade76650 [ci skip]Update Authors 2014-10-27 11:17:07 +08:00
minggo 4f8f40cfd9 [ci skip]Update Authors 2014-10-20 14:10:56 +08:00
minggo fd38fd20ea [ci skip]Update Authors 2014-10-15 21:28:00 +08:00
minggo 2184d4207c [ci skip]Update Authors 2014-10-14 13:54:10 +08:00
minggo c4361f6d92 [ci skip]Update Authors 2014-10-13 10:22:14 +08:00
minggo 1359518d7b [ci skip]Update Authors 2014-10-10 18:32:21 +08:00
minggo f3fd6c8f5a [ci skip]Update Authors 2014-09-29 18:05:10 +08:00
minggo bfac4b4793 [ci skip]Update Authors 2014-09-29 17:53:10 +08:00
minggo bca00dac1a [ci skip]Update Authors 2014-09-28 17:30:19 +08:00
minggo d36e57f129 [ci skip]Update Authors 2014-09-25 14:49:51 +08:00
minggo ebc632fd1f [ci skip] 2014-09-25 13:45:00 +08:00
minggo f9fb673df9 [ci skip] 2014-09-25 13:43:12 +08:00
minggo 8ce2b152c2 [ci skip] 2014-09-24 10:58:06 +08:00
minggo dd264316d2 [ci skip] 2014-09-22 09:31:57 +08:00
minggo 21af9a4701 [ci skip] 2014-09-17 10:24:20 +08:00
minggo fe7af9e5e8 [ci skip] 2014-09-15 09:51:16 +08:00
minggo 561ec7ea7b [ci skip] 2014-09-11 15:09:12 +08:00
minggo f2788c234f [ci skip] 2014-09-09 10:29:32 +08:00
minggo 9aefbeaed5 [ci skip] 2014-09-04 22:37:15 +08:00
minggo a416eb7298 [ci skip] 2014-09-04 13:40:40 +08:00
minggo a6ec956bc7 [ci skip] 2014-09-02 13:43:14 +08:00
andyque cd031c4493 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/Android.mk
	cocos/ui/Android.mk
 2014-08-29 10:25:24 +08:00
andyque 892c8d4455 add gin0606 as AUTHORS 2014-08-29 10:24:30 +08:00
minggo e4c58267eb [ci skip] 2014-08-28 14:27:20 +08:00
minggo 8ecce427aa [ci skip] 2014-08-28 11:17:22 +08:00
minggo 6458a1fc6d [ci skip] 2014-08-20 13:37:23 +08:00
minggo 01165951de [ci skip] 2014-08-20 11:24:53 +08:00
minggo 2c4fe854fb [ 2014-08-20 10:28:48 +08:00
minggo 2fe45ec6cc [ci skip] 2014-08-20 10:26:53 +08:00
minggo 83ccfa0faa [ci skip] 2014-08-20 09:50:39 +08:00
minggo de004e80c2 [ci skip] 2014-08-19 09:53:18 +08:00
minggo e59283343a Merge pull request #7751 from zawasp/win32_minimize 
add minimize / restore for desktop (win32, linux, mac)
 2014-08-15 15:00:13 +08:00
minggo 34ac767dc1 [ci skip] 2014-08-15 13:41:11 +08:00
Mircea Rila d9a0c6a2ad replace tabs with spaces 2014-08-14 10:48:09 +03:00
Mircea Rila 5a42a94d21 update AUTHORS 2014-08-12 22:31:28 +03:00
minggo eaac80b900 [ci skip] 2014-08-08 14:08:43 +08:00
minggo dcb1a1001c [ci skip] 2014-08-08 11:53:12 +08:00
minggo 83aa94761d [ci skip] 2014-08-08 10:45:23 +08:00
minggo f51d6c8e3e [ci skip] 2014-08-07 10:37:11 +08:00
minggo b1b3c80603 [ci skip] 2014-08-07 10:22:09 +08:00
minggo 786e4a8b7e [ci skip] 2014-08-06 14:39:12 +08:00
minggo 58f7807960 [ci skip] 2014-08-06 14:34:23 +08:00
minggo 6885f997e9 [ci skip] 2014-08-06 14:32:03 +08:00
minggo d1b30b45bd [ci skip] 2014-08-06 14:20:33 +08:00
minggo b7e1c4ab17 [ci skip] 2014-08-06 09:57:50 +08:00
minggo 2ece4b90fb [ci skip] 2014-08-05 13:32:55 +08:00
minggo 0ff00ddbf7 [ci skip] 2014-08-05 11:53:37 +08:00
minggo b6ceb507c0 [ci skip] 2014-08-05 09:33:37 +08:00
minggo b96f91730a [ci skip] 2014-08-04 16:32:36 +08:00
minggo 0c9b960de3 [ci skip] 2014-08-01 12:01:12 +08:00
minggo 152a9a0464 [ci skip] 2014-07-28 14:02:16 +08:00
minggo 3688ff5d23 [ci skip] 2014-07-28 11:36:50 +08:00
minggo a6d5f7cca8 [ci skip] 2014-07-28 10:44:30 +08:00
minggo 4a969c4afe [ci skip] 2014-07-25 23:14:18 +08:00
minggo 5ac75dadcc [ci skip] 2014-07-25 11:40:10 +08:00
minggo c50c884d80 [ci skip] 2014-07-25 11:23:49 +08:00
minggo c60be03243 [ci skip] 2014-07-24 22:06:30 +08:00
minggo 3732feb14b [ci skip] 2014-07-23 18:36:38 +08:00
minggo f690299ccd [ci skip] 2014-07-23 14:25:14 +08:00
minggo d68e7eb465 [ci skip] 2014-07-22 21:23:16 +08:00
Rene Klacan f7dacaca63 name change in authors 2014-07-21 10:16:35 +02:00
minggo a278642ecc [ci skip] 2014-07-21 13:57:20 +08:00
minggo f3e106c7ad [ci skip] 2014-07-17 22:08:02 +08:00
minggo 258361b429 [ci skip] 2014-07-17 11:53:47 +08:00
minggo 9a3886dca6 [ci skip] 2014-07-17 11:47:38 +08:00
minggo 415fcfd4ab [ci skip] 2014-07-15 15:09:40 +08:00
minggo f07270454d [ci skip] 2014-07-14 13:59:43 +08:00
minggo de1533190e [ci skip] 2014-07-08 20:37:38 +08:00
minggo 74e7ed3c7d [ci skip] 2014-07-08 11:02:22 +08:00
minggo 7c18824adf [ci skip] 2014-06-27 16:27:09 +08:00
minggo aff4d179a6 [ci skip] 2014-06-26 22:58:36 +08:00
minggo 11f6cf3b5b [ci skip] 2014-06-26 16:09:19 +08:00
minggo 2c4f0f4340 [ci skip] 2014-06-25 17:58:01 +08:00
minggo bc7d2cd4f8 [ci skip] 2014-06-25 17:37:18 +08:00
minggo 2c6abb94d4 [ci skip] 2014-06-25 14:43:27 +08:00
minggo f1ea2e9332 [ci skip] 2014-06-19 22:13:27 +08:00
minggo 2f959a3f87 [ci skip] 2014-06-19 20:48:45 +08:00
minggo 76856af709 [ci skip] 2014-06-18 10:36:53 +08:00
minggo d1ca81634a [ci skip] 2014-06-12 16:18:22 +08:00
minggo f6913fc931 [ci skip] 2014-06-12 16:12:03 +08:00
minggo 77fdd124a1 [ci skip] 2014-06-12 15:05:31 +08:00
minggo f4afb93211 [ci skip] 2014-06-09 15:28:13 +08:00
minggo de15833e6a [ci skip] 2014-06-09 15:18:22 +08:00
minggo bd00e17190 [ci skip] 2014-06-06 13:47:38 +08:00
minggo c5f96aaa3b [ci skip] 2014-06-04 14:33:48 +08:00
minggo 96bb950d96 [ci skip] 2014-06-04 14:14:09 +08:00
minggo 7fd59baa2f [ci skip] 2014-06-04 14:08:19 +08:00
minggo d4d2bbfdfd [ci skip] 2014-05-28 15:26:29 +08:00
minggo 3e521624f3 [ci skip] 2014-05-27 16:24:11 +08:00
minggo f88c221861 [ci skip] 2014-05-27 10:42:56 +08:00
minggo 4b072ee1d3 [ci skip] 2014-05-27 10:20:50 +08:00