Walzer
|
f7b294fe24
|
fixed #467 CCLayer:m_eTouchDelegateType = ccTouchDeletateAllBit all the time, which makes an error logic if adding standard touch delegate when CCTouchDispatcher::m_tLock = ture
|
2011-04-24 15:38:03 +08:00 |
yangws
|
252f3efe1a
|
CCIMEDispatcher works on android.
|
2011-04-22 16:33:41 +08:00 |
Walzer
|
3e643d73a3
|
Merge branch 'master' of https://github.com/flyingpacer/cocos2d-x into flyingpacer-master
|
2011-04-22 16:02:15 +08:00 |
RongHong
|
22316eeb11
|
Update the iOS template version and add cocosdension include directory to helloworld make file
|
2011-04-22 15:49:05 +08:00 |
natural-law
|
df00c32d5b
|
fixed #466. [wophone] Modify the template and the Makefile.ARM file for wophone.
|
2011-04-22 11:49:14 +08:00 |
natural-law
|
e2ce006db2
|
fixed #466. [wophone] Refactor the CCFileUtils for the new packing approach.
|
2011-04-22 10:57:46 +08:00 |
natural-law
|
acb4bb5a16
|
Merge branch 'master' into iss428
Conflicts:
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
|
2011-04-21 14:58:58 +08:00 |
natural-law
|
5d2ac1fc0c
|
fixed #428, Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
|
2011-04-21 14:46:15 +08:00 |
minggo
|
8458058f26
|
Merge branch 'iss393' of https://github.com/minggo/cocos2d-x into minggo-iss393
|
2011-04-20 17:19:03 +08:00 |
minggo
|
fd45cbea77
|
[android] fixed #393: use new version of libxml2, it supports xpath and xslt
|
2011-04-20 17:08:50 +08:00 |
minggo
|
7b51fa8e9b
|
[android] fixed #393: use new version of libxml2, it supports xpath and xslt
|
2011-04-20 16:11:18 +08:00 |
minggo
|
e5441a4fc2
|
fixed #450: can set default pixel format other than RGBA8888
|
2011-04-20 15:34:33 +08:00 |
yangws
|
85027c40ca
|
CCIMEDispatcher works on ios.
|
2011-04-19 18:11:57 +08:00 |
minggo
|
4ffe24fc8e
|
Merge branch 'iss374' of https://github.com/natural-law/cocos2d-x into natural-law-iss374
|
2011-04-19 13:45:56 +08:00 |
minggo
|
f1363af496
|
Merge branch 'master' of https://github.com/natural-law/cocos2d-x into natural-law-master
|
2011-04-19 11:49:50 +08:00 |
minggo
|
26da27aaca
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-04-19 11:48:33 +08:00 |
minggo
|
0db048de73
|
Merge branch 'issue_456' of https://github.com/minggo/cocos2d-x into minggo-issue_456
|
2011-04-19 11:36:00 +08:00 |
Walzer
|
735b6ce97b
|
CCMutableArray::count() may crash if m_array is empty. Detect empty() before iteration
|
2011-04-19 11:23:02 +08:00 |
minggo
|
c38af3c28d
|
fixed #456: integrate libcurl into cocos2dx
|
2011-04-19 10:57:44 +08:00 |
yangws
|
d11bd85d00
|
CCTextFieldTTF works on win32.
|
2011-04-19 09:32:33 +08:00 |
walzer
|
32342d376a
|
fixed #460, make cocos2dx+box2d template can find libxml2, and use libxml2.dylib in ios sdk instead of user/lib/libxml2.dylib
|
2011-04-19 09:26:41 +08:00 |
minggo
|
a4e9f1c18d
|
libcurl works ok on ios
|
2011-04-18 14:12:41 +08:00 |
natural-law
|
adbf349116
|
fixed #449. Modify the wophone Makefile.ARM for remove mac support.
|
2011-04-18 11:35:57 +08:00 |
walzer
|
0738f751d1
|
Merge branch 'point_math' of https://github.com/moadib/cocos2d-x
|
2011-04-16 15:22:44 +08:00 |
walzer
|
eb4b31e4da
|
update config file from doxygen 1.7.2 to 1.7.4. add simple brief for CCMessageBox
|
2011-04-16 15:21:50 +08:00 |
moadib
|
03093a98b5
|
In pointmath-related functions parameters should be passed by reference
|
2011-04-16 10:55:02 +04:00 |
minggo
|
37e7fad0d3
|
issue #456: add curl test & libcurl.so works ok on android
|
2011-04-15 17:15:05 +08:00 |
walzer
|
73f2c5297c
|
#define ccp CCPointMake(...) to cocos2d::CCPointMake(...). Thanks Marat Yakupov's fix. http://www.cocos2d-x.org/boards/6/topics/1200
|
2011-04-14 16:15:12 +08:00 |
minggo
|
932b475170
|
fixed #448: make CCCallFuncO invoke correct parameter
|
2011-04-13 11:53:25 +08:00 |
minggo
|
7f6e0052a1
|
Merge branch 'iss341' of https://github.com/natural-law/cocos2d-x into natural-law-iss341
|
2011-04-12 15:43:48 +08:00 |
minggo
|
a165663b4c
|
[andorid] merge Macarse-inflateViews into master and sychrolize it to HelloWorld
|
2011-04-12 15:37:44 +08:00 |
natural-law
|
da7c608ab8
|
fixed #341. Modify the location of allocate memory for m_pTMXLayers.
|
2011-04-12 15:31:54 +08:00 |
minggo
|
8e85f56f97
|
Merge branch 'inflateViews' of https://github.com/Macarse/cocos2d-x into Macarse-inflateViews
|
2011-04-12 15:12:48 +08:00 |
minggo
|
d8115cacea
|
[android] fixed #453: cocosdenshion can replace the background music
|
2011-04-12 14:43:21 +08:00 |
minggo
|
0b7ca9c865
|
fixed #449: remove the code that suppots mac platform
|
2011-04-11 17:04:45 +08:00 |
minggo
|
3d6fd051ab
|
issue #449: refactor CCTransition
|
2011-04-11 16:09:14 +08:00 |
natural-law
|
ba933f9456
|
fixed #341, modify the implementation of function CCTMXTiledMap::layerNamed().
|
2011-04-11 15:59:59 +08:00 |
minggo
|
37bb33d9e5
|
fixed #452: refactor CCDirector CCNode CCGrid
|
2011-04-11 15:10:09 +08:00 |
Macarse
|
0203141aaf
|
Now the size depends on the GLView size
|
2011-04-11 00:28:12 -03:00 |
natural-law
|
d4dbedca4d
|
fixed #451,remove the code of support mac platform.
1. Remove the EventDispatcher.
2. Refactor CCLayer, CCMenu and CCParticleSystemPoint.
3. Modify the project file of win32, wophone and android.
|
2011-04-11 11:24:10 +08:00 |
Macarse
|
da78032542
|
Added the possibility of inflating Cocos2dxGLSurfaceView from an xml
|
2011-04-10 17:57:17 -03:00 |
walzer
|
3bac490581
|
doxygen config for 0.8.2
|
2011-04-08 14:22:54 +08:00 |
walzer
|
2d518c7a6c
|
update doxgyen config for 0.8.2
|
2011-04-08 14:11:59 +08:00 |
walzer
|
4c528108c9
|
changelog for 0.8.2
|
2011-04-08 14:08:59 +08:00 |
walzer
|
0173d0c3b7
|
Merge branch 'master' of https://github.com/minggo/cocos2d-x
|
2011-04-07 16:57:58 +08:00 |
minggo
|
e28d226f3a
|
synchronize Cocos2dxMusic.java from tests to HelloWorld
|
2011-04-07 16:16:48 +08:00 |
walzer
|
d4cfe30df8
|
CHANGELOG of 0.8.2
|
2011-04-07 16:08:10 +08:00 |
minggo
|
1f6bbacb0a
|
[android] fix a bug of cocosdenshion::rewindBackgroundMusic()
|
2011-04-07 15:59:01 +08:00 |
walzer
|
63f323456c
|
Merge branch '0.8.2_vc10' of https://github.com/yangws/cocos2d-x
|
2011-04-07 15:16:30 +08:00 |
yangws
|
09c06d2410
|
vc2010 project compile ok.
|
2011-04-07 14:37:19 +08:00 |