Commit Graph

198 Commits

Author SHA1 Message Date
James Chen 131d97a3d6 fixed : Updating the comment for FPS display by using CCLabelAtlas. 2013-05-23 16:55:53 +08:00
James Chen 22e259360e fixed : Format codes in CCDirector::createStatsLabel. 2013-05-23 15:11:48 +08:00
James Chen bb11182279 fixed : Using CCLabelAtlas instead of CCLabelTTF to show FPS. 2013-05-23 15:06:57 +08:00
Ricardo Quesada 836a61cd3e CCConfiguration extension (rewritten)
rewritten to prevent conflicts while rebasing
2013-05-22 13:00:34 -07:00
James Gregory 81ded66016 Don't set animation interval on emscripten builds since that is driven by the request frame API. 2013-05-06 20:59:49 -07:00
James Chen fead37eab3 fixed : Adding Travis build support for linux and NaCl. 2013-05-06 10:55:39 +08:00
Darragh Coy 212feb8d8c Add CCDirector::popToSceneStackLevel(int level)
This replicates a change made to cocos2d-iphone in the following commit:
59c5272bff

The cocos2d-iphone change was originally discussed in the following pull request:
http://github.com/cocos2d/cocos2d-x/pull/2210
2013-04-30 23:33:22 +01:00
minggo 2bc703c3f0 Merge pull request from jxhgzs/cocos2dx_getDeltaTime
add m_fDeltaTime getter function
2013-03-12 19:38:57 -07:00
minggo 648e9a7bf1 issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
minggo f37b1525b4 issue #1529:use NSUserDefault to implement CCUserDefault on iOS 2013-03-05 14:53:37 +08:00
minggo ae3c104fba issue #1686:disable depth test by default 2013-03-05 10:36:32 +08:00
jiang xiaohua a959986e5e add cpp function 2013-03-02 16:31:19 +08:00
minggo 7c8bb82c67 issue #1686:fix some compiling error 2013-03-01 09:51:42 +08:00
minggo 63e4091bfa fixed #1686:finish updating 2013-02-28 11:55:36 +08:00
minggo 4b8708b762 issue #1686:synchronize CCProgressTimer.cpp 2013-02-27 15:52:14 +08:00
minggo 088bc959f6 issue #1686:synchronize CCRenderTexture.cpp 2013-02-27 15:44:36 +08:00
James Chen 7dc64fc9a6 issue : sync to CCLayer 2013-02-27 09:38:30 +08:00
dualface d6a84e0d16 fix compile error for ios/mac c++11 2012-12-10 18:10:41 +08:00
minggo 76197f1126 issue #1564:enable depth test by default 2012-11-22 16:01:30 +08:00
James Chen 18273e06e3 issue : Fixed coordinate conversion errors.
It needs to be based on 'Design Resolution Size' rather than 'Frame Size'
Please refer to the implementations of CCDirector::convertToGL and CCDirector::convertToUI.
2012-11-16 18:55:57 +08:00
minggo a701eaecce issue #1555:update to v2.1 beta3 2012-11-14 18:05:15 +08:00
minggo 5fd56370d8 issue #1555:fix a bug about CCGLProgram 2012-11-13 11:06:32 +08:00
minggo d2a5723973 issue #1555:add CCDrawNode 2012-11-09 12:08:18 +08:00
James Chen f4f63fd824 fixed : Added comments for using multiresolution in HelloCpp. 2012-10-23 10:50:47 +08:00
James Chen 549dd92d8e fixed : The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions. 2012-10-18 15:53:08 +08:00
James Chen e1c0ea761b issue : Removed some unused codes, made it works on WINDOWS. 2012-10-12 09:58:42 +08:00
James Chen cdf54a872f issue : A bug fix. 2012-10-11 17:02:27 +08:00
James Chen ade54a3de7 Merge branch 'multi_resolution_support' of https://github.com/BorMor/cocos2d-x into bormor-multi-res
Conflicts:
	samples/HelloCpp/Classes/AppDelegate.cpp
	samples/HelloCpp/Classes/HelloWorldScene.cpp
2012-10-11 16:12:22 +08:00
Sergey Vikhirev 05eb4352e8 Remove retina specific methods and logic 2012-09-24 14:22:02 +04:00
dualface 10fa047965 Complete delete CCDirector after called CCDirector::purgeDirector() 2012-09-21 00:29:16 +08:00
Donald Alan Morrison 216ebab0e1 Minor English Spelling Corrections, etc. 2012-09-15 14:19:14 -07:00
Donald Alan Morrison b8412f3b7e Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-09-14 15:27:55 -07:00
Donald Alan Morrison 7c750dc9c5 Minor changes to comments. One integer literal changed to float literal. 2012-09-14 15:26:38 -07:00
YuLei 39f672e5bf fix: cleanup scheduler after call CCDirector::end() 2012-09-04 01:21:32 +08:00
minggo 99b81e3e38 Merge pull request from minggo/iss1439_synchronize
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 00:52:54 -07:00
minggo 3b442dfc0f fixed #1439:synchronize to cocos2d-iphone v2.0.0 2012-08-22 15:51:25 +08:00
minggo 07ddd43695 issue #1437:make CCApplication::sharedApplication() return pointer 2012-08-21 15:28:43 +08:00
minggo 714b9ef838 remove some unneeded codes 2012-08-16 14:51:58 +08:00
minggo c34812567f issue : modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector 2012-08-09 10:23:39 +08:00
minggo 3853611e62 issue #1405:support loading resources from directory defined by developer 2012-08-08 17:42:04 +08:00
minggo 5d8f909af4 issue #1405:multi resolution works ok 2012-08-07 14:29:46 +08:00
Walzer cc3d850892 fixed , add object orientated APIs for CCGeometry, replace "CCFloat" with "float" 2012-08-01 15:30:12 +08:00
minggo f9c40f7372 issue : work ok on iOS after adjusting directory structure 2012-07-19 17:22:36 +08:00
minggo 16310cb544 fixed #1364:add paused state 2012-06-26 11:02:19 +08:00
James Chen b818c0afa6 fixed : Used CC_DEPRECATED_ATTRIBUTE macro to mark deprecated interfaces. 2012-06-20 11:48:31 +08:00
minggo 90448ec7d0 issue #1269:fix some compiling error because of including error header files 2012-06-19 16:20:46 +08:00
minggo d0f905992a issue #1292:make some function names more readable 2012-06-15 15:10:40 +08:00
Nicolas Gramlich 29b22adccc Batch converted manual 'using namespace cocos2d(::extension);' to USING_NS_CC(_EXT);. CocosBuilderExample: Made HelloCococsBuilderLayer selectors work. Made ButtonTestLayer work. 2012-06-13 14:19:13 -07:00
Nicolas Gramlich 58b53be708 Merge with gles20. 2012-06-11 11:50:32 -07:00
Nicolas Gramlich 4378731418 Merge with gles20. 2012-06-11 10:43:07 -07:00