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

8149 Commits

Author SHA1 Message Date
Rohan Kuruvilla 3d7e8f0d84 Fixing CocosPlayer AppDelegate to include openGL bindings. Also adding JNI stubs for changing orientation 2013-04-09 15:29:35 -07:00
James Chen c7bbbeb751 Merge pull request #2337 from dumganhar/master 
Fixing a typo.
 2013-04-09 03:09:37 -07:00
James Chen 9c563a883f Fixing a typo. 2013-04-09 18:08:43 +08:00
James Chen 783e7492c6 Merge pull request #2335 from dumganhar/master 
Updating iOS template.
 2013-04-09 00:32:03 -07:00
James Chen 854944c272 Updating iOS template. 2013-04-09 15:30:37 +08:00
James Chen eecdf3ad82 Merge pull request #2334 from CocosRobot/updategeneratedsubmodule_1365490150 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-04-08 23:52:11 -07:00
CocosRobot 40c5280527 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-04-09 14:49:20 +08:00
James Chen 95a907aeac Merge pull request #2333 from dumganhar/master 
[PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx.
 2013-04-08 23:48:29 -07:00
James Chen 90ad5410c7 [PLUGIN] Removing the bindings glue codes for CCApplication since it was bound in cocos2dx. 2013-04-09 14:46:49 +08:00
James Chen a2c71f8e89 Exposing CCApplication to js. 2013-04-09 14:42:12 +08:00
James Chen b8ea3dfe99 Merge pull request #2332 from dumganhar/master 
cxx-generator ~> bindings-generator.
 2013-04-08 22:58:04 -07:00
James Chen 6d57d691f5 Updating bindings-generator. 2013-04-09 13:56:45 +08:00
James Chen 0d5d2e54fd cxx-generator ~> bindings-generator. 2013-04-09 13:47:12 +08:00
folecr e91ec3ede5 Clean up linked libraries 
* LOCAL_LD_LIBS and LOCAL_EXPORT_LDLIBS are the same
 * Remove unused -lEGL
 2013-04-08 22:46:25 -07:00
James Chen ab0549b575 cxx-generator ~> bindings-generator for plugin. 2013-04-09 13:41:24 +08:00
James Chen 59d8356eae Update AUTHORS 2013-04-09 12:57:07 +08:00
James Chen 55ec9de216 Merge pull request #2326 from harikrishnar/master 
fixed #2037: Major problem with initWithObjects method of CCArray.
 2013-04-08 21:50:33 -07:00
James Chen f50b26dff4 Update AUTHORS 2013-04-09 11:47:54 +08:00
James Chen 8e4848b243 Merge pull request #2328 from elmiro/readlink 
fixed #2036: Correction of passed buffer size to readlink ...
 2013-04-08 20:46:08 -07:00
James Chen 7114aef751 Merge pull request #2331 from dumganhar/master 
Updating genbindings.sh, cxx-generator ~> bindings-generator.
 2013-04-08 20:06:04 -07:00
James Chen d29ff33df1 Updating genbindings.sh, cxx-generator ~> bindings-generator. 2013-04-09 11:03:39 +08:00
James Chen e1ba283264 Merge pull request #2330 from dumganhar/rename-cxx-generator 
Renaming tools/cxx-generator to tools/bindings-generator.
 2013-04-08 19:39:59 -07:00
James Chen eef8e854c1 Updating .gitmodules. 2013-04-09 10:34:45 +08:00
James Chen cb4eb733c6 Renaming tools/cxx-generator to tools/bindings-generator. 2013-04-09 10:32:18 +08:00
minggo ac43ff7584 Merge pull request #2325 from minggo/userdefault-hotfix 
fixed #2034:make CCUserDefault compatible with previous version on Android and iOS
 2013-04-08 18:34:20 -07:00
elMiro 0f6e2daf31 Correction of passed buffer size to readlink and verification of result return by readlink. 2013-04-09 00:25:31 +02:00
harikrishnar 24c9668a1b Added a getter to get the size of the data 
Added a getter to get the size of the data
 2013-04-09 00:28:50 +05:30
harikrishnar cd37569729 CCControlButton responds even if its parent is invisible 
The Buttons should not respond if its invisble or if its made invisible
by any of its parent in the hierarchi
 2013-04-09 00:27:53 +05:30
hkrishna 38cb350d39 Problem with initWithObjects of CCArray 
A new unused array was created instead of using the instance on which
the method was called
 2013-04-09 00:08:41 +05:30
James Chen f81c0d0483 Update AUTHORS 2013-04-08 22:50:48 +08:00
James Chen 5e2f1e0bd6 Merge pull request #2272 from Weeds/saxparser-fix 
fixed #2035: fixed potential crash in CCSaxParser
 2013-04-08 07:49:36 -07:00
minggo d3aa718b22 fixed #2034:make CCUserDefault compatible with previous version on Android and iOS 2013-04-08 21:35:43 +08:00
James Chen 7b03c17bd9 Merge pull request #2324 from dumganhar/iss2032-openal-linux 
fixed #2032: OpenAL support for linux
 2013-04-08 03:15:35 -07:00
James Chen 33213e5177 Merge pull request #2323 from natural-law/master 
fixed #1471: Optimize the sample code.
 2013-04-08 03:09:14 -07: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
zhangbin df5ea4b7a2 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-04-08 17:41:52 +08:00
James Chen 54977fe444 Update AUTHORS 2013-04-08 17:34:56 +08:00
James Chen 401b3dca4d Merge pull request #2282 from DarraghCoy/ccfileutils_create_with_contents_of_file_fix 
fixed #2031: Fix CCFileUtils 'createXXXXWithContentsOfFile' path lookup issue.
 2013-04-08 02:33:23 -07:00
zhangbin 5201723b0f Optimize the sample code of HelloIAP. 2013-04-08 17:32:58 +08:00
James Chen 52f5c7c07d Update AUTHORS 2013-04-08 17:01:16 +08:00
James Chen c3a177e5e6 Merge pull request #2268 from Weeds/ccscheduler-fix 
fixed #2003: Fixed potential crash in CCScheduler::removeHashElement.
 2013-04-08 02:00:22 -07:00
James Chen 309be9b690 Update AUTHORS 2013-04-08 14:57:15 +08:00
James Chen d3eed7fd1f Merge pull request #2279 from sjchao/master 
fixed #2030: Fixing a display bug when a scrollView nested in another scrollView. The parent's scissor rect need to be considered, when setting the scissor rect in the subScrollView.
 2013-04-07 23:55:55 -07:00
James Chen 7a45e1ddd1 Merge pull request #2322 from dumganhar/iss1592-update-uthash 
fixed #1592: Updating uthash to v1.9.8.
 2013-04-07 23:31:31 -07:00
James Chen 0bab4609ab fixed #1592: Removing some marco definitions in CCTexture2D.pkg. 2013-04-08 14:14:35 +08:00
zhangbin 8e4567a784 Add custom ignore file for plugin directory 2013-04-08 14:10:46 +08:00
James Chen 4e2819e86d Fixing a warning. 2013-04-08 13:51:24 +08:00
James Chen 1e0cdee9d4 Merge pull request #2321 from natural-law/master 
fixed #1471: Update JS binding for plugin.
 2013-04-07 21:07:23 -07:00
zhangbin 6b69b57c72 Add sample code for using plugin by JS script. 2013-04-08 11:58:52 +08:00
James Chen 831dfb6ade Merge remote-tracking branch 'origin/iss1592-update-uthash' into iss1592-update-uthash 2013-04-08 11:56:10 +08:00