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

491 Commits

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