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

115 Commits

Author SHA1 Message Date
minggo 7d52161804 fixed #441: Initialize pointer in contruction & detect pointer value in destruction 2011-04-01 16:06:53 +08:00
natural-law e38d3a2277 Merge branch 'master' into iss434 
Conflicts:
	cocos2dx/platform/airplay/CCFileUtils_airplay.h
	template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
 2011-03-28 17:06:32 +08:00
natural-law 28a940ab57 issue #434,refactor class CCFileUtils on win32 and wophone. 2011-03-26 13:52:33 +08:00
walzer 326bc998da typo fixed, sorry :( 2011-03-25 16:13:18 +08:00
walzer 95d672a858 add copyright & author name for airplay port 2011-03-25 15:30:10 +08:00
walzer db4fb7cc9c issue #427, refactor ios port ok. 2011-03-24 17:51:29 +08:00
walzer b9c56f1728 issue #427, try to add CCSAXParser.h 2011-03-24 16:16:49 +08:00
walzer ed492bbd1e [airplay] first commit of airplay port. Thanks for Аксёнов Максим's contribution! 2011-03-23 22:16:20 +08:00
walzer 2b7a324c47 fix compilation error when COCOS2D_DEBUG = 2 2011-03-21 10:50:24 +08:00
walzer 81fa070125 fixed #418, add copyright of original authors, merge Bin's commit 2011-03-19 14:45:51 +08:00
minggo 47173778cc fixed #409: rename NSArray UIAlignment 2011-03-18 14:31:29 +08:00
minggo 7a331e1e14 issue #375: wophone compiled ok 2011-03-07 18:20:48 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
minggo 4379a1c96f Move ccxApplication to cocos2dx/platform on ios. 2011-03-02 17:05:22 +08:00
yangws 67c0ad6332 add platform support project on win32. 
Move macros, CCXUIImage, ccxCommon, CCXCocos2dDefine, 3rd party libraries, glu, NSLock, ccxConfig from platform/win32 to platform_support.
 2011-01-15 18:05:35 +08:00
natural-law 711f3a2906 modify YES to true,and No to false. 2010-12-31 17:56:46 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
natural-law 05bf58b488 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-28 17:24:56 +08:00
natural-law a48b4b762b update tileMap_parallax_nodes to 0.99.5. 2010-12-28 15:17:59 +08:00
minggo b2b8591b26 fixed #279 2010-12-28 10:23:14 +08:00
Walzer 988d7289b8 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-12-17 20:40:16 +08:00
yangws caf518f97d fixed: helloworld win32 release configure build error, CCTMXTiledMap.cpp Access NULL pointer error. 2010-12-17 17:20:39 +08:00
minggo e287466c2f fixed #246 2010-12-17 11:39:25 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
natural-law b1d3e66e68 1. Check the return value of FileData::getFileData() 
2. Fix a bug of CCBitmapFontConfiguration::parseConfigFile()
3. Move the function CCFileUtils::getFileDataFromZip() to class of FileUtils.
 2010-11-29 14:21:33 +08:00
natural-law 4d98faabc5 fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:49:43 +08:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
Walzer a279e5dc9b issue 169, we should retain the new variable first, and then release the old one. assignment at last. 2010-09-27 10:19:10 +00:00
Ming 12d6df9717 issue #154 2010-09-24 10:10:32 +00:00
natural-law 4db7ac0e9b issue #144 
Clear memory leaks of the test_uphone project
 2010-09-16 03:18:09 +00:00
Walzer b2d950743b issue 136, use NSDictionary in CCSpriteFrameCache 2010-09-10 06:08:25 +00:00
Walzer cba41dc44b issue #129, add obj->release when obj is inserted into NSDictionary 2010-09-08 06:52:56 +00:00
Walzer 4b86b49b08 fixed #134, fullPathFromRelativeFile, modify CCTextureCache::addImage 2010-09-07 10:04:57 +00:00
Walzer 43672e1770 issue #114, CCTMXTiledMap debug 2010-09-07 03:26:28 +00:00
Walzer 1c1971255e fixed #129, use NSString to make dictionary 2010-09-06 12:26:19 +00:00
Walzer 4de7ff7a98 issue #114, CCTMXTiledMap debug 2010-09-06 03:59:28 +00:00
Ming b035165e25 2010-09-06 03:45:02 +00:00
Ming aaa6b127e9 issue #61: 2010-09-06 03:31:23 +00:00
Ming 515acaa4cf issue #61: 2010-09-06 03:06:57 +00:00
Walzer 4226dcede9 issue #61, add retain for member variable 2010-09-04 10:06:26 +00:00
Ming 41d9386ad3 issue #61: 2010-09-04 09:13:34 +00:00
Walzer 88888f7f63 issue #114, CCTMXTiledMap debug 2010-09-04 06:51:16 +00:00
Ming f4681c4b53 issue #122 2010-09-04 03:55:42 +00:00
Ming 34e4254957 issue #116: remove the using of itoa, use "/" as path separator 2010-09-03 06:40:48 +00:00
Walzer 178b48ddfc issue #114, CCTMXTiledMap debug 2010-09-03 05:47:34 +00:00
Walzer e7ae3ff710 issue #114, CCTMXTiledMap debug 2010-09-03 02:37:34 +00:00
Walzer 082b90ea06 issue #114, CCTMXTiledMap debug 2010-09-02 10:16:02 +00:00
Walzer fea395cc79 issue #116, remove include "support/data_support/CCArray.h" in CCTMXLayer.h 2010-09-02 07:48:47 +00:00
Walzer 43a4664534 issue #114, CCTMXTiledMap debug 2010-09-02 07:31:37 +00:00
Ming 59afd38192 issue #116: remove __super 2010-09-02 06:54:42 +00:00
Ming 73d6ecb232 issue #116 2010-09-02 02:44:40 +00:00
Walzer ca6a97c4ac issue #114, CCTMXTiledMap debug 2010-09-01 09:26:16 +00:00
Walzer 8cb49d0a8f issue #114, CCTMXTiledMap debug 2010-09-01 08:23:30 +00:00
Walzer ff3d907846 issue 67, modify constructor 2010-08-31 10:11:31 +00:00
Walzer a0ec92f6c4 fixed #71, complete CCTMXTiledMap 2010-08-31 08:48:42 +00:00
Walzer 92f2528ede fixed #69, complete CCTMXLayer 2010-08-31 07:11:13 +00:00
Walzer 4ac8acdf44 fixed #68, complete CCTileMapAtlas 2010-08-30 07:23:07 +00:00
Walzer 1eeebfb6fb fixed #70, CCTMXObjectGroup 2010-08-30 03:45:46 +00:00
Walzer aad6392555 issue #72,debug link error 2010-08-27 10:14:17 +00:00
Walzer 408a34603b fixed #72, complete CCTMXLayerInfo 2010-08-27 10:07:37 +00:00
Walzer 2aca691689 issue #96, add CCTMXXMLParser files 2010-08-26 09:53:35 +00:00
Walzer 0e053e2703 issue #91, debug CCParallaxNode 2010-08-26 03:34:22 +00:00
Walzer 2ad752d206 fixed #91, implement CCParallaxNode 2010-08-26 03:30:52 +00:00
Walzer 4f1e1996be issue #91, add CCParallaxNode files 2010-08-26 02:44:00 +00:00