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

9983 Commits

Author SHA1 Message Date
James Chen b88a222fc5 Updating multi-platform-xxx template for iOS and Mac. 2013-06-04 20:37:24 +08:00
James Chen ce20c48b78 Merge pull request #2751 from dumganhar/template-fix-master 
Updating multi-platform-xxx template for iOS and Mac.
 2013-06-04 05:12:54 -07:00
James Chen 3b673547cc Updating multi-platform-xxx template for iOS and Mac. 2013-06-04 19:49:03 +08:00
James Chen ce2421779d Merge pull request #2750 from CocosRobot/updategeneratedsubmodule_1370342158 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-04 04:23:32 -07:00
CocosRobot 0bc9c19e76 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 10:36:03 +00:00
zhangbin 17d0ea1c09 fixed #2254 : Add sample code for plugin weibo on iOS. 2013-06-04 18:32:42 +08:00
minggo 5ee6e9d982 Merge pull request #2749 from chengstory/master_Components 
Master components
 2013-06-04 03:31:42 -07:00
zhangbin 65dfb60442 issue #2254 : Add plugin weibo for iOS. 2013-06-04 18:31:42 +08:00
chengstory a5f8e2c27e no message 2013-06-04 17:54:05 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
James Chen d2648d6166 Merge pull request #2748 from dumganhar/iss2253-refactor-editbox-master 
fixed #2253: [CCEditBox iOS] Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
 2013-06-04 02:19:18 -07:00
James Chen 8874699cbb Update AUTHORS [ci skip] 2013-06-04 17:17:04 +08:00
sunxiaoyu d41a78453a Update CCEditBoxImplIOS.mm 
02c6647306
 2013-06-04 17:16:45 +08:00
James Chen c678664085 Update AUTHORS [ci skip] 2013-06-04 17:12:13 +08:00
James Chen 7b98808aa7 Merge pull request #2640 from sunxiaoyu/patch-1 
fixed #2253: Adding UITextField only when keyboard was opened, removing it when keyboard was closed.
 2013-06-04 02:08:42 -07:00
René Klačan f66e12f414 Merge pull request #4 from cocos2d/develop 
pull request from main repo
 2013-06-04 02:05:36 -07:00
James Chen d421c262ef Merge pull request #2746 from dumganhar/update-spine-runtime-master 
fixed #2252: Updating spine-runtime to the latest version. [master]
 2013-06-04 00:40:05 -07:00
James Chen b27524adfe Merge pull request #2745 from dumganhar/update-spine-runtime-develop 
fixed #2252: Updating spine-runtime to the latest version. [develop]
 2013-06-04 00:39:49 -07:00
minggo d63a7d9b30 Merge pull request #2644 from longlene/develop 
correct the library path
 2013-06-04 00:14:12 -07:00
minggo 7bd9717944 make lua works ok on iOS 2013-06-04 15:12:16 +08:00
James Chen 5484583d82 Updating AUTHORS. 2013-06-04 15:09:20 +08:00
James Chen 1e04c4e743 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:09:20 +08:00
James Chen 1610854902 fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:09:19 +08:00
James Chen 22a0605342 Updating AUTHORS. 2013-06-04 15:08:06 +08:00
James Chen 37df435089 fixed #2252: Fixing a bug that stdio.h is in c++ namespace. 2013-06-04 15:05:27 +08:00
James Chen 988269f9fa fixed #2252: Updating iOS and mac project configuration. 2013-06-04 15:03:10 +08:00
flaming0 1d3516da44 Update for spine runtime. 2013-06-04 14:47:19 +08:00
flamingo a81f2b1303 Update Android.mk 2013-06-04 14:47:10 +08:00
flamingo 66943ee667 Update Makefile 
For nacl (spine runtime)
 2013-06-04 14:47:02 +08:00
flamingo b806376671 Update Android.mk 2013-06-04 14:46:55 +08:00
flaming0 39ce9b4813 Update spine runtime 2013-06-04 14:46:46 +08:00
flaming0 3daf21996c Update for spine runtime 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 14:46:31 +08:00
James Chen 13308b492e Update generate-jsbindings.sh [ci skip], push to an unique branch. 2013-06-04 14:17:28 +08:00
James Chen 43791a5e2a Update generate-jsbindings.sh [ci skip], push to an unique branch. 2013-06-04 15:15:50 +09:00
minggo c21812b270 Merge pull request #2729 from ricardoquesada/timeval_64bit_fix 
cc_timeval works on 64bit machines, like OS X
 2013-06-03 22:47:45 -07:00
Ricardo Quesada dccc4a3814 adds mising tests + cosmetic changes 2013-06-03 22:47:28 -07:00
James Chen 5d89a0cd0c Merge branch 'develop' into update-spine-runtime-develop 
Conflicts:
	extensions/proj.win32/libExtensions.vcxproj.filters
 2013-06-04 13:46:05 +08:00
Ricardo Quesada cc771da2c2 Merge branch 'develop' into testmenu_sorted 2013-06-03 22:35:55 -07:00
Ricardo Quesada cd52912f66 Main menu from test is sorted alphabetically 
Code was refactored. Now it is super easy to add a new test.
No need to add it in 3 different places
 2013-06-03 22:33:52 -07:00
James Chen b3e00a2105 Merge pull request #2741 from CocosRobot/updategeneratedsubmodule_1370323397 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-03 22:25:33 -07:00
James Chen 22053d4b85 Merge pull request #2742 from dumganhar/master 
fixed #2251: A logical error in CCDrawNode::drawPolygon.
 2013-06-03 22:24:37 -07:00
CocosRobot be08d6c81d [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-04 05:23:21 +00:00
James Chen 0820013740 Update AUTHORS [ci skip] 2013-06-04 13:22:16 +08:00
xyhl515 69ccb9b724 A problem of CCDrawNode::drawPolygon outline 2013-06-04 13:22:06 +08:00
James Chen a4802c3466 Update AUTHORS [ci skip] 2013-06-04 14:17:14 +09:00
James Chen 932d6dfb85 Merge pull request #2726 from xyhl515/develop 
fixed #2251: A logical error in CCDrawNode::drawPolygon.
 2013-06-03 22:15:13 -07:00
James Chen c9b51b5ea1 Merge pull request #2740 from dumganhar/iss2247-proxy-function-master 
fixed #2247: Using functions instead of macros to speeding up building for JSB project.
 2013-06-03 22:05:25 -07:00
James Chen a597323734 Merge pull request #2739 from dumganhar/iss2247-proxy-function-develop 
fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes].
 2013-06-03 22:02:45 -07:00
James Chen 6cc3ba9a5d fixed #2247: Using functions instead of macros to speeding up building for JSB projects. [For not auto binding glue codes]. 2013-06-04 13:02:02 +08:00
James Chen 64dec0df56 fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-04 13:01:50 +08:00