minggo
|
bbcbfa71ef
|
Merge pull request #1704 from minggo/cclayer_script_support
Cclayer script support
|
2012-12-03 18:55:11 -08:00 |
James Chen
|
609fce7e2f
|
fix MenuTest crash after the commit(SHA-1:98045f667f80f78fec8452103a114b573f3a3204).
|
2012-12-04 10:36:13 +08:00 |
minggo
|
7ad2484a91
|
Merge branch 'fix_CCLayer_script_support' of https://github.com/dualface/cocos2d-x into cclayer_script_support
|
2012-12-04 09:50:01 +08:00 |
James Chen
|
7c074d4ced
|
issue #1550: fixed a memory leak in jsbinding.
|
2012-12-03 22:17:53 +08:00 |
minggo
|
af530878fd
|
Merge pull request #1690 from dualface/fix_CCCallFunc_script_support
Fix cc call func script support
|
2012-12-02 18:26:05 -08:00 |
dualface
|
e0ee27cb17
|
[luabinding] fix CCLayer:getScriptTOuchHandlerEntry()
[luabinding] add CCLayer keypad, accelerometer support
|
2012-12-02 15:17:34 +08:00 |
dualface
|
030f5e7079
|
[luabinding] cleanup script handler when release CCCallFunc
|
2012-12-02 15:01:12 +08:00 |
dualface
|
393ce26330
|
rollback commit
|
2012-12-02 14:56:44 +08:00 |
dualface
|
d929fe2893
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-12-01 22:20:08 +08:00 |
dualface
|
058b6e9f65
|
fix CCCallFunc for script
|
2012-12-01 22:19:54 +08:00 |
folecr
|
fc65b786ad
|
Use the "old" particle system quad code.
|
2012-11-30 13:22:01 -08:00 |
James Chen
|
95875112fa
|
Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
|
2012-11-30 21:19:19 +08:00 |
James Chen
|
98045f667f
|
issue #1583: Added CCMenu::alignItemsInColumnsWithArray, CCMenu::alignItemsInRowsWithArray, CCLayer::CCLayerMultiplex and CCLayer::initWithArray.
|
2012-11-30 21:13:25 +08:00 |
minggo
|
54309c56b2
|
change accelerometer accurate to SENSOR_DELAY_GAME
|
2012-11-30 14:07:01 +08:00 |
minggo
|
75fb997513
|
Merge pull request #1670 from rohankuruvilla/gles20
Fixing Accelerometer crash on Android
|
2012-11-29 22:01:16 -08:00 |
minggo
|
84b35c6d48
|
Merge pull request #1680 from minggo/gles20
comment codes for FPS controlling
|
2012-11-29 21:58:49 -08:00 |
minggo
|
61b2e2b880
|
comment codes for FPS controlling
|
2012-11-30 13:55:25 +08:00 |
James Chen
|
23629b8187
|
Made all projects compiled ok on Blackberry port.
|
2012-11-30 12:40:47 +08:00 |
James Chen
|
788b478b3c
|
Make sure HelloCpp can be full screen.
|
2012-11-29 16:31:29 +08:00 |
Rohan Kuruvilla
|
a4b55b5217
|
Fixing Accelerometer crash on Android
|
2012-11-28 15:56:57 -08:00 |
fape
|
1843d576d8
|
create cocos2dx-ext marmalade project
|
2012-11-26 20:14:10 +01:00 |
James Chen
|
d7ebd681ec
|
fix a warning in CCRenderTexture.
|
2012-11-26 22:11:56 +08:00 |
James Chen
|
be914811fb
|
fixed #1576: CCNode::setUserObject needs to be retained.
|
2012-11-26 22:11:04 +08:00 |
minggo
|
69f6b3970a
|
Merge pull request #1647 from guanqun/fix-doxygen
Fix doxygen related errors and warnings
|
2012-11-25 23:26:48 -08:00 |
minggo
|
6bb11d8d71
|
Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20
|
2012-11-26 15:09:34 +08:00 |
minggo
|
bd025c94c3
|
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
|
2012-11-26 15:08:40 +08:00 |
minggo
|
1b9a38e195
|
issue #1564:work ok on linux
|
2012-11-26 11:46:37 +08:00 |
James Chen
|
a730f8866f
|
Merge pull request #1644 from fape/testcpp_marmalade
fixed #1575: Update samples/TestCpp to compatible with marmalade
|
2012-11-25 17:51:32 -08:00 |
Lu Guanqun
|
64bec838c0
|
fix doxygen rendering output of CCLayerGradient
Otherwise, the first line of CCLayerGradient is rendered with a box in
doxygen's output.
|
2012-11-25 23:27:29 +08:00 |
fape
|
e259467873
|
update marmalade languages
|
2012-11-25 12:13:30 +01:00 |
fape
|
3cc5920aac
|
Update samples/TestCpp to compatible with marmalade
|
2012-11-24 20:14:01 +01:00 |
minggo
|
1cf237d296
|
Merge pull request #1643 from minggo/gles20
issue #1564:make iOS test work ok
|
2012-11-23 00:31:06 -08:00 |
minggo
|
a423317abc
|
issue #1564:make iOS test work ok
|
2012-11-23 16:30:09 +08:00 |
minggo
|
3980a710a3
|
Merge pull request #1641 from minggo/gles20
issue #1564: make tests run on mac osx
|
2012-11-22 22:24:25 -08:00 |
minggo
|
96ecb05ca9
|
issue #1564: make tests run on mac osx
|
2012-11-23 14:22:50 +08:00 |
minggo
|
f82e800695
|
Merge pull request #1640 from minggo/gles20
modify lua project setting
|
2012-11-22 18:42:45 -08:00 |
minggo
|
226b10a9e2
|
modify lua project setting
|
2012-11-23 10:41:41 +08:00 |
James Chen
|
00ad0689ec
|
Merge pull request #1620 from fape/remove_physics_nodes
remove physics_nodes from marmalade
|
2012-11-22 03:43:24 -08:00 |
minggo
|
2ba1bcb5af
|
Merge pull request #1633 from minggo/gles20
issue #1564:enable depth test by default
|
2012-11-22 00:02:28 -08:00 |
minggo
|
76197f1126
|
issue #1564:enable depth test by default
|
2012-11-22 16:01:30 +08:00 |
James Chen
|
b79b3335bd
|
Merge pull request #1630 from dumganhar/iss1564-update-tests
issue #1564: Made ChipmunkTest of TestJavascript works
|
2012-11-21 23:30:14 -08:00 |
James Chen
|
b66bc98a46
|
issue #1564: Made ChipmunkTest of TestJavascript works
|
2012-11-22 15:19:16 +08:00 |
James Chen
|
aa8e582b7e
|
Merge pull request #1629 from dumganhar/iss1564-update-tests
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
|
2012-11-21 20:07:45 -08:00 |
James Chen
|
51d61ba214
|
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
Made MoonWarriors works.
|
2012-11-22 12:05:38 +08:00 |
minggo
|
14dbe091c8
|
fix a logical bug in CCRenderTExture
|
2012-11-22 11:06:07 +08:00 |
James Chen
|
73b409f116
|
issue #1564: Enable point size by default on windows. This can fix point size is always equal to 1 pixel in DrawPrimitivesTest.
|
2012-11-22 10:04:35 +08:00 |
James Chen
|
6c81e21935
|
issue #1564: Set depth buffer to 24bit, stencil buffer to 8bit.
|
2012-11-22 09:55:44 +08:00 |
James Chen
|
e1f7c0bab6
|
issue #1564: Removing one unnecessary line in CCRenderTexture::visit.
|
2012-11-22 09:55:43 +08:00 |
fape
|
db883f4efc
|
remove physics_nodes from marmalade
|
2012-11-21 21:34:33 +01: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 |