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

6033 Commits

Author SHA1 Message Date
Rohan Kuruvilla 6773dc4154 Adding object roots for extra parameter of CallFunc and schedule 2012-10-29 15:14:25 +08:00
Rohan Kuruvilla 5760ea305c Fixing CallFuncN bindings to properly pass optional third parameter 2012-10-29 15:14:11 +08:00
James Chen 25a858ae2b Merge pull request #4 from minggo/update-curl 
Update curl
 2012-10-29 00:11:54 -07:00
Rohan Kuruvilla 094d52664d Fixing bug in CCNode::copy bindings. Fixes MoonWarriors crash 2012-10-29 15:10:29 +08:00
James Chen 1ede7b6434 Modifying action/schedules cleanup, ignoring libjs_static.a of debugging version. 2012-10-29 15:10:13 +08:00
Rohan Kuruvilla d6753f8a2f Adding accelerometer setInterval support to Android 2012-10-29 15:08:16 +08:00
Rohan Kuruvilla ecee64d07c Adding accelerometer setInterval support to iOS 2012-10-29 15:08:07 +08:00
Rohan Kuruvilla a409fc0164 Fixing CallFunc bindings to support easier cleanup 2012-10-29 15:07:27 +08:00
Rohan Kuruvilla f8fc7328d7 Fixing bug in bindings for MenuItemImage 2012-10-29 15:06:56 +08:00
Rohan Kuruvilla c24acd4733 Changing ScriptingCore flow of execution of targetted Touch events 2012-10-29 15:06:34 +08:00
Rohan Kuruvilla 7ede1373f7 Adding function to cleanup actions and schedule to ScriptingCore 2012-10-29 15:06:10 +08:00
Rohan Kuruvilla a2ee6c3761 Changing Touch API in cocos2d-x. Also change ScriptEngine callbacks for targetted Touches 2012-10-29 15:01:30 +08:00
Rohan Kuruvilla 16d5659b17 Adding ScriptingEngine callback for onCleanup event 2012-10-29 15:00:52 +08:00
minggo 5aad6eeb9b Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into update-curl 2012-10-29 14:44:26 +08:00
minggo e992408a86 issue #1312:update libcurl for linux 64 2012-10-29 14:39:44 +08:00
James Chen 45783574fd Upgraded libcurl to 7.26.0 for linux port(32bit). 2012-10-29 11:27:25 +08:00
James Chen 0d43d53eb7 Merge pull request #1509 from dumganhar/gles20 
issue #1312: Upgraded libcurl to 7.26.0 for windows port.
 2012-10-28 19:59:30 -07:00
James Chen 6d34e66018 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-10-29 10:51:58 +08:00
James Chen 9673b20775 issue #1312: Upgraded libcurl to 7.26.0 for windows port. 2012-10-29 10:49:28 +08:00
James Chen 44262fd0cf Merge pull request #1507 from Xyzyx101/gles20 
fixed a couple typos
 2012-10-27 08:12:41 -07:00
Andrew Perrault 138ea49b0e fixed a couple typos 2012-10-27 09:58:49 -04:00
minggo 076e64d84d Merge pull request #1506 from minggo/update-libcurl 
fix a compiling error
 2012-10-25 21:05:43 -07:00
minggo 9d530c8d54 fix a compiling error 2012-10-26 12:04:45 +08:00
minggo 78ce10d45e Merge pull request #1505 from minggo/update-libcurl 
Update libcurl
 2012-10-25 19:13:23 -07:00
minggo 77b69262c8 not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews 2012-10-26 10:10:34 +08:00
James Chen ebb46e2629 Merge pull request #1504 from dumganhar/gles20 
Updating submodule reference to latest autogenerated bindings.
 2012-10-25 19:05:54 -07:00
James Chen 0ce4f61bb6 Updating submodule reference to latest autogenerated bindings. 2012-10-26 10:04:29 +08:00
James Chen c322c9847e Merge pull request #1503 from dumganhar/gles20 
Updated the submodule of tools/cxx-generator.
 2012-10-25 19:01:02 -07:00
James Chen 132d927f18 Updated the submodule of tools/cxx-generator. 2012-10-26 09:57:01 +08:00
Mat Hopwood 2b265929e2 Marmalade Sample data removed and merged changes 
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
 2012-10-25 21:40:37 +01:00
minggo c99c9baf6d Update AUTHORS 2012-10-25 17:07:18 +08:00
minggo a09367ca7e Merge pull request #1491 from sburavtsov/HttpClient-destroy-fix 
Fix for correct unscheduling and instance destruction
 2012-10-25 02:05:34 -07:00
James Chen bd6eb68797 Merge pull request #1501 from dumganhar/gles20 
Updated the submodule of cocos2d-html5-test.
 2012-10-25 01:34:47 -07:00
James Chen f1da845bf9 Updated the submodule of cocos2d-html5-test. 2012-10-25 16:33:34 +08:00
minggo 81ff3d3495 issue #1312: use --strip-unneeded parameter to strip lib 2012-10-25 16:30:14 +08:00
minggo 84e48ed7e7 issue #1312:update libcurl for android and strip all libs 2012-10-25 14:32:28 +08:00
James Chen 0103b820f2 Merge pull request #1500 from dumganhar/gles20 
Updated submodule for JS-Bindings auto-gen codes.
 2012-10-24 20:42:31 -07:00
James Chen 26f7b36797 update submodule for JS-Bindings auto-gen codes. 2012-10-25 11:40:24 +08:00
Rolando Abarca 463ae31180 upgrades to new spidermonkey API 
FF beta - this fixes the auto-compartment issue
 2012-10-24 11:14:15 -07:00
James Chen 1829d57aa7 Merge pull request #1497 from dumganhar/gles20 
fixes a compilation error in TestCpp.
 2012-10-24 01:29:59 -07:00
James Chen e07ca43c3d fixes a compilation error in TestCpp. 2012-10-24 16:28:54 +08:00
James Chen 630bd1b25f Merge pull request #1496 from dumganhar/gles20 
Removed some unused codes about "enableRetinaDisplay".
 2012-10-24 01:14:39 -07:00
James Chen ffe52a157f Removed some unused codes about "enableRetinaDisplay". 2012-10-24 16:12:40 +08:00
James Chen 7d9b3d3969 Merge pull request #1488 from dumganhar/iss1520-comments 
fixed #1520: Added comments for using multiresolution in HelloCpp.
 2012-10-24 01:00:39 -07:00
James Chen 210a1bf724 Merge pull request #1492 from dumganhar/iss1522-clip 
fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
 2012-10-23 19:27:45 -07:00
James Chen b93cc8a17d Merge pull request #1490 from dumganhar/iss1521-relative-pos 
fixed #1521: Using relative coordinates in TestCpp.
 2012-10-23 19:17:13 -07:00
James Chen 53ebff0bcb Merge pull request #3 from minggo/zoom-scale 
fixed #1512: add VisableRect.cpp/h into iOS and mac project
 2012-10-23 19:15:11 -07:00
minggo 38cd1ecd46 fixed #1512: add VisableRect.cpp/h into iOS and mac project 2012-10-24 10:09:25 +08:00
James Chen c797af0fe9 fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints. 2012-10-24 10:03:19 +08:00
Mat Hopwood 6074dea6cc Marmalade fixes and optimisation of TestCpp assets 
* .gitignore added to folders that contain app.icf to ensure that these
files get included in the repo
* Made TestCPP compatible with Marmalade
* Removed data folder from TestCPP example, now points at the samples
Resource folder
 2012-10-24 01:03:06 +01:00