Lu Guanqun
497ae7c33f
fix the reorder warning of class CCCallFunc
...
../actions/CCActionInstant.h: In constructor 'cocos2d::CCCallFunc::CCCallFunc()':
../actions/CCActionInstant.h:240:25: warning: 'cocos2d::CCCallFunc::<anonymous union>::m_pCallFunc' will be initialized after [-Wreorder]
../actions/CCActionInstant.h:236:6: warning: 'int cocos2d::CCCallFunc::m_nScriptHandler' [-Wreorder]
../actions/CCActionInstant.h:188:5: warning: when initialized here [-Wreorder]
2012-12-10 16:05:17 +08:00
Lu Guanqun
64772d09b0
fix the doxygen output of CCAtlasNode
2012-12-10 15:31:26 +08:00
James Chen
fc16cd8d01
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-12-10 14:21:18 +08:00
James Chen
839288671e
fixed #1606 : Override update function for ExtraAction.
2012-12-10 14:11:42 +08:00
minggo
71f61596e9
fixed #1580:request focus after keyboard closed
2012-12-10 14:08:01 +08:00
dualface
d854f68c63
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:51:37 +08:00
dualface
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
James Chen
f8c96483a0
fixed #1606 : Return CCSequence pointer for CCSequence::create.
2012-12-10 12:02:24 +08:00
James Chen
73dd652604
fixed #1605 : Crash occurs when adding just one action to CCSequence.
2012-12-10 11:10:11 +08:00
James Chen
062179c497
fixed #1604 : The enum values in ccPVR3TexturePixelFormat are truncated to 32bit
2012-12-10 10:22:06 +08:00
Mat Hopwood
f75f6c2b64
Mac OS Marmalade fixes
...
Fixed compile issues on Mac OS
2012-12-10 09:54:34 +08:00
Romain TISSERAND
bc0309f1a3
[android] Removed hardcoded /data/data path in CCFileUtils, make use of Context.getCacheDir() through JNI callback instead. Needed in order to get CCUserDefault working fine on Nexus 10 (Androi 4.2 multi-user environment)
2012-12-09 19:40:41 +01:00
Romain TISSERAND
4cb7506932
Added proper JNIEXPORT / JNICALL modifiers to Cocos2dxHelper JNI functions called from Java side
2012-12-09 13:44:41 +01:00
James Chen
0d90fea7b3
Merge branch 'myFeature' of https://github.com/tks2shimizu/cocos2d-x into iss1602-rand-ccdictionary
...
Conflicts:
cocos2dx/cocoa/CCDictionary.cpp
cocos2dx/cocoa/CCDictionary.h
2012-12-07 10:40:32 +08:00
Tomoaki Shimizu
e680e5f0f2
Add randomObject to CCDictionary
...
Although CCArray has randomObject(), CCDictionary does not have it.
So CCDictionary should have randomObject().
2012-12-06 23:56:49 +09:00
minggo
a75f8b7e7a
fixed #1593:remove all deprecated methods expect CCBAnimationManager
2012-12-06 18:51:33 +08:00
minggo
cfd6e6c82a
Merge pull request #1726 from fape/hungarian_language_support
...
Add Hungarian language support
2012-12-05 17:39:46 -08:00
fape
e488361e3b
cosmetics: fix formating
2012-12-05 11:43:04 +01:00
fape
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
minggo
d858ce2fe2
some android devices can not compile this frag
2012-12-05 17:15:47 +08:00
minggo
99781368c4
Merge pull request #1677 from chenium/gles20
...
Fix for CCRenderTexture on Android sleep/resume
2012-12-04 22:40:00 -08:00
minggo
c3a5e870af
Merge pull request #1725 from minggo/merge_jp_support
...
Merge jp support
2012-12-04 22:11:42 -08:00
minggo
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
minggo
75d7df5bcf
Merge pull request #1684 from lvklabs/gles20-for-pull
...
Added removeAllObjects() to CCSet
2012-12-04 20:05:56 -08:00
minggo
cb2427e780
do some modification
2012-12-04 17:25:40 +08:00
James Chen
3e88f8d2e4
fix compilation errors in eclipse project for linux.
2012-12-04 16:48:23 +08:00
James Chen
8a8038b342
Enable stencil buffer for linux.
2012-12-04 16:48:23 +08:00
James Chen
6aa15e0636
Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode.
2012-12-04 16:48:23 +08:00
James Chen
cedd58bb77
#extension GL_OES_standard_derivatives : enable only valid in GL_ES, this fixes crashes on some Linux machines.
2012-12-04 16:47:57 +08:00
James Chen
ed86e2967f
Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm
...
fixed #1590 : JPEG and File fixes and CocosDenshion fix for marmalade.
2012-12-03 19:10:14 -08:00
Mat Hopwood
3b2eea2541
JPEG and File fixes
...
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
2012-12-04 11:03:34 +08:00
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
Andres Pagliano
97efff6e46
Removed unnescessary header
2012-11-30 11:30:45 -03:00
Andres Pagliano
8adb3eb6eb
Refactoring in CCSet
2012-11-30 11:23:44 -03:00
Gonzalo Buteler
43cc383346
Implementation of removeAllObjects() methods in CCSet
2012-11-30 10:44:09 -03: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
William Chen
132a76d801
Fix for CCRenderTexture on Android sleep/resume
...
When an android app goes into the background, all gl context is lost, including any frame buffer objects that are required for rendering to a texture. When the android app returns to focus, a new FBO is generated for each render texture allowing rendering to the texture to continue.
2012-11-29 18:04:07 -05: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
Taro Kobayashi
3a814de07e
implemented CCApplication::getCurrentLanguage() for linux platform
2012-11-28 19:41:50 +09:00
Taro Kobayashi
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09: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
James Chen
3fc2f9888b
issue #1564 : Fix crash of ParticlesTest.
2012-11-21 17:22:26 +08:00
minggo
a69ff7957c
issue #1564:fix a logical erroe in CCRotationTo
2012-11-21 16:53:23 +08:00
James Chen
170978d6a5
issue #1564 : Added ClippingNodeTest.
2012-11-21 15:22:54 +08:00
James Chen
b632c3cd7c
issue #1564 : Minor fix in CCLabelBMFont::createFontChars().
2012-11-21 10:06:03 +08:00
minggo
a246d11110
issue #1564 : update some test cases
2012-11-20 17:30:05 +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
James Chen
eed80761be
issue #1564 : Bugs fixes in CCDrawNode.cpp.
2012-11-20 16:31:33 +08:00
James Chen
e8cf71407d
issue #1564 : Deleted physics_nodes in cocos2dx since it was moved to extension.
2012-11-20 16:27:47 +08:00
James Chen
76c5ad8b32
issue #1564 : Deleted physics_nodes in cocos2dx since it was moved to extension.
2012-11-20 16:24:40 +08:00
James Chen
8a21d4e824
issue #1564 : Moved physics_node to extension.
2012-11-20 16:17:20 +08:00
folecr
03d9a04608
cc_utf8_strlen is used in Android native code; should not be static
2012-11-19 15:57:16 -08:00
James Chen
c3e02f3e52
Merge pull request #1597 from dumganhar/iss1555-update
...
issue #1555 : Updated ActionsTest.cpp, enabled point size in DrawPrimitivesTest.cpp.
2012-11-19 02:15:22 -08:00