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

4191 Commits

Author SHA1 Message Date
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 6ac8906bfc Merge pull request #990 from minggo/gles20 
issue #1310: make tests and HelloWorld work ok
 2012-06-10 19:42:54 -07:00
minggo 94235d3602 issue #1310: make tests and HelloWorld work ok 2012-06-11 10:41:52 +08:00
minggo c8c696a2df Merge pull request #989 from NatWeiss/gles20 
Fixed a few release-mode Xcode warnings about unused parameters.
 2012-06-09 03:13:22 -07:00
Nat Weiss 70fa2ec3cb Fixed a few release-mode Xcode warnings about unused parameters. 2012-06-08 13:52:40 -07:00
James Chen 72c3c2cc0b Merge pull request #988 from dumganhar/gles20 
issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disabled retina mode for tests project.
 2012-06-08 03:03:06 -07:00
James Chen c9dc60b0f7 issue #1310: fixed a bug in CCSpriteFrameCache.cpp. Disable retina mode for tests project. 2012-06-08 17:58:21 +08:00
James Chen 57b5c0bcf3 Merge pull request #987 from dumganhar/gles20 
issue #1310: Tests project updated!.
 2012-06-08 02:35:52 -07:00
James Chen 371b3f9938 issue #1310: Tests project updated!. 2012-06-08 17:34:15 +08:00
James Chen 36e393a5f4 Merge pull request #986 from dumganhar/gles20 
issue #1310: Synchronize to RC2, HelloWorld works ok on win32.
 2012-06-08 02:20:27 -07:00
James Chen a40dfa427a Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 17:15:32 +08:00
James Chen 9ff7dcd96d issue #1310: Removed some functions. 2012-06-08 17:15:00 +08:00
minggo 913707f259 Merge pull request #983 from NatWeiss/gles20 
Allows Cocos2D-X to be built for iOS including all cpp files
 2012-06-08 01:55:19 -07:00
James Chen 12a9d13443 issue #1310: Synchronize to RC2, HelloWorld works ok on win32. 2012-06-08 16:54:38 +08:00
James Chen ead12eb13e Merge pull request #985 from dumganhar/gles20 
issue #1310: Sync to rc2
 2012-06-08 01:25:19 -07:00
James Chen 76a560a474 issue #1310: Made CCFileUtils as a singleton. 2012-06-08 16:22:57 +08:00
James Chen 35e9e44e39 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 15:31:23 +08:00
minggo 76ab11712e Merge pull request #984 from minggo/gles20 
issue #1310:synchronize CCLableAtlas and CCLabelBMFont
 2012-06-08 00:30:58 -07:00
minggo 6b7a59f007 issue #1310:synchronize CCLableAtlas and CCLabelBMFont 2012-06-08 15:29:47 +08:00
James Chen 6cf608effd issue #1310: deleted some functions which can't be implemented in C++. Moved arrayMakeObjectsPerformSelector to CCArray.h. 2012-06-08 15:17:15 +08:00
James Chen 4a887ac598 issue #1310: Updated CCScene.h. 2012-06-08 15:03:18 +08:00
Nat Weiss 6ee3db827c Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 23:52:15 -07:00
James Chen fd2d9a8aa6 issue #1310: Finished 'menu_nodes' and 'layers_scenes_transitions_nodes'. 2012-06-08 14:50:41 +08:00
James Chen c8dfe7f92b issue #1310: Finished CCRenderTexture.h(.cpp). 2012-06-08 14:30:55 +08:00
minggo eba410317e Merge pull request #982 from minggo/gles20 
issue #1310: syncronize base_nodes
 2012-06-07 23:19:05 -07:00
minggo 9a600c6221 issue #1310: syncronize base_nodes 2012-06-08 14:17:39 +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 f96c4d5d23 Merge pull request #981 from minggo/gles20 
issue #1310: syncronize actions
 2012-06-07 22:58:57 -07:00
minggo cc16320445 issue #1310: syncronize actions 2012-06-08 13:55:28 +08:00
Nat Weiss ed43e6a90b Allows Cocos2D-X to be built for iOS including all cpp files. 2012-06-07 21:16:24 -07:00
minggo 2b55a76970 Merge pull request #978 from minggo/iss1202_remove_CCFileData 
fixed #1202:remove CCFileData
 2012-06-06 23:15:05 -07:00
minggo 49d8ac72f6 fixed #1202:remove CCFileData 2012-06-07 14:13:44 +08:00
James Chen 8e2a5876e6 Merge pull request #977 from dumganhar/gles20 
fixed #1308: Used std::sort to sort the touchHandler array.
 2012-06-06 20:46:05 -07:00
James Chen f466b081c9 fixed #1308: Used std::sort to sort the touchHandler array. 2012-06-07 11:38:59 +08:00
James Chen fea278b5b2 Merge pull request #976 from dumganhar/gles20 
fixed #1308: Strange TouchDispatcher behavior.
 2012-06-06 07:50:49 -07:00
James Chen c64c4a74bf fixed #1308: Strange TouchDispatcher behavior. 2012-06-06 22:49:28 +08:00
James Chen d351b32642 Merge pull request #974 from dumganhar/gles20 
fixed #1297: fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().
 2012-06-06 00:57:47 -07:00
James Chen 4b7f9f582f fixed #1297: fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR(). 2012-06-06 15:56:55 +08:00
minggo 6cf8ea283d Merge pull request #973 from minggo/iss1278_effect_android 
fixed #1278: stop effect when unloading effect
 2012-06-06 00:41:26 -07:00
minggo 1ff04700b5 fixed #1278: stop effect when unloading effect 2012-06-06 15:38:25 +08:00
James Chen 8db6ab8c2b Merge pull request #972 from dumganhar/gles20 
fixed #1302: The parameter of CCMenu::setHandlerPriority should be signed int.
 2012-06-06 00:18:48 -07:00
James Chen 734ea54aba fixed #1302: The parameter of CCMenu::setHandlerPriority should be signed int. 2012-06-06 15:16:02 +08:00
James Chen 10e0180809 Merge pull request #971 from dumganhar/gles20 
Removed some unused codes.
 2012-06-05 23:34:37 -07:00
James Chen 37aa196c73 Removed some unused codes. 2012-06-06 14:31:49 +08:00
James Chen 84441e8595 Merge pull request #970 from dumganhar/gles20 
fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
 2012-06-05 23:25:32 -07:00
James Chen 2238db301b fixed #1301: CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points. 2012-06-06 14:13:40 +08:00
James Chen c8b62d4ec8 Merge pull request #969 from dumganhar/gles20 
fixed #1300: Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
 2012-06-05 19:09:17 -07:00
James Chen d827cdacc0 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-06 10:07:12 +08:00