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

40513 Commits

Author SHA1 Message Date
yangws 1a17f3ea55 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXApplication_win32.cpp
	tests/test.win32/test.win32.vcproj
 2011-01-22 17:52:06 +08:00
yangws 6ad3ec6bf0 HelloWorld and tests can run after move ccxApplication. 2011-01-22 17:30:00 +08:00
minggo e23c1eb2f6 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-22 16:45:26 +08:00
minggo fe9c7a7be3 [win32] return float value of volume 2011-01-22 16:40:05 +08:00
yangws 04c48f59c1 commit ccxApplication files. 2011-01-22 16:27:08 +08:00
yangws bc9bfdc30c Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +08:00
natural-law 5cf0ee5d90 [uphone]Modify the param of function get/set volume in SimpleAudioEngine from int to float.The Max/Min value changed to 1.0/0.0 2011-01-22 16:22:26 +08:00
walzer d97c40875e [win32 & uphone] add COCOS2D_DEBUG=1 into PreprocessorDefinitions of templates in MSVC. ref to this post http://www.cocos2d-x.org/boards/12/topics/392 2011-01-22 15:26:10 +08:00
minggo 4a4c0d3485 [android] fixed #321: Frame control of android. It is not so accuracy. 2011-01-22 15:10:18 +08:00
minggo 9d8f0f4b17 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-21 18:18:13 +08:00
minggo 80cb55042e Merge branch 'master' of https://github.com/minggo/cocos2d-x 2011-01-21 18:13:16 +08:00
minggo 882b473291 [iphone]: font support 2011-01-21 18:15:12 +08:00
minggo 3746b5e4fc remove SimpleAudioEngine in sln 2011-01-21 18:11:43 +08:00
natural-law 48d1791341 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-21 17:33:43 +08:00
minggo cb7a0e553a [iphone]: frame control 2011-01-21 17:33:15 +08:00
natural-law 6bde512cbe [android]issue #268,support more fonts on cocos2d-android. 2011-01-21 17:32:11 +08:00
minggo dd979a4ed9 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-21 16:29:13 +08:00
minggo b3fe7f5b6c fixed #307:merge TestAudioEngine into tests 2011-01-21 16:26:51 +08:00
minggo 8c114caa0d issue #307: reomve TestAudioEngine 2011-01-21 15:57:35 +08:00
minggo 01a3e37db8 [android] fix bug of build_native.sh 2011-01-21 15:45:55 +08:00
minggo cffc61d426 issue #307: add music resource 2011-01-21 15:17:23 +08:00
minggo e92970ec69 [android] fixed #311: implement cocosdenshin on android 2011-01-21 15:15:09 +08:00
minggo dfad6ab9f9 change the interface of SimpleAudioEngine 2011-01-21 15:14:07 +08:00
minggo f9d0db48e1 issue #307: merge TestAudioEngine into tests 2011-01-21 15:11:15 +08:00
minggo 459a34d51e [android] make helloworld run on 2.1 2011-01-21 13:32:10 +08:00
walzer 8c47a5b254 fix bug in CGRect::CGRectIntersectsRect(..) method, CGGeometry.cpp, according to this solution http://www.cocos2d-x.org/boards/6/topics/387 2011-01-21 08:54:45 +08:00
walzer a44eebc86d Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-01-21 08:45:48 +08:00
walzer a2b426047d [android] make HelloWorld compatible on android 2.1 simulator 2011-01-21 08:44:15 +08:00
natural-law 31fc6c0039 [uphone]fixed #308,Modify the code,remove the function CCXApplication::setIsInBackground(). 2011-01-20 13:55:45 +08:00
natural-law f7107fb015 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 
Conflicts:
	cocos2dx/platform/uphone/CCXApplication_uphone.h
 2011-01-20 13:47:01 +08:00
natural-law 3d225465c0 [uphone]fixed #308,BGM is paused when press power key to make uphone sleep. 2011-01-20 13:41:58 +08:00
walzer dc11bdf16a Merge remote branch 'origin/master' 2011-01-20 11:41:41 +08:00
yangws 333f0b5574 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	HelloWorld/AppDelegate.cpp
	cocos2dx/particle_nodes/CCParticleSystem.cpp
	cocos2dx/proj.win32/cocos2d-win32.vcproj
	tests/AppDelegate.cpp
 2011-01-20 11:18:35 +08:00
yangws ee50078b3e implement FPS limitation on UPhone. 2011-01-20 10:49:30 +08:00
walzer a9f90256b8 fix the wrong direction of particle system 2011-01-20 10:21:41 +08:00
walzer a99619a3b7 [uphone] remove useless vcproj from solution 2011-01-20 10:10:27 +08:00
minggo 14fa024e48 Merge https://github.com/cocos2d/cocos2d-x into merger 2011-01-20 09:22:29 +08:00
walzer b7e109f6e6 fixed iphone/android/uphone compilation errors brought by the prevous commit of #322 2011-01-19 22:29:57 +08:00
walzer 9347fadc71 [win32] fixed #322, FPS control on win32 2011-01-19 18:23:42 +08:00
walzer e404a6aeb9 Merge branch 'master' of https://github.com/yangws/cocos2d-x into yangws-master 2011-01-19 18:11:21 +08:00
walzer 9041d03d3b [uphone] issue #307, config test.vcproj uphone for TestAudioEngine merger. 2011-01-19 18:02:35 +08:00
yangws d627608ff4 win32 platform fps limitation support. 2011-01-19 17:59:20 +08:00
walzer e22ec58feb [iphone] fix compilation error on SimpleAudioEngine::setResource(...) 2011-01-19 16:51:40 +08:00
walzer 816deced9e Merge branch 'upto-0.99.5' of https://github.com/natural-law/cocos2d-x into natural-law-upto-0.99.5 2011-01-19 16:41:47 +08:00
walzer a0c50d3edb [iphone] support UTF8 Chinese chars 2011-01-19 16:26:55 +08:00
minggo d64ac9fdb8 issue #311: cocosdenshion for android 2011-01-19 16:00:19 +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 79b711a758 move CCXBitmapDC from cocos2d/platform to platform_support. 2011-01-19 14:23:26 +08:00
natural-law ec7c24ad8d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-19 10:03:39 +08:00
natural-law f992838f96 [uphone]fixed #293,Modify the absolute path method in CCFileUtils. 2011-01-18 18:21:06 +08:00