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

6426 Commits

Author SHA1 Message Date
James Chen e8bf21e6a6 fixed #1543: The CCLayerGradient background of CocosBuilderTest can't be shown. 2012-10-31 18:00:51 +08:00
James Chen 711de87808 Merge pull request #1526 from dumganhar/gles20 
Updated sample/TestCpp/Resources/animations/grossini-aliases.plist.
 2012-10-31 02:30:20 -07:00
James Chen 379b70c15d Updated sample/TestCpp/Resources/animations/grossini-aliases.plist. 2012-10-31 17:08:28 +08:00
James Chen c3ebf837a8 Merge pull request #1521 from dualface/gles20 
fixed #1540: fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output.
 2012-10-31 00:26:49 -07:00
James Chen df4f55db9c Merge pull request #1525 from dumganhar/gles20 
Updated AUTHORS.
 2012-10-31 00:16:50 -07:00
James Chen 6f8187a20e Updated AUTHORS. 2012-10-31 15:15:37 +08:00
James Chen 188f59a16c Merge pull request #1524 from dumganhar/gles20 
fixed #1538: Logic error in CCControlHuePicker::checkSliderPosition.
 2012-10-30 23:37:37 -07:00
James Chen 1a512488fa fixed #1538: Logic error in CCControlHuePicker::checkSliderPosition. 
The distance between current location and center should compare with radius rather than dimension.
 2012-10-31 14:32:24 +08:00
YuLei Liao 4fe16a262b fix incorrect delete 2012-10-31 14:08:28 +08:00
minggo 2a796567e0 Merge pull request #1523 from minggo/gles20 
invoke base class's onExit() to avoid memory leak
 2012-10-30 20:35:02 -07:00
minggo ad64beb769 invoke base class's onExit() to avoid memory leak 2012-10-31 11:33:53 +08:00
James Chen 5cecdb2eee Merge pull request #1522 from dumganhar/iss1537-ff17.0.b3 
fixed #1537: Upgraded spiderMonkey library to FF17.0b3, and updated some api calling in ScriptingCore.cpp.
 2012-10-30 20:12:52 -07:00
James Chen b1ec3c8ab5 fixed #1537: Upgraded spidermonkey to FF17.0beta3 for win32 and iOS ports. 2012-10-31 11:03:42 +08:00
YuLei Liao 01866ddc95 fix win32 CCLuaLog memory leaks, and invalid Console UTF8 output 2012-10-31 11:02:36 +08:00
James Chen 8edf9826b1 issue #1537: Made samples/MoonWarriors/proj.android/build_native.sh executable. 2012-10-31 10:40:42 +08:00
James Chen 5141c83fd1 issue #1537: Upgraded spiderMonkey library to FF17.0b3 for android port. 2012-10-31 10:33:43 +08:00
James Chen bdbb70bea5 Merge branch 'gles20' of https://github.com/funkaster/cocos2d-x into js-surith-gnu 2012-10-31 10:04:35 +08:00
James Chen 6f2364b769 Merge pull request #1520 from FlowerpotGames/gles20 
fixed #1536: CCControl* should not respond to touches if the control is not visible.
 2012-10-30 18:54:05 -07:00
Ed Bartley f424da2a7e * CCControl* should not respond to touches if the control is not visible. 2012-10-30 11:10:05 -04:00
minggo f7df5b7df9 Merge pull request #1519 from minggo/gles20 
Do some fix while testing
 2012-10-30 03:23:48 -07:00
minggo af12b8dfc2 revert CCSpriteBatchNode::removeSpriteFromAtlas() 2012-10-30 18:20:47 +08:00
James Chen 0f69da10b2 Merge pull request #1518 from dumganhar/gles20 
Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh.
 2012-10-30 02:56:01 -07:00
James Chen 1538ad4e78 Updated jenkins_scripts/mac/android/generate-js-cxx-bindings.sh. 
The local repo needs to be updated in Jenkins command before executing this script.
So commented some codes.
 2012-10-30 17:54:48 +08:00
minggo fe8c1573f2 set MoonWarriors to be portrait on iOS 5.1 2012-10-30 11:38:24 +08:00
minggo 4d8f1aa678 Merge pull request #1420 from sburavtsov/gles20-fixSpriteBatch 
Fix removeTileAt crash corresponding this post: http://www.cocos2d-x.org...
 2012-10-29 20:12:21 -07:00
James Chen a7f3bb1c7a Merge pull request #1516 from dumganhar/update-luabindings 
Updated LuaBindings codes since CCEGLViewProtocol::getSize has been rena...
 2012-10-29 19:37:20 -07:00
James Chen 8ed7d63309 Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize. 2012-10-30 10:35:19 +08:00
James Chen 997b8f4079 Merge pull request #1515 from dumganhar/iss1531-updateTransform 
fixed #1531: The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode.
 2012-10-29 19:28:30 -07:00
James Chen 9f6d263c15 fixed #1531: The CCSprite::updateTransform() function needs to inherited from a base function on the CCNode. 2012-10-30 10:24:28 +08:00
James Chen 3cbbb7e4b2 Merge pull request #1513 from CocosRobot/updategeneratedsubmodule_1351506160 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2012-10-29 03:51:06 -07:00
James Chen f0ee1851fa Merge pull request #1514 from CocosRobot/update-jenkins-script 
Updated jenkins script for auto-gen jsbinding codes.
 2012-10-29 03:50:39 -07:00
CocosRobot bf255f6162 Updated jenkins script for auto-gen jsbinding codes. 2012-10-29 18:47:03 +08:00
CocosRobot e3304e44ba cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2012-10-29 18:22:46 +08:00
minggo 811a56d0a2 Merge pull request #1512 from minggo/moonwarrior 
Moonwarrior
 2012-10-29 02:57:03 -07:00
minggo 7073481077 fixed #1527: modify some project setting 2012-10-29 17:54:31 +08:00
minggo 9a2a535fef fixed #1527:add correct icon for xcode project 2012-10-29 16:59:23 +08:00
minggo 2a118a4172 fixed #1527:re-create MoonWarriors xcode project to fix the bug that it will not run on simulator sometimes 2012-10-29 16:47:09 +08:00
James Chen 9113702903 Merge pull request #1510 from dumganhar/gles20 
fixed #1312: Upgraded libcurl to 7.26.0 for linux port
 2012-10-29 01:24:29 -07:00
James Chen 00e23e45b1 Merge pull request #1511 from dumganhar/iss1530-js-improvements 
issue #1530: Some JSBinding improvements.
 2012-10-29 01:14:34 -07:00
James Chen d4b7c55ce6 issue #1530: Added resources of cocos2d-html5-tests for TestJavascript project of IOS port. 2012-10-29 16:06:06 +08:00
James Chen d97ce3e7e9 issue #1530: Removed the dependence of Chipmunk for MoonWarriors project setting. 2012-10-29 15:41:39 +08:00
James Chen 2cfad104fa issue #1530: Corrected the logic of CClayer::registerWithTouchDispatcher function. 2012-10-29 15:38:44 +08:00
Rohan Kuruvilla 8f026d0b21 Fixing Javascript bindings Android makefile to include extensions 2012-10-29 15:15:00 +08:00
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