James Chen
2238db301b
fixed #1301 : CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
2012-06-06 14:13:40 +08:00
James Chen
d827cdacc0
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-06 10:07:12 +08:00
James Chen
6bb2941ec9
fixed #1300 : Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
2012-06-06 10:06:51 +08:00
James Chen
07269f8505
Merge pull request #968 from dumganhar/gles20
...
fixed #1297 : Retina mode can't work in 'Projection2D' mode.
2012-06-05 00:30:34 -07:00
James Chen
56817244ed
fixed #1297 : Retina mode can't work in 'Projection2D' mode.
2012-06-05 15:27:46 +08:00
minggo
0ff2e55c0c
Merge pull request #967 from minggo/iss1296_tilemap
...
fixed #1296 : fix logical error of CCTMXTileMap::tilesetForLayer()
2012-06-04 19:53:06 -07:00
minggo
7733607fe2
fixed #1296 : fix logical error of CCTMXTileMap::tilesetForLayer()
2012-06-05 10:51:53 +08:00
minggo
91813bf082
Merge pull request #966 from minggo/iss1290_shader_path
...
fixed #1290:use Shaders folder in correct way
2012-06-04 18:41:50 -07:00
minggo
dc24094b5f
fixed #1290:use Shaders folder in correct way
2012-06-04 11:41:03 +08:00
James Chen
1b4de48e86
Merge pull request #961 from icewind/gles20
...
fixed #1289 : CCControlButton update. Added zoomOnTouchDown property and setPreferredSize.
2012-06-03 19:55:39 -07:00
minggo
ae15525e32
Merge pull request #965 from NatWeiss/gles20
...
fixed #1288:Enhances CCTransitionScene to work even if there is no running scene.
2012-06-03 07:36:17 -07:00
minggo
a0186cd081
Merge pull request #964 from NatWeiss/patch-1
...
Update AUTHORS
2012-06-02 18:47:47 -07:00
minggo
ddcd69c453
Update AUTHORS
2012-06-03 09:47:07 +08:00
minggo
1d59f0ced6
Update AUTHORS
2012-06-03 09:45:51 +08:00
minggo
414be07f59
Merge pull request #962 from NatWeiss/8b6026f932ef6d0f284b8d73ac5657b79eec10ea
...
fixed #1287:Android template's build_native.sh automatically copies new icons
2012-06-02 18:45:05 -07:00
NatWeiss
b17eeb4cb7
Update AUTHORS
2012-06-01 17:53:47 -07:00
icewind
ac268896f1
CCControlButton update. Added zoomOnTouchDown property and setPreferredSize
...
Ported some functions from original CCControlExtensions repository.
Added feature to set the preferred size of the background sprite and
toggle zooming on TouchDown event
2012-06-01 14:07:45 +04:00
Nat Weiss
0fedc8a84a
Enhances CCTransitionScene to work even if there is no running scene.
2012-06-01 00:54:17 -07:00
Nat Weiss
8b6026f932
Android template's build_native.sh automatically copies new icons from your assets directory.
2012-06-01 00:36:16 -07:00
James Chen
f6ae01c523
Merge pull request #959 from dumganhar/typo_fix
...
Typo fixed in CCGL.h
2012-05-31 23:50:11 -07:00
James Chen
3959fe8f4d
typo fixed in CCGL.h
2012-06-01 14:48:45 +08:00
minggo
987374c76b
Update AUTHORS
2012-06-01 14:48:13 +08:00
minggo
63cf48f548
Merge pull request #958 from NatWeiss/gles20
...
fixed #1286 : Fixes the declaration of tgaLoadRLEImageData()
2012-05-31 23:46:36 -07:00
Nat Weiss
472c98b652
Fixes the declaration of tgaLoadRLEImageData() to match it's implementation. This causes an android build to be successful.
2012-05-31 23:20:56 -07:00
James Chen
4ad8690c21
Merge pull request #957 from dumganhar/iss1282_ati
...
Deleted libEGL.dll(.lib).
2012-05-31 22:58:06 -07:00
James Chen
2b235fd705
Delete libEGL.dll(.lib).
2012-06-01 13:56:22 +08:00
James Chen
d643506bda
Merge pull request #956 from dumganhar/iss1282_ati
...
fixed #1282 : Used opengl directly on win32.
2012-05-31 22:50:30 -07:00
James Chen
cfbf29ccfc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1282_ati
2012-06-01 13:47:23 +08:00
James Chen
ebcc78497f
fixed #1282 : Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
2012-06-01 13:44:28 +08:00
minggo
9c708458f3
Merge pull request #955 from minggo/gles20
...
typo fix
2012-05-31 21:05:37 -07:00
minggo
28486c39ad
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-01 12:04:44 +08:00
minggo
93b5fc37c7
typo fix
2012-06-01 12:04:04 +08:00
minggo
ad9d852298
Merge pull request #954 from minggo/gles20
...
add CCBReader into project
2012-05-31 20:02:02 -07:00
minggo
dfa1216ba9
add CCBReader into project
2012-06-01 11:01:09 +08:00
James Chen
41be8ff832
Merge pull request #953 from dumganhar/iss1280_labeltest
...
fixed #1280 : BitmapFontMultiLineAlignment test can't work correctly.
2012-05-31 00:42:01 -07:00
James Chen
63a6b97bc5
fixed #1280 : Renamed some functions.
2012-05-31 15:32:18 +08:00
James Chen
b39af18a5f
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1280_labeltest
2012-05-31 13:08:19 +08:00
James Chen
cec50ae2d8
fixed #1280 : BitmapFontMultiLineAlignment test can't work correctly.
...
We should invoke 'this->setString(m_sString_initial.c_str(), true);' in the 'CCLabelBMFont::updateLabel'.
2012-05-31 13:07:25 +08:00
minggo
f583ad2f7a
Merge pull request #950 from minggo/gles20
...
Gles20
2012-05-30 20:14:37 -07:00
minggo
3cdb10c613
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-05-31 11:13:40 +08:00
minggo
30fedb78d5
update changelog
2012-05-31 11:07:08 +08:00
minggo
34c0b96018
Merge pull request #949 from minggo/gles20
...
modify android template comment and modify engine version
2012-05-30 19:15:08 -07:00
James Chen
c596257a6d
Merge pull request #948 from dumganhar/gles20
...
Updated main.cpp for each project of android.
2012-05-30 19:14:41 -07:00
minggo
9237804b29
modify engine version
2012-05-31 10:14:00 +08:00
James Chen
9be586e4ec
Updated main.cpp for each project of android.
2012-05-31 10:13:05 +08:00
minggo
97fbcf6b6a
fixed #1191 : modify comment
2012-05-31 10:11:24 +08:00
minggo
b09155c60e
Merge pull request #947 from minggo/gles20
...
fixed #1191 : update xcode template
2012-05-30 18:53:28 -07:00
minggo
a283bfed4f
fixed #1191 : update xcode template
2012-05-31 09:52:39 +08:00
minggo
5ad2bec3d8
Merge pull request #946 from minggo/gles20
...
fix some bug
2012-05-30 03:33:19 -07:00
minggo
a698f9bf69
fix some bug
2012-05-30 18:31:20 +08:00