laschweinski 1fc09448a4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort ... Conflicts: cocos2dx/actions/CCActionInstant.cpp cocos2dx/include/CCActionInstant.h		2011-09-04 14:38:53 +08:00
..
AndroidDebug	commit debug and release makefile	2011-08-28 16:44:20 +08:00
AndroidRelease	commit debug and release makefile	2011-08-28 16:44:20 +08:00
Linux	modified: CocosDenshion/Linux/FmodAudioPlayer.cpp	2011-08-25 19:04:29 +08:00
airplay	fixed #662, SimpleAudioEngine::playEffect() assertion bug on marmalade	2011-08-31 16:35:40 +08:00
android	Revert "First version of unloadBackgroundMusic for android - Feature #687"	2011-08-30 09:30:12 -03:00
include	Revert "First version of unloadBackgroundMusic for android - Feature #687"	2011-08-30 09:30:12 -03:00
iphone	issue #633, add test case for play effect repeatly, force the volume of effect&bgm between 0.0~1.0 in SimpleAudioEngine.mm.	2011-08-08 21:40:33 +08:00
proj.airplay	[airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk	2011-04-04 00:40:39 +08:00
proj.win32	Compile ok on vs2010	2011-06-27 17:02:58 +08:00
proj.wophone	[wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.	2011-03-10 14:24:13 +08:00
third_party/fmod	modified: cocos2dx/.cproject	2011-08-23 11:28:04 +08:00
win32	fixed #633 add playeffect looply,in win32	2011-07-28 09:58:10 +08:00
wophone	issue #633 add playeffect loop in wophone	2011-07-26 17:04:39 +08:00
.cproject	deleted: Box2D/Box2DConfig.cmake	2011-08-28 14:33:04 +08:00
.project	deleted: Box2D/Box2DConfig.cmake	2011-08-28 14:33:04 +08:00