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

23948 Commits

Author SHA1 Message Date
minggo d68d33b029 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-27 09:56:45 +08:00
minggo 31f9969674 fixed #333: fix compiling issue under linux 2011-01-27 09:49:06 +08:00
Macarse 89f012023e Fix display issue with Samsung Galaxy Tab 2011-01-26 19:03:14 -03:00
yangws b43a24fd5e ccxString add trim compareIgnoreCase toLower toUpper replaceText functions. 2011-01-26 18:00:19 +08:00
walzer e92ae19482 changelog for 0.99.5-x-0.7.2 2011-01-26 17:56:06 +08:00
walzer 3260eddd75 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-26 17:11:39 +08:00
walzer ead71525e2 [uphone] don't block when zip resources loading failed 2011-01-26 17:08:19 +08:00
minggo a0ecaed1ef [android] define s_bPopupNotify 2011-01-26 16:45:27 +08:00
minggo 54dc660f6b [android] change the declaration of s_bPopupNotify from public to private 2011-01-26 16:44:58 +08:00
minggo 39165142b8 [iphone] change the declaration of s_bPopupNotify from public to private and define it 2011-01-26 16:44:12 +08:00
minggo 31d287a77d [uphone]change the declaration of s_bPopupNotify from public to private 2011-01-26 16:42:48 +08:00
minggo 072ed1651e [win32] change the declaration of s_bPopupNotify from public to private 2011-01-26 16:41:59 +08:00
walzer d243f01b20 Merge branch 'yangws-master' 2011-01-26 16:08:06 +08:00
yangws fc81244009 Modify music.mid 2011-01-26 15:50:05 +08:00
walzer a732665b85 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-01-26 15:48:02 +08:00
natural-law 3746af1d63 fixed #328.Modify the function and parameter name. 2011-01-26 15:43:12 +08:00
natural-law 7015e85918 fixed #328.By default,pop up a err dialog when loading textures failed. 2011-01-26 11:50:13 +08:00
walzer 950a284b94 [iphone] fixed #289, clear a warning. 2011-01-26 11:31:01 +08:00
minggo 046668c3f1 Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-26 10:02:26 +08:00
minggo 052e8634dc [android]fix a bug of SimpleAudioEngine::playEffect() 2011-01-26 09:46:34 +08:00
minggo 9e2587c26c Merge branch 'master' of https://github.com/minggo/cocos2d-x into minggo-master 2011-01-25 17:09:11 +08:00
minggo acb6b67bd9 Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master 2011-01-25 17:08:04 +08:00
walzer 5d051a14fa [iphone] fix the build error in SchedulerTest.cpp, use CCLOG instead of CCXLog 2011-01-25 16:56:46 +08:00
minggo 4fae086e8b [android]: fps controller 2011-01-25 15:26:16 +08:00
natural-law 6a1b8d64aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-25 15:09:34 +08:00
natural-law d56575dd5a [uphone]change the parameter order of function setResource.And add default value of the parameter pszResPath. 2011-01-25 14:26:26 +08:00
walzer 04aab22145 Merge branch 'natural-law-master' 2011-01-25 11:43:57 +08:00
walzer 796a589df8 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-01-25 11:42:28 +08:00
walzer 462ac4823f bug fix, CCDirect_mobile.cpp crash m_bPurgeDirecotorInNextLoop, according to this post http://www.cocos2d-x.org/boards/6/topics/422 2011-01-25 11:33:03 +08:00
minggo 59edc619a8 [android] to prevent preload effect many times 2011-01-25 11:30:25 +08:00
minggo 38b7e054bd [android]fix the error of preloadEffect() 2011-01-25 11:29:15 +08:00
natural-law 800033d98b fixed #329,use std::string to implement function CCBMFontConfiguration::parseConfigFile. 2011-01-24 15:53:52 +08:00
yangws 09748e88a1 SchedulerTest can output log now. 2011-01-24 14:52:16 +08:00
yangws 90e8762cd5 fixed bug: tests::CocosDenshionTest can't exit program when music playing. 2011-01-24 14:31:51 +08:00
minggo 9eff0da20a fix warning when building on android 2011-01-24 10:51:30 +08:00
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