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

29 Commits

Author SHA1 Message Date
dumganhar 30a02030b0 make the property function to virtual 2012-01-09 11:07:45 +08:00
minggo 37915cfed6 remove unneeded function, and make protocol an abstract class 2011-12-28 14:46:49 +08:00
dumganhar bfdb908d01 add Cocos2dx project 
add HelloWorld project and rename proj.blackberry fold to proj.qnx
 2011-12-06 14:56:37 +08:00
dumganhar 3442d17dbe fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define. 2011-11-28 18:05:38 +08:00
dumganhar 20455bf164 fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly. 2011-11-28 14:27:48 +08:00
dumganhar e87b00db67 add pthread support for bada 1.0 2011-11-24 17:26:04 +08:00
dumganhar 0fa48e2cfb Update cocos2dx/platform/CCPlatformMacros.h 2011-11-14 11:35:04 +08:00
dumganhar ca3b91855a debug issue #852 2011-11-10 16:44:58 +08:00
dumganhar 7d2a26ec10 comment some applog 2011-11-07 00:28:09 +08:00
dumganhar eb9cb31ca4 use shared lib for cocos2dx project 2011-10-09 18:15:31 +08:00
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 2011-09-29 16:03:37 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
laschweinski 871abb4a32 Merge branch 'master' into LinuxPort 2011-08-19 13:20:23 +08:00
moadib a8d87a9976 Non-trivial arguments passed by reference now. 
Removed unnecessary cocos2d:: prefix inside namespace.
 2011-08-17 17:26:26 +04:00
laschweinski 5d20ebe24b modified: HelloWorld/AppDelegate.cpp 
modified:   HelloWorld/HelloWorldScene.cpp
	modified:   cocos2dx/cocoa/CCNS.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   cocos2dx/misc_nodes/CCRenderTexture.cpp
	modified:   cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	modified:   cocos2dx/platform/CCAccelerometer_platform.h
	modified:   cocos2dx/platform/CCApplication_platform.h
	modified:   cocos2dx/platform/CCArchOptimalParticleSystem.h
	modified:   cocos2dx/platform/CCCommon.cpp
	modified:   cocos2dx/platform/CCEGLView_platform.h
	modified:   cocos2dx/platform/CCGL.cpp
	modified:   cocos2dx/platform/CCGL.h
	modified:   cocos2dx/platform/CCImage.cpp
	modified:   cocos2dx/platform/CCPlatformConfig.h
	modified:   cocos2dx/platform/CCPlatformMacros.h
	modified:   cocos2dx/platform/CCSAXParser.h
	modified:   cocos2dx/platform/CCStdC.h
	modified:   cocos2dx/support/CCUserDefault.cpp
	modified:   cocos2dx/support/data_support/ccCArray.h
	modified:   tests/AppDelegate.cpp
	deleted:    tests/Res/music.mid
	modified:   tests/tests/controller.cpp
	modified:   tests/tests/tests.h
	HelloWorld/Linux/
	cocos2dx/.settings/
	cocos2dx/platform/Linux/
	tests/test.linux/
 2011-08-17 11:36:54 +08:00
Leon 771e2349c5 fix some warnings under xcode 4.0 llvm compiler 2011-08-10 22:39:02 +08:00
liswei 1591c7edc8 fixed #512 fix warnings in /Wall flag 2011-06-10 17:51:37 +08:00
natural-law d4dbedca4d fixed #451,remove the code of support mac platform. 
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
 2011-04-11 11:24:10 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
minggo 75e2ecc16d issue #387: move platform_support into cocos2dx/platform 2011-03-09 14:40:05 +08:00
minggo 7aaf4be85f move platform_support into cocos2dx/platform 2011-03-09 11:38:36 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
natural-law aef83b2660 [uphone]Move Application from Application code to Cocos2dx/platform/ccxApplication. 2011-03-02 17:45:04 +08:00
yangws 63cedd1317 Merge code of Platform_support for IOS. 2011-02-23 18:22:05 +08:00
yangws 804dc4ef7c Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/win32/CCXBitmapDC.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
 2011-01-19 15:29:08 +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 237042f7dd fixed #309,App will not crash any more when surface re-created. 2011-01-10 17:54:44 +08:00
minggo 9a959c299f fixed some errors of iphone platform 2011-01-07 09:35:27 +08:00