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

148 Commits

Author SHA1 Message Date
James Chen bd535c3c1c issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode. 2012-06-11 11:53:17 +08:00
James Chen 33ea7905a5 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/platform/ios/CCFileUtils.mm
 2012-06-11 11:01:36 +08:00
James Chen c95cbb1774 issue #1310: Used CCLabelAtlas instead of CCLabelBMFont to display FPS,SPF status. 
Updated CCFileUtils, added some method, such as sharedFileUtils/purgeFileUtils/purgeCachedEntries.
Fixed a bug in CCDirector, made retina mode work correctly.
 2012-06-11 10:59:57 +08:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
James Chen 371b3f9938 issue #1310: Tests project updated!. 2012-06-08 17:34:15 +08:00
James Chen 26cf81e42e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/CCScheduler.h
	cocos2dx/include/ccTypes.h
 2012-06-08 14:14:13 +08:00
James Chen c5cf23c859 issue #1310: First commit since sync to rc2. 2012-06-08 14:11:48 +08:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
James Chen 2238db301b fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00
James Chen 56817244ed fixed #1297: Retina mode can't work in 'Projection2D' mode. 2012-06-05 15:27:46 +08:00
James Chen 7115a7f3c9 issue #1275: Memory leaks in CCBReader and ActionsTest. 2012-05-30 16:09:19 +08:00
minggo 138de3171f Merge pull request #912 from minggo/merge_nicolasgramlich 
Merge pull request by nicolasgramlich
 2012-05-23 19:56:05 -07:00
minggo 0ba62c3854 issue #1246:use CCLabelBMFont instead of CCLabelTTF in CCDirector.cpp 2012-05-24 10:48:39 +08:00
James Chen ea48413d2d fixed #1253: Added static method "purgeConfiguration" for CCConfiguration to avoid memory leak. 2012-05-23 12:11:53 +08:00
Nicolas Gramlich 320b181dbf CCDirector stats labels are now CCLabelBMFont instead of CCLabelTTF. 2012-05-21 17:20:47 -07:00
James Chen 7cdb11b668 fixed #1215: fixed a bug in retina support for win32. 2012-05-03 15:05:19 +08:00
James Chen 82439733c5 fixed #1204: Made CCEGLView::Create(on win32) as a private function. Updated ExtensionsTest. 
And updated the format of source files(changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces).
 2012-05-03 10:12:00 +08:00
James Chen c5f7f15090 issue #1194: Added extension namespace, all extension classes are in cocos2d::extension namespace, added CCTextureWatcher and CCListView. 2012-04-27 18:47:49 +08:00
James Chen 1d94ba05a0 fixed #1189: updated linebreak and tab(4 space) for all source files. 2012-04-25 18:17:04 +08:00
James Chen 0f36a89c7e issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug). 2012-04-25 16:18:04 +08:00
James Chen 26763c200b Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1177_platform 
Conflicts:
	tests/proj.ios/test.xcodeproj/project.pbxproj
 2012-04-24 15:44:53 +08:00
minggo 1e20f2b6db fixed #1185: reload image data and recreate buffer of object when backing to foreground 2012-04-24 15:02:18 +08:00
James Chen 5e0682ed77 Merge branch 'iss1177_platform' of https://github.com/dumganhar/cocos2d-x into iss1177_platform 2012-04-23 15:41:01 +08:00
James Chen 8fd3518160 issue #1177: fixed a bug about retina in CCDirector. 2012-04-23 15:38:02 +08:00
James Chen 24515f009e issue #1177: Updated ios project configuration. 2012-04-23 14:35:41 +08:00
James Chen 909a759ff6 issue #1177: Updated android project configuration. 2012-04-20 17:33:28 +08:00
James Chen d1d0fd619a issue #1177: Added CCEGLViewProtocol class as CCEGLView's super class. Updated win32, android project configuration. 2012-04-20 15:23:00 +08:00
James Chen 230b8a386b issue #1176: Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' 
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
 2012-04-19 14:35:52 +08:00
James Chen 044729dab9 Updated CCControlExtension 2012-04-16 23:16:03 +08:00
minggo 34c805590f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1156_director 2012-04-13 14:11:58 +08:00
minggo b43d5aa654 fixed #1156 syn CCDirector 2012-04-13 14:11:35 +08:00
James Chen 94e056d964 fixed #1160: Renamed 'CGFloat' to 'CCFloat'. 2012-04-13 14:09:02 +08:00
minggo a20f3fe638 remove unneeded codes 2012-04-13 11:57:25 +08:00
minggo 9bbac0d33d issue #1156: remove unneeded macros and functions 2012-04-13 11:45:41 +08:00
minggo 028cf7874e issue #1156: remove unneeded macros and functions 2012-04-13 11:22:17 +08:00
James Chen da76def60a Fixed a heap crash in CCDirector, and reverted CCDirector singleton to global variable rather than a pointer. 2012-04-11 12:03:37 +08:00
James Chen b4d74700e4 Merge branch 'iss1094_gles20_particlebat' of https://github.com/dumganhar/cocos2d-x into new_ipad 
Conflicts:
	tests/tests/ParticleTest/ParticleTest.cpp
 2012-04-09 10:28:21 +08:00
minggo 355e27dada merge commit 928a28e37d3469fcd41aff14cb136b1415f2fc86 2012-04-08 14:16:29 +08:00
James Chen 4baebb8cab issue #1094: renamed CCPoolManager::getInstance() to CCPoolManager::sharedPoolManager(), and added CCPoolManager::purgePoolManager() method. Using pointer rather than global variable to make a singleton. 
fixed a memory leak in CCParticleSystem.
 2012-04-08 12:50:15 +08:00
James Chen df58a09255 Update: 
1. init CCSprite::m_pobBatchNode at the beginning of CCSprite::initWithTexture.
2. Add CCAssert in ccArrayRemoveObjectAtIndex.
3. Use new method to allocate CCDirector.
 2012-04-05 18:53:53 +08:00
James Chen c73c84f79b issue #1056: Fixed a bug in CCDirector::setProjection. 
We should invoking kmGLMultMatrix(&orthoMatrix) after invoking kmMat4OrthographicProjection.
 2012-03-28 17:02:07 +08:00
James Chen f529bcd659 issue #1056: Move some singletons to CCDirector. It is easily managed by CCDirector. 2012-03-21 17:35:20 +08:00
James Chen b5fca2f5f3 issue #1056: Fixed a bug in CCTouchDispatcher which will cause crash when app exit. Fixed some memory leaks. 2012-03-20 21:04:29 +08:00
James Chen 6ce06bd906 issue #1056: Remove CCMutableArray and CCMutableDictionary template, offer CCDictionary to improve the performance of dictionary by 60%, it means that CCDictionary can save about 2/3 time cost. 2012-03-20 15:04:53 +08:00
James Chen e021ae9821 #1056: issue #1056: synchronise cocos2d-iphone-2.0-rc0a, update some files. 2012-03-16 17:56:19 +08:00
James Chen 275891dfb0 issue #1056: synchronise cocos2d-iphone-2.0-rc0a 2012-03-16 13:42:53 +08:00
James Chen 9e89171557 issue #1056: Rename ccGLState to ccGLStateCache, add some ccShader_***_.h, update CCGLProgram class. 2012-03-15 10:42:22 +08:00
James Chen 8aa3f7f9ae issue #1056: TestCases works ok except Box2dTest and ChipmunkTest. 2012-03-14 18:11:25 +08:00
James Chen aefdb852a2 issue #1056: synchronise cocos2d-iphone gles2.0 branch, HelloWorld on win32 works ok. 2012-03-14 14:55:17 +08:00
minggo b0b6b85a79 fixed #946: HD image for both retina and normal 2012-02-16 10:47:16 +08:00