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

4255 Commits

Author SHA1 Message Date
Nicolas Gramlich 4c8351f304 Removed Zombie files. 2012-06-11 15:00:11 -07:00
Nicolas Gramlich 342c65e293 Added CCBIReaderTest, which doesn't work since XCode sucks big time, not finding a simple file. 2012-06-11 14:57:30 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 9c52fce5d2 Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 10:43:27 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00
James Chen c0946a9b99 Merge pull request #996 from dumganhar/gles20 
issue #1310: Exported class -- CCCatmullRomTo  and function -- ccCardinalSplineAt
 2012-06-11 05:05:18 -07:00
James Chen 62f87c18a2 issue #1310: Exported CCCatmullRomTo class and ccCardinalSplineAt function. 2012-06-11 20:02:40 +08:00
minggo ea613be58a Merge pull request #995 from minggo/gles20 
Synchronize some codes
 2012-06-11 03:27:12 -07:00
minggo ccbfd24c21 issue #1310: synchronize ActionManagerTest ActionEaseTest ActionsProgressTest ActionsTest 2012-06-11 18:25:57 +08:00
minggo 77f51b5c48 issue #1310:synchronize CocosDenshion 2012-06-11 15:01:23 +08:00
James Chen 980b40e9dd Merge pull request #994 from dumganhar/gles20 
fixed #1315: TileMapTest can't be shown correctly in retina mode.
 2012-06-10 23:51:11 -07:00
James Chen b61ad6cdba Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-06-11 14:45:09 +08:00
James Chen 2ce7c86c50 fixed #1315: TileMapTest can't be shown correctly in retina mode. 2012-06-11 14:44:32 +08:00
minggo 55ee220245 Merge pull request #993 from minggo/gles20 
issue #1310: synchronize CCLabelTTF
 2012-06-10 23:37:31 -07:00
minggo b4899ae46d issue #1310: synchronize CCLabelTTF 2012-06-11 14:36:25 +08:00
James Chen 2cabbcfaaa Merge pull request #992 from dumganhar/gles20 
issue #1310: Fixed a bug that 3d effect can't be displayed correctly in retina mode.
 2012-06-10 20:55:14 -07:00
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 ed09baeeb0 Merge pull request #991 from dumganhar/gles20 
issue #1310: Synchronize to RC2, updated something as follows.
* 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-10 20:05:32 -07: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 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
Nicolas Gramlich 1e9656854b Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20 2012-06-08 10:22:25 -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