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

7608 Commits

Author SHA1 Message Date
minggo c75e440e22 issue #1686:synchronized RenderTexture 2013-02-28 16:35:42 +08:00
James Chen 9d4c128391 tab ~> 4 spaces 2013-02-28 16:06:07 +08:00
James Chen 16422d7194 issue #1686: Updated LayerTest. 2013-02-28 16:03:55 +08:00
James Chen 69a746fc8b issue #1686: Synchronizing LabelTest 2013-02-28 15:57:15 +08:00
James Chen dbe1e2e427 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 2013-02-28 15:37:15 +08:00
James Chen 88fe33e927 Sync ActionsTest. 2013-02-28 15:32:27 +08:00
minggo 545882cb81 issue #1686:synchronized ShaderTest 2013-02-28 15:01:41 +08:00
minggo f5e334d9e3 issue #1686:synchronized Texture2DTest 2013-02-28 14:54:09 +08:00
James Chen 5abec07fb5 Updated ActionsTest. 2013-02-28 14:42:45 +08:00
James Chen e4b6495aac Updated ActionEaseTest. 2013-02-28 14:42:32 +08:00
minggo 47830a5ef4 Merge pull request #7 from dumganhar/iss1686-synchronize 
fix for conflict of project.pbxproj and updated with upstream.
 2013-02-27 21:43:17 -08:00
James Chen 8ba46c574a fix for conflict of project.pbxproj. 2013-02-28 13:37:45 +08:00
James Chen 56340f9555 Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize 
Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
 2013-02-28 13:01:45 +08:00
minggo 63e4091bfa fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
James Chen 489e33932c Merge pull request #2036 from jxhgzs/Dependences_project 
fixed #1755: Adding CocosDenshion project for iOS.
 2013-02-27 19:17:44 -08:00
James Chen 75f05f2c1e Merge pull request #2059 from yuezang/iss1425-luatest 
issue #1425: fixed bugs in lua testcase.
 2013-02-27 19:05:30 -08:00
minggo 0070371045 issue #1686:synchronize CCLabelBMFont.cpp 2013-02-28 10:37:47 +08:00
jiang xiaohua efc5a4bf2f del include path 2013-02-28 10:35:56 +08:00
wangshuai b4e13af460 issue #1425: 
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease() 
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
 2013-02-28 10:23:30 +08:00
minggo 14a35cff11 issue #1686:synchronize CCMenu.cpp 2013-02-28 10:15:09 +08:00
James Chen 4aaf6195c4 Merge pull request #2057 from CocosRobot/updategeneratedsubmodule_1362016278 
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
 2013-02-27 18:00:07 -08:00
CocosRobot dfc1cb8139 cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings 2013-02-28 09:51:31 +08:00
James Chen b17b1109a0 Merge pull request #2055 from dumganhar/iss1753-spidermonkey-19 
fixed #1753: Upgrading SpiderMonkey to Firefox19.0.
 2013-02-27 17:47:50 -08:00
James Chen 3f74cd8190 fixed #1753: Adding ccUTF8.h/.cpp for MAC, LINUX and MARMALADE port. 2013-02-28 09:44:37 +08:00
minggo cd4f18c48f issue #1686:synchronize CCLayer.cpp 2013-02-27 18:21:35 +08:00
James Chen 0132d8abbf Merge pull request #2056 from dumganhar/iss1754-tableview-reload 
fixed #1754: Wrong offset of the container in CCTableView.
 2013-02-27 01:54:08 -08:00
James Chen 89398f9acf fixed #1754: Wrong offset of the container in CCTableView. 2013-02-27 17:52:50 +08:00
minggo 8dc431425c issue #1686:synchronize CCMenuItem.cpp 2013-02-27 17:23:39 +08:00
James Chen 3a465739c3 Updated cocos2d-js-tests. 2013-02-27 17:06:48 +08:00
James Chen 537abaec42 fixed #1753: Android works ok now. 2013-02-27 16:57:36 +08:00
minggo 7eb93128c2 issue #1686:synchronize CCMotionStreak.cpp 2013-02-27 16:52:19 +08:00
minggo 00e978bbe9 issue #1686:synchronize CCParticleExample.cpp 2013-02-27 16:46:05 +08:00
minggo 2b0ff4ec62 issue #1686:synchronize CCParticleSystem.cpp 2013-02-27 16:26:42 +08:00
minggo 24e8664700 issue #1686:synchronize CCParticleSystemQuad.cpp 2013-02-27 16:24:33 +08:00
minggo 510c54ffb0 issue #1686:synchronize CCPhysicsSprite.cpp 2013-02-27 16:12:28 +08:00
minggo d4abc272c0 issue #1686:synchronize CCPhysicsSprite.cpp 2013-02-27 16:04:03 +08:00
minggo 4b8708b762 issue #1686:synchronize CCProgressTimer.cpp 2013-02-27 15:52:14 +08:00
James Chen 0d70e6f92f issue #1753: Win32 works ok. 2013-02-27 15:45:23 +08:00
minggo 088bc959f6 issue #1686:synchronize CCRenderTexture.cpp 2013-02-27 15:44:36 +08:00
minggo 94076a5b9c issue #1686:synchronize CCSprite.cpp 2013-02-27 15:30:49 +08:00
James Chen 8f58f082f3 Updated the submodule reference of cxx-generator. 2013-02-27 15:17:19 +08:00
James Chen 473e8e6139 issue #1753: Upgrading SpiderMonkey to Firefox19.0, iOS works ok. 2013-02-27 15:16:49 +08:00
minggo f571d66ed7 issue #1686:synchronize CCNode.cpp 2013-02-27 14:48:19 +08:00
minggo 8ed8def97f Merge branch 'iss1686-sync-rc0a' of https://github.com/dumganhar/cocos2d-x into iss1686-synchronize 2013-02-27 14:25:24 +08:00
minggo 8288e2124e issue #1686:synchronize CCTextureCache.cpp 2013-02-27 11:35:38 +08:00
minggo 28388deee3 Merge https://github.com/cocos2d/cocos2d-x into iss1686-synchronize 2013-02-27 11:23:29 +08:00
minggo d83c1f5c4c Merge pull request #2054 from minggo/iss1637-retina-issue 
fixed #1637:fix mac retina display and labelttf
 2013-02-26 19:12:30 -08:00
minggo 81b349d9ce fixed #1637:fix mac retina display and labelttf 2013-02-27 11:10:42 +08:00
minggo 7a45599fc2 Merge pull request #2052 from minggo/iss1752-link-error 
fixed #1752:use unstripped version to resolve link error
 2013-02-26 18:45:45 -08:00
minggo d983dd505c fixed #1752:use unstripped version to resolve link error 2013-02-27 10:44:34 +08:00