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

406 Commits

Author SHA1 Message Date
yangws 7bc7d32001 fixed #366 [win32] Move Application from Application code to Cocos2dx/platform/ccxApplication 2011-03-01 12:41:57 +08:00
minggo f504211e56 merge natural-law-iss332 to dev 2011-02-28 09:48:14 +08:00
yangws 63cedd1317 Merge code of Platform_support for IOS. 2011-02-23 18:22:05 +08:00
natural-law 949c1000a8 update tests to 0.99.5. 2011-02-23 16:47:25 +08:00
natural-law 4362a5f381 [uphone]issue #316,Resolution auto adjustment. 2011-02-19 17:44:43 +08:00
natural-law 60e9ae873c Merge branch 'dev-retina' of https://github.com/yangws/cocos2d-x into iss316 
Conflicts:
	HelloWorld/AppDelegate.cpp
	tests/AppDelegate.cpp
 2011-02-19 10:19:14 +08:00
yangws 85b9c9ae21 Retina display support and scale with keep w/h rate ok on win32. 2011-02-18 18:30:22 +08:00
natural-law e4063fd190 [uphone]issue #340.Refactor platform_support on uphone,and run HelloWorld successful on both simulator and device. 2011-02-17 14:31:52 +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
walzer 7e039fbaa1 [win32] add CCX_DLL to CCLayerGradient & CCTimer 2011-02-11 17:30:11 +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
minggo 9eff0da20a fix warning when building on android 2011-01-24 10:51:30 +08:00
yangws bc9bfdc30c Move win32/CCXApplication to platform_support 2011-01-22 16:24:54 +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 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
walzer e399a77369 fixed #306, invoke CCDirector::end() method in next msgloop, otherwise the flow will crashes when end() is called in an ActionInterval. 2011-01-17 22:01:15 +08:00
walzer 04c685b95a issue #289, fix some warnings 2011-01-17 21:16:25 +08:00
walzer ad5ee3c9f6 Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually. 2011-01-17 16:21:11 +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
minggo 6043008a11 Merge branch 'track' of https://github.com/leon-li/cocos2d-x into leon-li-track 2011-01-13 13:52:20 +08:00
natural-law 00a9615e0f Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2011-01-10 18:08:57 +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 7e30615d02 issue #304 Remove codes for controlling frame rate. 2011-01-10 15:13:30 +08:00
minggo 9a959c299f fixed some errors of iphone platform 2011-01-07 09:35:27 +08:00
natural-law 25e9721678 fix bugs. 2011-01-04 17:46:23 +08:00
Walzer 4a6989b6ff [uphone] add keyMenuBack to CCKeypadDelegate 2010-12-31 18:15:30 +08:00
minggo d0a16a246e fixed comipling error and link error of upto-0.99.5 2010-12-31 14:56:24 +08:00
natural-law 3dfd530b38 Merge branch 'iss295' into upto-0.99.5 2010-12-31 09:48:48 +08:00
natural-law 34f45c8faa Implement CCEventDispatcher. 2010-12-31 09:36:53 +08:00
minggo 942d0233cf fixed #290 2010-12-30 17:30:11 +08:00
minggo b0e5c06d37 Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5 2010-12-30 10:36:17 +08:00
minggo da00d82117 fix some error in CCGrid and CCDirector.h 2010-12-30 10:28:13 +08:00
minggo 7b804d985b merge yangws-upto-0.99.5 into upto-0.99.5 2010-12-30 10:25:35 +08:00
minggo 94c7f968e1 Merge branch 'minggo-upto-0.99.5' into upto-0.99.5 2010-12-29 18:18:14 +08:00
minggo dc55c164ba fixed #292 2010-12-29 18:01:37 +08:00
Li Lirong e58ba468ee fix some warnings under android 2010-12-29 10:30:42 +08:00
natural-law 35d611155b add functions: 
void CCSpriteBatchNode::addQuadFromSprite(CCSprite *sprite, unsigned int index);
CCSpriteBatchNode * CCSpriteBatchNode::addSpriteWithoutQuad(CCSprite*child, unsigned int z, int aTag);
 2010-12-28 17:42:23 +08:00
natural-law 05bf58b488 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-28 17:24:56 +08:00
natural-law a48b4b762b update tileMap_parallax_nodes to 0.99.5. 2010-12-28 15:17:59 +08:00
minggo 355570ea8f issue #292 2010-12-28 15:05:55 +08:00
yangws 0edf124e4f issue #281 CCParticleExamples upto-0.99.5 2010-12-28 14:04:28 +08:00
yangws 706f97114b issue #281 CCParticleSystemQuad upto-0.99.5 2010-12-28 11:55:34 +08:00
yangws 5e377f9368 issue #281 CCParticleSystemPoint.h upto-0.99.5 2010-12-28 11:09:40 +08:00
yangws afd9675854 CCParticleSystem upto-0.99.5 2010-12-27 17:39:15 +08:00
minggo 33ad2881b7 merge mingo-upto-0.99.5 to upto-0.99.5 2010-12-27 11:06:44 +08:00
minggo 28a3857f95 Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-27 10:59:03 +08:00
minggo 4e35a660dc Merge branch 'upto-0.99.5' of https://github.com/yangws/cocos2d-x into yangws-upto-0.99.5 2010-12-27 10:55:59 +08:00
minggo 4cd3e59e2b fixed #278 2010-12-27 10:26:56 +08:00
natural-law 46e78ab7a1 update layers_scenes_transition_nodes to 0.99.5. 2010-12-25 18:07:34 +08:00
yangws c142070c2c misc_node upto-0.99.5. 
Signed-off-by: yangws <yangws@cocos2d-x.org>
 2010-12-25 15:09:42 +08:00
natural-law 6ee16ce878 update menu_nodes to 0.99.5 2010-12-25 11:15:19 +08:00
minggo 07b774bc6f Merge branch 'natural-law-upto-0.99.5' into upto-0.99.5 2010-12-25 09:24:15 +08:00
natural-law 969e65b959 Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into merge 2010-12-24 17:33:18 +08:00
natural-law 4a64f899fe update label_nodes to 0.99.5. 2010-12-24 17:07:31 +08:00
minggo d6fb209861 merged from minggo-upto-0.995 to upto-0.99.5 2010-12-24 15:21:57 +08:00
natural-law 0f0a8ed956 rename the files related to label_nodes. 2010-12-24 14:00:49 +08:00
natural-law e11ccb50fe fixed #283 Add member data m_positionInPixels for some classes. 2010-12-24 11:40:44 +08:00
minggo e3b49d7504 merge from minggo and natual-raw 2010-12-23 17:40:23 +08:00
natural-law 3c6d1d8317 update actions to 0.99.5 2010-12-23 16:47:29 +08:00
minggo 3692d01c5a fixed #288 2010-12-23 14:18:08 +08:00
minggo 994a3b05ea fixed #273 2010-12-23 11:19:56 +08:00
natural-law eeb4e99804 rename the action classes. 2010-12-22 15:43:54 +08:00
natural-law 4a765d33a3 rename the CCXXXAction files to CCActionXXX. 2010-12-22 15:15:04 +08:00
Walzer 5c858b182c issue #243, fix warnings 2010-12-18 12:02:57 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
natural-law 2c84b167e0 fixed #258 Move FileUtils.h from path "support/file_support" to path "include". 2010-12-14 10:45:23 +08:00
natural-law 2706e3a003 fixed #251 CCKeypadDelegate implement 2010-12-13 14:10:39 +08:00
yangws 852c57d2c6 add CCLOG support on win32 and uphone 2010-11-23 18:20:46 +08:00
yangws de97900b6c CCLOG support for cocos2d-win32 2010-11-23 11:23:29 +08:00
Walzer 0ad77b779a issue #211 don't checkout 2010-11-18 15:55:00 +00:00
Walzer 820c2f0714 issue #211 cocos2d-x back to cocos2dx 2010-11-18 15:01:42 +00:00
Walzer b4328354af issue #211 cocos2dx -> cocos2d-x 2010-11-18 14:07:17 +00:00
natural-law 2b23e0f6d5 debug 2010-11-18 10:27:05 +00:00
Walzer 0a2567c646 SEL_MunuHandler -> SEL_MenuHandler & SimpleAudioEngine::sharedEngine 2010-11-17 08:31:48 +00:00
Walzer fb25984f12 rename getShared methods to shared 2010-11-16 07:12:09 +00:00
Ming 0aab635d85 fixed #206 2010-11-16 04:02:45 +00:00
Ming 416a319344 fixed #203 2010-11-13 03:34:49 +00:00
Ming 6062cf1558 issue #202 2010-11-12 09:26:01 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
natural-law 000bdeeb42 issue #189 
add support of Accelerometer sensor
 2010-11-10 08:29:52 +00:00
Ming 6853385c8d resolve compile error for android 2010-11-03 02:59:07 +00:00
Ming 992ad7e75d fix the method of computing frame rate 2010-10-16 07:29:53 +00:00
Ming 0298500abe add setContentScaleFactor() 2010-10-15 07:47:48 +00:00
Ming 7a9b417248 2010-10-11 10:05:34 +00:00
Ming 9febafadec 2010-10-09 08:23:58 +00:00
Walzer 77564d0017 add LAYER_NODE_FUNC & SCENE_NODE_FUNC 2010-10-09 06:23:47 +00:00
Walzer 371baf3efc add NSSet::anyObject method 2010-10-01 15:05:05 +00:00
Walzer 1b385bfe20 fix warnings in NSSet & CCXUIImage_uphone. NSSet will alloc std::set in heap, instead of in stack, to avoid compile warning 2010-10-01 06:34:47 +00:00
Walzer a6b03ce9ea add type cast in "ccp" marco, to avoid warnings 2010-10-01 06:21:37 +00:00
Ming 0247182dc3 fixed #173 2010-09-30 07:54:15 +00:00
Walzer 72aee0eace issue #175, add retain for CCCallFunc::m_pSelectorTarget 2010-09-30 03:57:31 +00:00
Ming 683596a023 issue #170 2010-09-29 09:39:45 +00:00
Walzer 8633fa5d9e issue #171 2010-09-29 08:33:52 +00:00
Walzer f1c48be489 issue #171, implement CGRectIntersectsRect 2010-09-29 08:06:03 +00:00
Walzer b8f59f623d issue #171, implement CGRectIntersectsRect 2010-09-29 07:24:51 +00:00
Walzer d93aae9133 issue #171, add annotate for protected member variable 2010-09-29 04:03:21 +00:00
yangws c8439ca79e change CGPoint CGSize CGRect function's parameter pass by value to pass by reference, 
impliment CGRectIntersectsRect function
 2010-09-29 03:49:38 +00:00
Walzer dad659641b issue #171, add @brief in class annotate 2010-09-29 01:44:57 +00:00