samuele3hu
|
6aa667c912
|
Add CC_DLL for FontFNT
|
2014-08-08 15:22:43 +08:00 |
minggo
|
7b11c6a74e
|
Merge pull request #7237 from martell/v3
Cmake update and remove old scripts from build folder
|
2014-08-07 10:36:10 +08:00 |
minggo
|
4542b1882d
|
Merge pull request #7617 from rny/SpriteFrameCache
SpriteFrameCache load from plist file content data
|
2014-08-07 10:20:36 +08:00 |
martell
|
75911658aa
|
Make CMake More Robust
|
2014-08-06 15:43:19 +01:00 |
minggo
|
6ee0c4171f
|
Merge pull request #7622 from rny/LabelTTF
fix LabelTTF::getBoundingBox() position error
|
2014-08-06 14:33:28 +08:00 |
minggo
|
f786190349
|
Merge pull request #7652 from zhiqiangxu/labelbmfont_getboundingbox
bug fix for LabelBMFont::getBoundingBox()
|
2014-08-06 14:28:52 +08:00 |
andyque
|
e2e8325f58
|
add safe guard when remove component from node componentContainer
|
2014-08-06 13:51:16 +08:00 |
minggo
|
9f51adfafa
|
Merge pull request #7461 from joshuastray/fix_constructor_access
fix LabelAtlas constructor protected to CC_CONSTRUCTOR_ACCESS
|
2014-08-06 10:15:02 +08:00 |
minggo
|
1bad9ddbc2
|
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
V3 wp8glviewhookpr
|
2014-08-05 13:51:15 +08:00 |
minggo
|
cd98034f16
|
Merge pull request #7631 from maltium/v3
added 3D rotation support to the RotateTo action
|
2014-08-05 13:30:43 +08:00 |
huangshiwu
|
9c87522199
|
little more modefy
|
2014-08-04 17:34:50 +08:00 |
huangshiwu
|
9a3f231771
|
merge v3 into v3_wp8glviewhookpr
|
2014-08-04 16:49:42 +08:00 |
huangshiwu
|
efcb8b9962
|
wp8 glview hook solution 1
|
2014-08-04 14:17:14 +08:00 |
yangxiao
|
4452d9579a
|
merge cocos2d, fix lua
|
2014-08-04 12:07:27 +08:00 |
huangshiwu
|
372479d812
|
wp8 GLView Hook
|
2014-08-02 16:31:16 +08:00 |
xuzhiqiang
|
85dd898319
|
bug fix
|
2014-08-02 08:04:29 +08:00 |
huangshiwu
|
575c9787c0
|
Merge branch 'v3' into v3_pr
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-08-01 15:11:34 +08:00 |
maltium
|
baba808391
|
RotateBy action now uses just Vec3() to keep track of the state
|
2014-07-31 23:28:33 +02:00 |
maltium
|
98354e9f8e
|
RotateTo action now uses Vec3() to keep track of the state
|
2014-07-31 23:05:58 +02:00 |
yangxiao
|
e03d284e26
|
merge cocos2d
|
2014-07-31 18:55:41 +08:00 |
zhangbin
|
d224c77bd4
|
Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.
|
2014-07-31 17:51:06 +08:00 |
samuele3hu
|
ee4e479ce1
|
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
|
2014-07-31 16:38:55 +08:00 |
songmiao
|
58c32e52c7
|
windows works
|
2014-07-31 14:08:05 +08:00 |
maltium
|
3d44439e2a
|
added 3D rotation support to the RotateTo action
|
2014-07-30 21:42:47 +02:00 |
huangshiwu
|
ef69faf3ba
|
GLView Hook
|
2014-07-31 00:53:04 +08:00 |
Ningyu
|
d53cdc39df
|
tab to spaces
|
2014-07-30 16:20:58 +08:00 |
Ningyu
|
52ca596b3d
|
code tidy
|
2014-07-30 16:19:05 +08:00 |
Ningyu
|
61a87e7e8b
|
fix LabelTTF::getBoundingBox() position error
|
2014-07-30 14:00:01 +08:00 |
Ningyu
|
aebe8317bd
|
spaces
|
2014-07-29 17:22:13 +08:00 |
Ningyu
|
d5242ef4fa
|
add
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
|
2014-07-29 17:06:43 +08:00 |
Ningyu
|
23e0ed3767
|
add
SpriteFrameCache::addSpriteFramesWithFileContent()
SpriteFrameCache::removeSpriteFramesFromFileContent()
|
2014-07-29 16:58:33 +08:00 |
Huabing.Xu
|
ea802580a2
|
add script to copy sqllite3.dll to output dir on windows
|
2014-07-29 15:02:34 +08:00 |
minggo
|
5d63ce17ad
|
Merge pull request #7610 from dabingnn/v3_windowChangeModule
V3 window change module
|
2014-07-29 14:29:01 +08:00 |
boyu0
|
c63d64e385
|
set emission rate when setTotalParticles()
|
2014-07-29 10:48:20 +08:00 |
Huabing.Xu
|
aaa65dcae4
|
Merge branch 'v3' into v3_windowChangeModule
|
2014-07-29 10:20:23 +08:00 |
Huabing.Xu
|
4a4f05c827
|
change cocos2d to libcocos2d for windows
|
2014-07-28 20:55:58 +08:00 |
minggo
|
7ad7b5b3f7
|
Merge pull request #7585 from wagulu/patch-1
Update CCParticleSystem.cpp
|
2014-07-28 10:54:05 +08:00 |
Dhilan007
|
b9cfa4a8b5
|
fix warn
|
2014-07-25 14:38:02 +08:00 |
LiuZhuo
|
2f10e8e468
|
Update CCParticleSystem.cpp
|
2014-07-25 11:40:23 +08:00 |
Huabing.Xu
|
58cd01b2f6
|
reverse cocos2d.vcxproj
|
2014-07-24 10:37:54 +08:00 |
wagulu
|
46ac5d12b2
|
Update CCParticleSystem.cpp
diff is base on WorldSpace, when you scale scene,you will get the wrong value.
|
2014-07-23 21:04:17 +08:00 |
minggo
|
3662077025
|
Merge pull request #7556 from Dhilan007/v3
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
|
2014-07-23 11:29:26 +08:00 |
LinWenhai
|
0fe02b3636
|
Update CCFontAtlasCache.cpp
|
2014-07-22 22:07:19 +08:00 |
LinWenhai
|
815d063a0a
|
replace sprintf with snprintf
|
2014-07-22 22:05:56 +08:00 |
Sergey
|
2acce6771f
|
software per decompression support
|
2014-07-22 15:49:36 +04:00 |
Dhilan007
|
f38b48914f
|
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
|
2014-07-22 18:31:53 +08:00 |
zhangcheng
|
6cfc5b72dc
|
1. CocosStudio adapt to cocos2d-x v3.2.
|
2014-07-21 17:45:56 +08:00 |
Huabing.Xu
|
e666ab88ed
|
fix windows compile error
|
2014-07-21 14:59:47 +08:00 |
Jialong Zhai
|
012f5403d9
|
protected -> CC_CONSTRUCTOR_ACCESS
|
2014-07-21 11:17:58 +08:00 |
Huabing.Xu
|
23db16b0bd
|
convert indention to space
|
2014-07-18 14:53:00 +08:00 |