James Chen
c8dfe7f92b
issue #1310 : Finished CCRenderTexture.h(.cpp).
2012-06-08 14:30:55 +08:00
James Chen
26cf81e42e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/CCScheduler.h
cocos2dx/include/ccTypes.h
2012-06-08 14:14:13 +08:00
James Chen
c5cf23c859
issue #1310 : First commit since sync to rc2.
2012-06-08 14:11:48 +08:00
minggo
f96c4d5d23
Merge pull request #981 from minggo/gles20
...
issue #1310 : syncronize actions
2012-06-07 22:58:57 -07:00
minggo
cc16320445
issue #1310 : syncronize actions
2012-06-08 13:55:28 +08:00
minggo
2b55a76970
Merge pull request #978 from minggo/iss1202_remove_CCFileData
...
fixed #1202:remove CCFileData
2012-06-06 23:15:05 -07:00
minggo
49d8ac72f6
fixed #1202:remove CCFileData
2012-06-07 14:13:44 +08:00
James Chen
8e2a5876e6
Merge pull request #977 from dumganhar/gles20
...
fixed #1308 : Used std::sort to sort the touchHandler array.
2012-06-06 20:46:05 -07:00
James Chen
f466b081c9
fixed #1308 : Used std::sort to sort the touchHandler array.
2012-06-07 11:38:59 +08:00
James Chen
fea278b5b2
Merge pull request #976 from dumganhar/gles20
...
fixed #1308 : Strange TouchDispatcher behavior.
2012-06-06 07:50:49 -07:00
James Chen
c64c4a74bf
fixed #1308 : Strange TouchDispatcher behavior.
2012-06-06 22:49:28 +08:00
James Chen
d351b32642
Merge pull request #974 from dumganhar/gles20
...
fixed #1297 : fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().
2012-06-06 00:57:47 -07:00
James Chen
4b7f9f582f
fixed #1297 : fixed a bug in CCRenderTexture::begin. The parameters of glViewPort should not multiply CC_CONTENT_SCALE_FACTOR().
2012-06-06 15:56:55 +08:00
minggo
6cf8ea283d
Merge pull request #973 from minggo/iss1278_effect_android
...
fixed #1278 : stop effect when unloading effect
2012-06-06 00:41:26 -07:00
minggo
1ff04700b5
fixed #1278 : stop effect when unloading effect
2012-06-06 15:38:25 +08:00
James Chen
8db6ab8c2b
Merge pull request #972 from dumganhar/gles20
...
fixed #1302 : The parameter of CCMenu::setHandlerPriority should be signed int.
2012-06-06 00:18:48 -07:00
James Chen
734ea54aba
fixed #1302 : The parameter of CCMenu::setHandlerPriority should be signed int.
2012-06-06 15:16:02 +08:00
James Chen
10e0180809
Merge pull request #971 from dumganhar/gles20
...
Removed some unused codes.
2012-06-05 23:34:37 -07:00
James Chen
37aa196c73
Removed some unused codes.
2012-06-06 14:31:49 +08:00
James Chen
84441e8595
Merge pull request #970 from dumganhar/gles20
...
fixed #1301 : CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
2012-06-05 23:25:32 -07:00
James Chen
2238db301b
fixed #1301 : CCEGLView::sharedOpenGLView().setScissorInPoints() should apply scissor in points.
2012-06-06 14:13:40 +08:00
James Chen
c8b62d4ec8
Merge pull request #969 from dumganhar/gles20
...
fixed #1300 : Typo: CC_ENABLE_CACHE_TEXTTURE_DATA -> CC_ENABLE_CACHE_TEXTURE_DATA
2012-06-05 19:09:17 -07: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