fape
|
3cc5920aac
|
Update samples/TestCpp to compatible with marmalade
|
2012-11-24 20:14:01 +01:00 |
minggo
|
a423317abc
|
issue #1564:make iOS test work ok
|
2012-11-23 16:30:09 +08:00 |
minggo
|
96ecb05ca9
|
issue #1564: make tests run on mac osx
|
2012-11-23 14:22:50 +08:00 |
minggo
|
226b10a9e2
|
modify lua project setting
|
2012-11-23 10:41:41 +08:00 |
James Chen
|
24c83cb461
|
Merge pull request #1617 from dumganhar/iss1564-update-tests
issue #1564: Fix crash of ParticlesTest.
|
2012-11-21 01:24:59 -08:00 |
James Chen
|
d0ccff9081
|
issue #1564: Updated ClippingNodeTest.
|
2012-11-21 16:28:31 +08:00 |
minggo
|
ab14c0ddc2
|
Merge pull request #1615 from minggo/gles20
create stencil buffer for TestCpp
|
2012-11-21 00:03:41 -08:00 |
minggo
|
ed6d14580a
|
issue #1564:create stencil buffer for TestCpp
|
2012-11-21 16:00:40 +08:00 |
James Chen
|
9cf9c9943d
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
|
2012-11-21 15:42:26 +08:00 |
James Chen
|
f17f5bbe7b
|
issue #1564: Updated ClippingNodeTest.
|
2012-11-21 15:41:47 +08:00 |
minggo
|
2e152ada45
|
issue #1564:add CClippingNodeTest
|
2012-11-21 15:36:48 +08:00 |
James Chen
|
dd2b15cba0
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
samples/TestCpp/Classes/tests.h
|
2012-11-21 15:27:47 +08:00 |
James Chen
|
170978d6a5
|
issue #1564: Added ClippingNodeTest.
|
2012-11-21 15:22:54 +08:00 |
minggo
|
3a789c075f
|
issue #1564:add ChipmunkTest
|
2012-11-21 12:02:29 +08:00 |
minggo
|
5a4da366ed
|
issue #1564:update DrawPrimitivesTest
|
2012-11-21 11:43:08 +08:00 |
minggo
|
b8af64e798
|
issue #1564:update LabelTest
|
2012-11-20 18:17:47 +08:00 |
minggo
|
a80ae8b27b
|
issue #1564:update LayerTest
|
2012-11-20 18:00:27 +08:00 |
minggo
|
d27ff67098
|
issue #1564:update ParallaxTest
|
2012-11-20 17:43:26 +08:00 |
minggo
|
faaa8e1e1b
|
issue #1564:update ParticleTest
|
2012-11-20 17:39:11 +08:00 |
minggo
|
a246d11110
|
issue #1564: update some test cases
|
2012-11-20 17:30:05 +08:00 |
minggo
|
fc40008711
|
Merge branch 'iss1564-update-tests' of https://github.com/dumganhar/cocos2d-x into iss1564-update-tests
|
2012-11-20 16:51:41 +08:00 |
minggo
|
9c1e90e981
|
issue #1564:update RenderTextureTest
|
2012-11-20 16:45:59 +08:00 |
James Chen
|
8f6c8e202e
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
|
2012-11-20 16:35:42 +08:00 |
James Chen
|
ebd522e3fa
|
issue #1564: Return a new object instead of 'const reference' for some get methods.
|
2012-11-20 16:34:55 +08:00 |
minggo
|
f15135f26a
|
issue #1564:update SchedulerTest
|
2012-11-20 16:24:27 +08:00 |
James Chen
|
62a502e365
|
issue #1564: Renamed ChipmunkAccelTouchTest to ChipmunkTest.
|
2012-11-20 16:19:05 +08:00 |
minggo
|
c026a1f488
|
issue #1564:update ShaderTest
|
2012-11-20 16:16:16 +08:00 |
minggo
|
fce5b79a09
|
issue #1564:update SpriteTest
|
2012-11-20 15:19:57 +08:00 |
minggo
|
2c09b68815
|
Merge pull request #1601 from minggo/iss1564-update-tests
update tests
|
2012-11-19 18:46:20 -08:00 |
minggo
|
31cfebd0d7
|
issue #1564:update Texture2dTest
|
2012-11-20 10:42:03 +08:00 |
James Chen
|
af36ada6e4
|
issue #1555: Enabled point size in DrawPrimitivesTest.cpp.
|
2012-11-19 17:16:45 +08:00 |
James Chen
|
5734a2d9bc
|
issue #1555: Updated ActionsTest.cpp
|
2012-11-19 17:15:16 +08:00 |
minggo
|
0b5a86bf42
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1562-label-test
|
2012-11-19 16:29:00 +08:00 |
minggo
|
38232e4eb5
|
issue #1562:update TileMapTest
|
2012-11-19 16:28:37 +08:00 |
James Chen
|
f2e0df4de3
|
issue #1565: Removed VS2008 support.
|
2012-11-19 14:42:27 +08:00 |
minggo
|
29fc9a6af7
|
issue #1564:update MenuTest
|
2012-11-19 13:57:54 +08:00 |
minggo
|
fb5b7ed7bb
|
fixed #1560:fix a logical error in CCNode::schedule()
|
2012-11-19 11:24:03 +08:00 |
fape
|
30b026421e
|
The S3E data dir ONLY used by the emulator/simulator.
|
2012-11-17 13:49:01 +01:00 |
James Chen
|
db2175e41c
|
Merge pull request #1582 from guanqun/build-fixes
two simple build fixes
|
2012-11-17 02:13:22 -08:00 |
James Chen
|
c5b5b978fa
|
issue #1555: Made win32 works ok.
|
2012-11-16 17:08:34 +08:00 |
Lu Guanqun
|
17e23f61a7
|
remove unused private field in KeypadTest
|
2012-11-16 15:19:43 +08:00 |
minggo
|
b497143f93
|
issue #1555:menu can receive touch event now
|
2012-11-16 14:51:48 +08:00 |
minggo
|
cb2bc37513
|
issue #1555: make tests work
|
2012-11-15 18:34:23 +08:00 |
James Chen
|
b5b0e289eb
|
fixed #1557: set the window size of TestCpp for marmalade port.
|
2012-11-12 10:46:26 +08:00 |
James Chen
|
833b5b1be8
|
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
|
2012-11-12 10:20:04 +08:00 |
James Chen
|
26547c7b30
|
fixed #1548: Updated libcurl header files to 7.26.0 on iOS.
|
2012-11-05 13:13:46 +08:00 |
minggo
|
95d3f87bd7
|
fix compiling error on linux 64 bit
|
2012-11-01 15:38:48 +08:00 |
minggo
|
ad64beb769
|
invoke base class's onExit() to avoid memory leak
|
2012-10-31 11:33:53 +08:00 |
Mat Hopwood
|
2b265929e2
|
Marmalade Sample data removed and merged changes
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
|
2012-10-25 21:40:37 +01:00 |
James Chen
|
e07ca43c3d
|
fixes a compilation error in TestCpp.
|
2012-10-24 16:28:54 +08:00 |