Andrew Perrault
|
138ea49b0e
|
fixed a couple typos
|
2012-10-27 09:58:49 -04:00 |
minggo
|
9d530c8d54
|
fix a compiling error
|
2012-10-26 12:04:45 +08:00 |
minggo
|
77b69262c8
|
not invoke CCDirector::reshapeProjection() in EAGLView::layoutSubViews
|
2012-10-26 10:10:34 +08:00 |
minggo
|
81ff3d3495
|
issue #1312: use --strip-unneeded parameter to strip lib
|
2012-10-25 16:30:14 +08:00 |
minggo
|
84e48ed7e7
|
issue #1312:update libcurl for android and strip all libs
|
2012-10-25 14:32:28 +08:00 |
James Chen
|
7d9b3d3969
|
Merge pull request #1488 from dumganhar/iss1520-comments
fixed #1520: Added comments for using multiresolution in HelloCpp.
|
2012-10-24 01:00:39 -07:00 |
James Chen
|
c797af0fe9
|
fixed #1522: CCEGLView class of desktop platforms should override CCEGLViewProtocol::setScissorInPoints.
|
2012-10-24 10:03:19 +08:00 |
James Chen
|
b3db7e91f8
|
fixed #1520: Updated some comments.
|
2012-10-23 14:01:48 +08:00 |
James Chen
|
f4f63fd824
|
fixed #1520: Added comments for using multiresolution in HelloCpp.
|
2012-10-23 10:50:47 +08:00 |
minggo
|
9cf3f4c5f6
|
Merge pull request #1474 from wenbin1989/gles20
Add kLanguageKorean to ccLanguageType and getCurrentLanguage()
|
2012-10-21 18:49:42 -07:00 |
James Chen
|
5751d82e6b
|
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'.
|
2012-10-19 17:39:55 +08:00 |
James Chen
|
e905da1b73
|
Merge branch 'gles20' of https://github.com/ImperialPenguin/cocos2d-x into iss1024-bb-ttf
|
2012-10-19 16:19:55 +08:00 |
James Chen
|
c9ce1892af
|
Merge branch 'gles20' into iss1024-bb-ttf
|
2012-10-19 16:18:30 +08:00 |
minggo
|
f40b6ac4eb
|
fixed #1515: implement zoom function on mac os
|
2012-10-19 11:33:06 +08:00 |
John Garrison
|
f4d68a707f
|
More BB Font fixes
|
2012-10-18 13:43:31 -04:00 |
wenbin1989
|
62351462a8
|
Add kLanguageKorean to ccLanguageType and CCApplication::getCurrentLanguage()
|
2012-10-18 17:17:11 +08:00 |
minggo
|
986a0a34c0
|
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale
|
2012-10-18 17:01:27 +08:00 |
minggo
|
fa044d3cee
|
Merge pull request #1472 from wenbin1989/gles20
Fix stack overflow in CCLog
|
2012-10-18 01:57:27 -07:00 |
James Chen
|
549dd92d8e
|
fixed #1516: The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions.
|
2012-10-18 15:53:08 +08:00 |
wenbin1989
|
29a63a3b0f
|
Fix stack overflow in CCLog
|
2012-10-18 14:39:56 +08:00 |
James Chen
|
a5639281ec
|
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into gles20
|
2012-10-18 12:01:55 +08:00 |
James Chen
|
a5e260dbdb
|
issue #1515: Refactored some codes for win32 port.
|
2012-10-18 12:01:30 +08:00 |
James Chen
|
41c784ec61
|
issue #1515: [LINUX support] Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
|
2012-10-18 11:51:02 +08:00 |
James Chen
|
0b101bedd0
|
issue #1515: Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
|
2012-10-18 10:54:19 +08:00 |
James Chen
|
c1ab8a6ead
|
fixed #1511: Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'.
|
2012-10-18 09:54:24 +08:00 |
James Chen
|
9f7019e48c
|
Updated a comment.
|
2012-10-17 16:52:09 +08:00 |
James Chen
|
5ab37c86b2
|
Fix a bug about calculating client area on win32.
|
2012-10-17 16:50:07 +08:00 |
James Chen
|
249ef92697
|
fix a bug about wrong touch area for windows.
|
2012-10-17 15:38:03 +08:00 |
James Chen
|
3f7b79fb08
|
issue #1511: Rename some static variables.
|
2012-10-17 15:14:34 +08:00 |
James Chen
|
2779b4f1ab
|
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into johnangel
|
2012-10-17 15:08:25 +08:00 |
James Chen
|
ddfc08904a
|
issue #1024: Made blackberry/CCImage.cpp compiled ok.
|
2012-10-17 10:57:21 +08:00 |
John Garrison
|
8e7b939f61
|
Added TTF support to Blackberry
|
2012-10-16 13:47:04 -04:00 |
johnangel
|
cd82403638
|
Fix to make MultiTouchTest work properly
|
2012-10-16 19:02:24 +02:00 |
johnangel
|
054128c5ee
|
Correction for touch and display area
|
2012-10-16 18:53:31 +02:00 |
johnangel
|
a2e1400402
|
Merge remote branch 'upstream/gles20' into gles20
|
2012-10-16 08:42:30 +02:00 |
minggo
|
2ded8ea034
|
Merge pull request #1442 from dumganhar/iss1486-multi-res
Multiresolution support
|
2012-10-15 02:15:21 -07:00 |
johnangel
|
8d0dc8d2a7
|
Windows Touch support for desktop
|
2012-10-15 10:39:42 +02:00 |
James Chen
|
a65f13defe
|
issue #1486: Fix bugs for CCEditBox iOS port.
|
2012-10-15 13:01:36 +08:00 |
minggo
|
93d702e3cc
|
fixed #1491:remove dependency of FontLabel lib
|
2012-10-15 12:03:15 +08:00 |
James Chen
|
6cf602ea3b
|
issue #1486: CCDirector::getWinSizeInPixel return 'winSize* CC_CONTENT_SCALE_FACTOR()'. This change fixes the wrong display bug in CCRenderTexture.
|
2012-10-13 10:18:03 +08:00 |
minggo
|
0a39fa8bef
|
fixed #1507: use SoundPool.OnLoadCompleteListener to play effect if it is not preloaded
|
2012-10-12 17:43:43 +08:00 |
James Chen
|
e1c0ea761b
|
issue #1486: Removed some unused codes, made it works on WINDOWS.
|
2012-10-12 09:58:42 +08:00 |
James Chen
|
cdf54a872f
|
issue #1486: 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 |
johnangel
|
e510bee238
|
Displaying window size in Debug mode
|
2012-10-09 10:58:56 +02:00 |
johnangel
|
e7340f6c1b
|
ESC button on Windows will now behave like Back button on mobile phones
|
2012-10-08 18:46:19 +02:00 |
johnangel
|
72aa46afe5
|
Refactoring code
|
2012-10-08 18:38:04 +02:00 |
johnangel
|
c6da27b793
|
Debug app uses executable directory; Non-debug app uses local app data
directory
|
2012-10-08 17:22:27 +02:00 |
johnangel
|
ad7dacc281
|
Merge remote branch 'upstream/gles20' into gles20
|
2012-10-08 16:35:43 +02:00 |
James Chen
|
719cb7b7a6
|
fixed #1496: An error of comparing font's face name in CCImage of win32 port.
|
2012-10-08 14:52:08 +08:00 |