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

3797 Commits

Author SHA1 Message Date
yangws 4df7cbcc40 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-03 11:24:39 +08:00
natural-law 3a0ae951b7 fixed #236 Fix the bug of cross-compile in cocos2d-uphone 2010-12-03 11:08:30 +08:00
yangws 687fb199fc issue #233 stop main loop when application enter background. test ok on emulator 2010-12-02 18:44:13 +08:00
yangws fc930f2877 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2010-12-02 14:31:33 +08:00
natural-law b3bb3ce461 Merge branch 'iss228' 2010-11-30 14:37:35 +08:00
natural-law 070439382e fixed #228 Optimize function SimpleAudioEngine::stopBackgroundMusic 2010-11-30 14:37:11 +08:00
Walzer 6a79a94630 add doxygen config for cocos2d-x & cocosDenshion 2010-11-30 10:09:33 +08:00
Walzer 8128c1b322 issue #196 fix the bug in doxyen of SimpleAudioEngine 2010-11-29 22:17:30 +08:00
minggo d88b26c4d2 commit AppDelegate.cpp after merging 2010-11-29 15:57:53 +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
Walzer da7b7c47e7 Merge branch 'master' of github.com:cocos2d/cocos2d-x 2010-11-29 15:45:40 +08:00
Walzer 42c2acc6ba CHANGELOG for cocos2d-0.99.4-x-0.7.0 2010-11-29 15:36:18 +08:00
minggo 9a2ff2407a commit the change before merging master of cocos2d-x 2010-11-29 15:08:21 +08:00
minggo 433d4d98e7 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-11-29 14:33:54 +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
Walzer f98e745c1b add HelloWorld_Prefix.pch for iphone 2010-11-29 14:15:47 +08:00
natural-law 94c9addace fixed #226 add support read resource file from zip file in cocos2d-uphone 2010-11-29 10:55:32 +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 b4152fa700 fixed #222 merge different HelloWorld to one directory just like "tests", except HelloWorld.android 2010-11-27 18:25:31 +08:00
minggo a4327c020d fixed #224 2010-11-27 17:47:46 +08:00
natural-law ac2359e679 fixed #221 2010-11-27 17:47:44 +08:00
minggo d391392233 Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID 2010-11-27 17:47:43 +08:00
Walzer 7ac09c7a96 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2010-11-26 20:22:27 +08:00
yangws 462a8baf33 fixed #225 Create new project from main menu ok. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-11-26 17:30:34 +08:00
yangws 8c079cb89f Merge branch 'master' of https://github.com/yangws/cocos2d-x 2010-11-26 15:42:40 +08:00
yangws 1eb86dc0b9 Wizard Work OK On VS2008 CHS 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-11-26 15:36:44 +08:00
Walzer 90213a5fe7 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2010-11-26 12:02:19 +08:00
Walzer 8854ec5b10 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-26 11:59:56 +08:00
minggo b695c42655 Merge branch 'master' of https://github.com/minggo/cocos2d-x 2010-11-26 11:39:26 +08:00
minggo aa826970eb fixed #224 2010-11-26 11:38:10 +08:00
natural-law 6c4d415173 fixed #221 2010-11-26 11:31:03 +08:00
minggo 03b7440afd Merge branch 'master' of https://github.com/walzer/cocos2d-x into walzer-master 2010-11-24 11:05:45 +08:00
walzer 29191a385e Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-24 10:38:01 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
minggo 59a986438f Remove unneeded predefined macro _ADNROID, because ndk build chain has already defined a macro named ANDROID 2010-11-23 18:02:42 +08:00
natural-law 3eba79ec07 fixed #217 2010-11-23 15:15:07 +08:00
walzer a71ab70d31 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2010-11-23 14:49:03 +08:00
minggo 98c5546658 fixed #216: Accelerometer is correct 2010-11-23 14:40:10 +08:00
natural-law ff4a9e42fd fixed #217 2010-11-23 13:41:10 +08:00
yangws de97900b6c CCLOG support for cocos2d-win32 2010-11-23 11:23:29 +08:00
minggo 22f7521cd3 fixed #215 2010-11-22 18:09:38 +08:00
yangws efd69c7023 re-add source files to cocos2d-win32.proj. 2010-11-22 15:40:43 +08:00
minggo 96ea648820 fixed #213: fixed the bug. 2010-11-22 11:36:40 +08:00
minggo 8be8a02e73 fixed #210: support accelemeter 2010-11-22 11:11:20 +08:00
Walzer 224e9cfb6c fixed #210: support accelemeter 2010-11-22 10:48:19 +08:00
Walzer 3af7fe7d9b fixed #212 add readme markup for github 2010-11-20 22:07:03 +08:00
Walzer bf133b8f8e remove useless batch file 2010-11-19 22:48:05 +08:00
yangws 3d4793b090 issue #186 uphone vs wizard add to Setup script. 2010-11-19 07:56:32 +00:00
yangws 011203e4eb issue #186 uphone vs wizard add to Setup script. 2010-11-19 07:56:15 +00:00
natural-law 5b7dc66817 debug 2010-11-19 07:22:21 +00:00