yangxiao
f6ad1df092
android work
2014-07-31 11:47:47 +08:00
andyque
1de2b78d61
refactor, optimize Scale9Sprite
2014-07-31 11:07:20 +08:00
yangxiao
38c86f7697
skeleton retain
2014-07-31 10:57:19 +08:00
yangxiao
2c29560514
add CC_DLL
2014-07-31 10:28:39 +08:00
yangxiao
44c501ca2a
merge cocos2d
2014-07-31 09:56:23 +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
yangxiao
9f1cfbfca5
add skeleton and refactor skin
2014-07-30 18:32:34 +08:00
andyque
03368d42f2
refactor, improve imageView stability
2014-07-30 17:29:22 +08:00
andyque
e6b85fbd77
fix minor bugs of UISlider and remove unused header include in ListView
2014-07-30 16:55:16 +08:00
Huabing.Xu
65775f2d30
remove CC_CONSTUCTOR_ACCESS fow win32 release
2014-07-30 16:39:21 +08:00
andyque
83298171d9
refactor Layout
2014-07-30 16:33:37 +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
andyque
7bcb31f225
refactor loadingBar
2014-07-30 16:08:29 +08:00
andyque
c5d2585049
refactor Slider control
2014-07-30 15:52:27 +08:00
andyque
6492167974
refactor ImageView
2014-07-30 15:27:18 +08:00
andyque
a6e376f93c
refactor UIButton
2014-07-30 15:19:39 +08:00
Huabing.Xu
428e9b1b1a
Merge branch 'v3' into v3_buildAllTarget
2014-07-30 14:12:28 +08:00
Ningyu
61a87e7e8b
fix LabelTTF::getBoundingBox() position error
2014-07-30 14:00:01 +08:00
andyque
f2b0528cc9
refactor
2014-07-30 10:45:35 +08:00
andyque
e7da7b3e42
change unsigned long to size_type
2014-07-30 10:34:37 +08:00
andyque
7abea5dc58
add utf8 support for UITextField
2014-07-30 10:34:37 +08:00
andyque
955da5d3cc
move utf8_substr to ui::helper class.
2014-07-30 10:34:37 +08:00
andyque
4a40604955
refactor getScale9Enabled to isScale9Enabled
2014-07-30 10:31:40 +08:00
Huabing.Xu
d86cc0a811
decouple libcocos2d and cocosdenshion
2014-07-29 18:08:40 +08:00
andyque
5a22636441
fix windows compile error
2014-07-29 17:51:34 +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
gin0606
ef4852b7ec
Fix iOS VideoPlayer memory leak.
2014-07-29 17:56:03 +09:00
andyque
c5ca0dbf10
fix android and linux compile error
2014-07-29 16:24:27 +08:00
andyque
1daaea1410
remove extension::Scale9Sprite dependency
2014-07-29 16:24:27 +08:00
andyque
ebf05d1acc
add UIScale9Sprite tests
2014-07-29 16:24:27 +08:00
andyque
717f20571b
add UIScale9Sprite implementation
2014-07-29 16:24:27 +08:00
andyque
32ed796657
add UIScale9Sprite
2014-07-29 16:24:27 +08:00
minggo
4c2fd90286
Merge pull request #7614 from andyque/fixBindingGenerate
...
fix binding generator can nott regonize unsigned long arguments
2014-07-29 16:13:26 +08:00
andyque
98ef180ca8
add default value to luaval_to_ulong
2014-07-29 15:59:49 +08:00
andyque
cfe7e57561
fix binding generator can nott regonize unsigned long arguments
2014-07-29 15:48:12 +08:00
Huabing.Xu
bca92772dd
remove unused windows localstorage project file
2014-07-29 15:23:07 +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
minggo
52dfb7224e
Merge pull request #7609 from boyu0/bug5762_setTotalParticles
...
Closed #5762 : ParticleSystemQuad::setTotalParticles() can't set a value larger than the initialized value.
2014-07-29 13:55:33 +08:00
dzl-ian
b8248a165b
Correct some typos/mistakes in declarations
2014-07-29 13:47:21 +09:00
Huabing.Xu
c722c0fcd0
libcocostudio for windows
2014-07-29 11:31:37 +08:00
Huabing.Xu
e91fa0e9fc
libcocosbuilder rename for windows
2014-07-29 11:09:02 +08:00
yangxiao
da4ba95806
SubMesh and Attachment
2014-07-29 10:49:06 +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
eacf003eed
change libExtensions for windows
2014-07-29 10:07:46 +08:00
Huabing.Xu
bf287252df
change libnetwork and libSpine
2014-07-29 09:31:52 +08:00
Unai Orbe
406a718a4c
reuse file utils when resolving video path (ios)
2014-07-28 15:24:17 +01:00
Huabing.Xu
d6bc2f4998
liuGUI->libui for windows
2014-07-28 22:12:07 +08:00
Huabing.Xu
c6956504bf
change CocosDenshion to libcocosdenshion
2014-07-28 21:35:16 +08:00
Huabing.Xu
8f9ce2e282
change cocosbuilder to lowercase
2014-07-28 21:09:43 +08:00
Huabing.Xu
4a4f05c827
change cocos2d to libcocos2d for windows
2014-07-28 20:55:58 +08:00
minggo
bf6e706ab9
fix xcode project setting
2014-07-28 15:37:00 +08:00
minggo
b2e705acd8
Merge pull request #7567 from andyque/fixWidgetCallbackDeleteSelf
...
fix remove self in Widget touch callback issue
2014-07-28 14:04:20 +08:00
minggo
191f7a57e1
Merge pull request #7078 from reckhou/v3
...
Optimize FPS control algorithm under Android.
2014-07-28 14:00:55 +08:00
CocosRobot
12042bfd9d
[AUTO]: updating luabinding automatically
2014-07-28 03:38:12 +00:00
minggo
9efbd6e4ef
Merge pull request #7600 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:34:13 +08:00
pandamicro
823bd437d8
Refactor #5580 : Improve searchFullPathForFilename and comments
2014-07-28 11:14:11 +08:00
minggo
cf7de08f22
Merge pull request #7594 from boyu0/image_premulti_alpha_refactor
...
Image premultiplied alpha refactor
2014-07-28 11:02:33 +08:00
minggo
7ad7b5b3f7
Merge pull request #7585 from wagulu/patch-1
...
Update CCParticleSystem.cpp
2014-07-28 10:54:05 +08:00
minggo
11012478ad
Merge pull request #7597 from Dhilan007/v3-video-android
...
Fix the size of VideoPlayer is incorrect on android.
2014-07-28 10:47:19 +08:00
minggo
a8bb2462de
Merge pull request #7052 from gin0606/videoPlayerScaleIssue
...
Fix video scale issue in iOS
2014-07-28 10:43:13 +08:00
minggo
b58569151b
Merge pull request #7590 from andyque/fixWidgetContentSize
...
Simplify Widget ContentSize cascade change algorithm
2014-07-28 10:40:05 +08:00
boyu0
85b9765b8f
Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()
2014-07-28 10:38:22 +08:00
minggo
9805a4bbf2
Merge pull request #7588 from Dhilan007/v3
...
fix warn
2014-07-28 10:33:01 +08:00
Dhilan007
f7a08d5697
Fix the size of VideoPlayer is incorrect on android.
2014-07-28 10:09:46 +08:00
Huabing.Xu
3e9b900665
Merge branch 'v3' into v3_windowChangeModule
2014-07-28 09:23:45 +08:00
Huabing.Xu
7f5782c207
chang module name for windows project file
2014-07-28 09:20:02 +08:00
Dhilan007
66e54c3a77
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
2014-07-27 22:07:16 +08:00
dzl-ian
bc30519812
Add missing space in function definition
2014-07-27 08:23:16 +09:00
minggo
31af102f26
Merge pull request #7532 from lite3/object_to_luaval
...
replace dynamic_cast to std::is_base_of
2014-07-25 23:11:55 +08:00
boyu0
34a8d26124
Deprecate Texture2D::PVRImagesHavePremultipliedAlpha(), move Texture2D::PVRImagesHavePremultipliedAlpha() to Image.
2014-07-25 18:19:04 +08:00
boyu0
e3b79f4150
delete Image::_preMulti, Deprecate Image::isPremultipliedAlpha(), change Image::hasPremultipliedAlpha() meaning.
2014-07-25 18:01:32 +08:00
Dhilan007
154be91808
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-newaudio
2014-07-25 17:58:40 +08:00
gin0606
c66ebbf528
Fix void* casting
2014-07-25 16:41:12 +09:00
andyque
7353f8685a
Simplify Widget ContentSize cascade change algorithm
2014-07-25 14:59:58 +08:00
dzl-ian
7048bc515b
Remove update of content size as it won't change
2014-07-25 15:52:35 +09:00
Dhilan007
b9cfa4a8b5
fix warn
2014-07-25 14:38:02 +08:00
andyque
3502cb0a23
fix remove self in Widget touch callback issue
2014-07-25 14:23:04 +08:00
dzl-ian
3ad0d981c4
Add getter and setter for TextColor to Text Widget
2014-07-25 14:46:25 +09:00
gin0606
4ee13994ce
Fix Scale issue on cocos2d-x cpp-test
2014-07-25 13:10:16 +09:00
LiuZhuo
2f10e8e468
Update CCParticleSystem.cpp
2014-07-25 11:40:23 +08:00
minggo
20e3a61524
Merge pull request #7578 from newnon/v3_mac_custom_font_fix_v2
...
mac custom font fix v2
2014-07-25 11:38:38 +08:00
minggo
88d4adda63
Merge pull request #7586 from samuele3hu/v3_retain
...
Fix the a error in the `ccmap_string_key_to_luaval` function
2014-07-25 11:26:33 +08:00
minggo
98943b4517
Merge pull request #7548 from yongkangchen/v3
...
fix Label::setTextColor did not have any effect.
2014-07-25 11:18:10 +08:00
samuele3hu
1d055fe6e6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_retain
2014-07-25 09:44:52 +08:00
samuele3hu
e51cb57c53
Fix the a error in the `ccmap_string_key_to_luaval` functions
2014-07-25 09:44:17 +08:00
minggo
d3e30b1b32
Merge pull request #7574 from andyque/fixRichTextVisitIssue
...
fix RichText visit issue
2014-07-25 09:24:58 +08:00
CocosRobot
8cc0a2eea3
[AUTO]: updating luabinding automatically
2014-07-24 14:23:49 +00:00
minggo
b0c922d91e
Merge pull request #7188 from pandamicro/FileUtils_FILE_API
...
Refactor #5580 : Add new file&directory apis into FileUtils and test cases
2014-07-24 22:18:10 +08:00
Reck Hou
44c675f9ee
Fix: Application::setAnimationInterval() not implemented.
2014-07-24 19:22:17 +08:00
Unai Orbe
ae56e637f8
allow setting bundle to use in file utils
2014-07-24 11:56:59 +01:00
minggo
fa1d9ecf0c
Merge pull request #7568 from 2youyouo2/v3
...
fixed init Armature blendfunc state
2014-07-24 17:44:56 +08:00
Sergey
9501b9912d
load font v2
2014-07-24 12:25:07 +04:00
Huabing.Xu
c7bfc934fd
windows works now
2014-07-24 12:57:39 +08:00
andyque
a9a16b3ee5
fix RichText visit issue
2014-07-24 11:51:47 +08:00
Huabing.Xu
f795ca5467
Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError
2014-07-24 10:38:25 +08:00
Huabing.Xu
58cd01b2f6
reverse cocos2d.vcxproj
2014-07-24 10:37:54 +08:00
Huabing.Xu
918da16639
Merge remote-tracking branch 'mac/v3' into v3_fixWindowsCompileError
2014-07-24 10:09:59 +08:00
kaile.yin
3b1ee96aef
fixed armature blendfunc effect
2014-07-23 21:35:08 +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
kaile.yin
01d85340ad
fixed black edge in Armature
2014-07-23 20:07:33 +08:00
Huabing.Xu
61ff03ab45
windows cpp-tests works now
2014-07-23 18:34:49 +08:00
minggo
0f105a58c2
Merge pull request #7563 from andyque/minorFixOfRichText
...
minor fix of RichText
2014-07-23 18:17:41 +08:00
kaile.yin
bdad6d9b67
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-23 15:24:36 +08:00
kaile.yin
5aae024a7b
fixed cannot set blendfunc to Armature
2014-07-23 15:21:20 +08:00
CocosRobot
283d727b76
[AUTO]: updating luabinding automatically
2014-07-23 06:21:31 +00:00
andyque
21f1624462
minor fix of RichText
2014-07-23 14:10:00 +08:00
samuele3hu
0a6af2f758
Add more useful tip for error log
2014-07-23 13:44:57 +08:00
samuele3hu
6d678ce443
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_conversion
2014-07-23 11:57:56 +08:00
samuele3hu
91fc288fbe
Add more useful tip for error log
2014-07-23 11:57: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
9e692cd329
missing include
2014-07-22 15:49:39 +04:00
Sergey
59cbc153d4
Copyright & small fixes
2014-07-22 15:49:38 +04:00
Sergey
9c0493d40b
mipmaps loading fix
2014-07-22 15:49:37 +04:00
Sergey
600dbebfb0
pvr 2bpp decompression fixed
2014-07-22 15:49:37 +04:00
Sergey
624b6a5af4
unused variable removed
2014-07-22 15:49:37 +04:00
Sergey
1a617ad804
pvr display fix pvr decompression on 64 bit platforms fix
2014-07-22 15:49:36 +04:00
Sergey
2acce6771f
software per decompression support
2014-07-22 15:49:36 +04:00
minggo
f2f0152f54
Merge pull request #7555 from CocosRobot/update_lua_bindings_1406020122
...
[AUTO]: updating luabinding automatically
2014-07-22 18:36:30 +08:00
minggo
2e56a4ce21
Merge pull request #7546 from nutty898/v3_nutty_modifynodereader
...
Fixed bug of NodeReader
2014-07-22 18:34:36 +08:00
Dhilan007
f38b48914f
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
2014-07-22 18:31:53 +08:00
CocosRobot
c8c17b68df
[AUTO]: updating luabinding automatically
2014-07-22 09:11:18 +00:00
minggo
8cc25f82e6
fix compiling error
2014-07-22 17:03:27 +08:00
Yongkang Chen
bb7d6ba3d4
fix Label::setTextColor did not have any effect.
2014-07-22 14:52:41 +08:00
samuele3hu
aa0308a7c8
Add more useful tip for error log
2014-07-22 11:16:16 +08:00
zhangcheng
76c12e9029
1. add export to function CocosGUIVersion()
2014-07-22 10:02:00 +08:00
cai wenzhi
d14522880d
Fixed bug of NodeReader
2014-07-21 22:45:33 +08:00
zhangcheng
bc254cab25
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport
2014-07-21 20:46:55 +08:00
Huabing.Xu
3403182f3e
change define macros to avoid run error on mac 32 bit
2014-07-21 18:12:46 +08:00
zhangcheng
6cfc5b72dc
1. CocosStudio adapt to cocos2d-x v3.2.
2014-07-21 17:45:56 +08:00
minggo
8e3220ba9e
Merge pull request #7533 from dabingnn/v3_windowsDllCompileError
...
fix windows compile error
2014-07-21 17:17:33 +08:00
pandamicro
d2c6602dea
Refactor #5580 : Merge createDirectories to createDirectory
2014-07-21 16:51:48 +08:00
samuele3hu
d9dc6ea2f7
Reset Webscoket
2014-07-21 16:05:10 +08:00
samuele3hu
5e773edb28
Merge branch 'more_details_for_conversion_error_msg' of https://github.com/edwardzhou/cocos2d-x into v3_conversion
2014-07-21 16:01:56 +08:00
Huabing.Xu
e666ab88ed
fix windows compile error
2014-07-21 14:59:47 +08:00
lite3
d66d9b02de
replace dynamic_cast to std::is_base_of
2014-07-21 14:37:46 +08:00
minggo
7ba4f2ed5e
Merge pull request #7526 from chenguangqi/v3
...
fixed compile error.
2014-07-21 13:54:31 +08:00
CocosRobot
30b00dadd8
[AUTO]: updating luabinding automatically
2014-07-21 03:57:41 +00:00
minggo
45fa2363e8
Merge pull request #7517 from dabingnn/v3_dll
...
V3 dll
2014-07-21 11:53:36 +08:00
Jialong Zhai
012f5403d9
protected -> CC_CONSTRUCTOR_ACCESS
2014-07-21 11:17:58 +08:00
edwardzhou
bf4143b5a3
show detail class & function name on conversion error
2014-07-21 09:39:41 +08:00
edwardzhou
0f2fde38fa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-21 09:36:18 +08:00
陈广歧
8b4953bbfc
fixed compile error.
...
```bash
# compile for android.
$ ./build_native.py
```
Error message as follow:
```
ssize_tjni/../../cocos2d/cocos/./3d/CCBundleReader.cpp:94:23: error: return type of out-of-line
definition of 'cocos2d::BundleReader::tell' differs from that in the declaration
ssize_t BundleReader::tell()
^
jni/../../cocos2d/cocos/./3d/CCBundleReader.h:90:14: note: previous declaration is here
long int tell();
^
1 error generated.
```
2014-07-19 18:29:52 +08:00