James Chen
bd0ad94bf2
Updated the comment of setFrameZoomFactor.
2012-10-19 18:00:26 +08:00
James Chen
aa818f3b54
Merge pull request #1479 from dumganhar/gles20
...
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor
2012-10-19 02:50:08 -07:00
James Chen
5751d82e6b
Renamed "setFrameZoom" to "setFrameZoomFactor", added 'getFrameZoomFactor'.
2012-10-19 17:39:55 +08:00
James Chen
a0eed8f0a8
Merge pull request #1478 from dumganhar/iss1506-testlua
...
fixed #1516 : TestLua compilation error when the path of cocos2d-x contains spaces
2012-10-19 01:55:41 -07:00
James Chen
6b69112fda
fixed #1516 : TestLua compilation error when the path of cocos2d-x contains spaces
2012-10-19 16:52:38 +08:00
James Chen
149d1e4e8e
Merge pull request #1477 from dumganhar/iss1024-bb-ttf
...
issue #1024 : Merged PR #1464
2012-10-19 01:38:19 -07: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
James Chen
677df5ffd5
Merge pull request #1476 from dumganhar/gles20
...
Made TestJavascript and MoonWarriors work ok on android after merging Rolando's commit.
2012-10-19 00:28:24 -07:00
James Chen
871541ac6b
Updated one comment.
2012-10-19 15:03:10 +08:00
James Chen
e5096ce091
Made TestJavascript and MoonWarriors work ok on android after merging Rolando's commit.
2012-10-19 15:01:05 +08:00
James Chen
fe019b913d
Merge pull request #1475 from dumganhar/iss1517-ff16
...
fixed #1517 : Upgrading js engine to FF 16.0.1.
2012-10-18 23:04:09 -07:00
James Chen
533cb8dc48
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1517-ff16
2012-10-19 13:57:34 +08:00
James Chen
1a373f70ff
issue #1517 : Upgrading js engine to FF 16.0.1 for IOS.
2012-10-19 13:41:03 +08:00
James Chen
476a184a09
issue #1517 : Updated js library for android.
2012-10-19 11:48:42 +08:00
James Chen
1fc2d2ce1f
Merge pull request #1470 from dumganhar/gles20
...
fixed #1515 : Adding a zoom function for debugging large resolution (e.g.new ipad) app on desktop.
2012-10-18 20:44:32 -07:00
James Chen
9d4fc77058
Merge pull request #2 from minggo/zoom-scale
...
Zoom scale on mac os
2012-10-18 20:43:39 -07:00
minggo
8455d8c7c2
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into zoom-scale
2012-10-19 11:40:48 +08:00
minggo
b821021db7
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into zoom-scale
2012-10-19 11:34:12 +08:00
minggo
f40b6ac4eb
fixed #1515 : implement zoom function on mac os
2012-10-19 11:33:06 +08:00
James Chen
08bb6718cd
issue #1517 : Added ws2_32.lib for MoonWarriors.vcxproj and TestJavascript.vcxproj.
2012-10-19 11:21:27 +08:00
James Chen
de3376b43f
issue #1517:[Win32]Upgrading SpiderMonkey js engine to FF 16.0.1
2012-10-19 11:15:23 +08:00
James Chen
8b87d9b083
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-10-19 09:44:52 +08:00
wenbin1989
4a50d6903c
add Korean Language Type in CurrentLanguageTest
...
I have tested the Korean Language Type of CurrentLanguageTest in ios,
android, mac. Works fine.
2012-10-19 09:41:46 +08:00
Rolando Abarca
ee6e139316
updates cxx-generator
2012-10-18 17:46:10 -07:00
Rolando Abarca
b0f02a0773
updates on the js front
2012-10-18 17:44:41 -07:00
John Garrison
f4d68a707f
More BB Font fixes
2012-10-18 13:43:31 -04:00
ImperialPenguin
41cd0d495b
Merge pull request #1 from dumganhar/iss1024-bb-ttf
...
issue #1024 : Made blackberry/CCImage.cpp compiled ok.
2012-10-18 07:06:55 -07: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
a66e44848a
Merge pull request #1473 from dumganhar/iss1516-fps-size
...
fixed #1516 : The font size of labels for displaying FPS,SPF,DrawCount is incorrect in different design resolutions.
2012-10-18 00:54:59 -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
minggo
d68f7c76f6
Merge pull request #1471 from minggo/iss1466-shader-test
...
reloading shader when coming to foreground
2012-10-17 20:03:22 -07:00
minggo
501ceb21eb
fixed #1466:restore shader when comming to background
2012-10-18 11:00:44 +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
minggo
b6426f01ff
fixed #1466:restore shader when comming to background
2012-10-18 10:39:56 +08:00
minggo
bfa7991a94
fixed #1466:restore shader when comming to background
2012-10-18 10:15:46 +08:00
James Chen
1e45a72db0
Merge pull request #1469 from dumganhar/gles20
...
fixed #1511 : Changed '#if(WINVER >= 0x0601)' to '#if(_MSC_VER >= 1600)'.
2012-10-17 18:56:25 -07: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
cfb1f11d44
Merge pull request #1467 from dumganhar/gles20
...
Fix a bug about calculating client area on win32.
2012-10-17 01:53:45 -07: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
7f97041b49
Merge pull request #1466 from dumganhar/gles20
...
Fix a bug about wrong touch area for windows.
2012-10-17 00:39:44 -07:00
James Chen
249ef92697
fix a bug about wrong touch area for windows.
2012-10-17 15:38:03 +08:00
James Chen
08507dba31
Merge pull request #1465 from dumganhar/iss1511-glframebuffer-check
...
issue #1511 : fixes as follows:
[1] OpenGL framebuffer access violation fix
[2] Fixing include paths to be able to compile cocos2d-x using external Visual Studio solution
[3] Application built in release mode will get writable directory in system disk.
[4] Multi-Touch support for win7/8 tablet or ultrabook.
2012-10-17 00:22:08 -07:00