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

36071 Commits

Author SHA1 Message Date
minggo 043d771f1a Merge branch 'dev' of https://github.com/natural-law/cocos2d-x into natural-law-dev 2011-02-12 17:23:50 +08:00
natural-law 20409e7a58 delete the code for debug in cocos2d-android. 2011-02-12 17:20:13 +08:00
natural-law 8fcb9d017c delete the code for debug in cocos2d-android. 2011-02-12 17:18:25 +08:00
yangws 8458476597 Merge branch 'dev' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	.gitignore
 2011-02-12 16:42:47 +08:00
minggo 81848f19e6 Merge branch 'bug345' of https://github.com/minggo/cocos2d-x into minggo-bug345 2011-02-12 11:29:27 +08:00
walzer 7e039fbaa1 [win32] add CCX_DLL to CCLayerGradient & CCTimer 2011-02-11 17:30:11 +08:00
minggo eef0bd4578 [iphone] fixed bug #345: remove init invoking 2011-02-11 16:06:09 +08:00
walzer b92fac0561 Merge branch 'issue344' of https://github.com/Macarse/cocos2d-x into Macarse-issue344 2011-02-11 15:26:49 +08:00
walzer 5dd44ada64 Merge branch 'gitignore' of https://github.com/Macarse/cocos2d-x into Macarse-gitignore 2011-02-11 15:20:20 +08:00
Macarse 24c4a477e3 Fixed issue for tests 2011-02-11 00:48:46 -03:00
yangws 36d68eeb41 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 2011-02-11 09:34:12 +08:00
Macarse e1dfb21dd4 Added logic for POINTER_UP and POINTER_DOWN 2011-02-06 19:02:03 -03:00
Macarse 8d5995d5a6 First approach 2011-02-06 17:05:56 -03:00
Macarse ab44dafc6c Use SENSOR_DELAY_GAME for the SensorManager 2011-02-06 09:11:24 -03:00
Macarse 10d1844cfb Added .cproject to the .gitignore file 2011-02-05 20:49:12 -03:00
Macarse 66038230eb Added logic to disable sensors from the c++ code 2011-02-05 20:17:24 -03:00
Macarse 284c330569 Added code from walzer's comment 2011-02-01 00:11:42 -03:00
Macarse fce540989d First approach 2011-01-30 20:05:30 -03:00
natural-law d0b27c4222 fix bug,MenuTest crash. 2011-01-28 16:05:21 +08:00
yangws 34a6ca5208 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5 
Conflicts:
	cocos2dx/platform/win32/CCXUIImage_win32.cpp
	cocos2dx/platform/win32/CCXUIImage_win32.h
	tests/test.win32/test.win32.vcproj
 2011-01-28 14:33:47 +08:00
yangws 76ea63da7f Change prefix CCX to ccx. 2011-01-27 17:07:36 +08:00
yangws 41a0ad335c Add ccxString header file. 2011-01-27 16:39:46 +08:00
natural-law e73e291a71 [uphone & win32]Fix the bug of new project wizard. 2011-01-27 15:01:38 +08:00
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