Huabing.Xu
e7e94ffe70
add const constrain for getVertexData() and getIndexData()
2014-08-07 17:59:36 +08:00
Huabing.Xu
274140fbf8
linux work now
2014-08-07 02:35:04 -07:00
yangxiao
1e15131b2b
simplify code
2014-08-07 16:24:44 +08:00
samuele3hu
53eb0345a5
Remove useless library for cocos2d_lua_bindings
2014-08-07 16:15:42 +08:00
yangxiao
34f6368ff7
change function to const
2014-08-07 15:57:15 +08:00
Huabing.Xu
9891f438ba
change copyright
2014-08-07 15:53:20 +08:00
Huabing.Xu
ba2ae6826c
Merge branch 'v3_migrateFastTMX' into v3_renderPrimitive
2014-08-07 15:36:41 +08:00
yangxiao
579ae882e3
add to cocos2d.h
2014-08-07 15:33:23 +08:00
GavinThornton
8cc5e66e73
Update CCSpriteBatchNode.cpp
...
Setting opacity of a sprite (via setOpacity or FadeOut/In action) has the sprite turning black, it should simply be opaque.
Cause is in bool SpriteBatchNode::initWithTexture, third line, "if(tex->hasPremultipliedAlpha())"
Fix is making it "!if(!tex->hasPremultipliedAlpha())"
2014-08-07 00:31:33 -07:00
yangxiao
3c9483899e
camera, cameratest, drawNode3D squash
2014-08-07 15:23:31 +08:00
Huabing.Xu
9978065d00
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_renderPrimitive
2014-08-07 15:13:47 +08:00
samuele3hu
3c31af4523
Update CMakeLists.txt for storage
2014-08-07 15:07:29 +08:00
Huabing.Xu
16842b4a69
android work now, add shadowBuffer to recreate VBO
2014-08-07 14:15:49 +08:00
huangshiwu
b7aa046cd2
wp8 compile fix -additional
2014-08-07 14:09:22 +08:00
samuele3hu
cf0aa36c15
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
samuele3hu
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
huangshiwu
0016c7af70
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix
2014-08-07 11:58:01 +08:00
huangshiwu
24d68305e1
WP8 compile fix
2014-08-07 11:56:28 +08:00
minggo
1ece703945
Merge pull request #7694 from CocosRobot/update_lua_bindings_1407379142
...
[AUTO]: updating luabinding automatically
2014-08-07 10:56:04 +08:00
minggo
a7d5b7af56
Merge pull request #7691 from Dhilan007/v3
...
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:52:59 +08:00
CocosRobot
91b297b085
[AUTO]: updating luabinding automatically
2014-08-07 02:40:46 +00: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
Dhilan007
9da4ba14f5
fixed can's set outline color for system font correctly on IOS.
2014-08-07 10:04:29 +08:00
martell
b71e0cde3a
Fix libaudio.a outpur directory
2014-08-06 15:45:27 +01:00
martell
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
CocosRobot
f47d11cce0
[AUTO]: updating luabinding automatically
2014-08-06 09:14:13 +00:00
minggo
7a833d66d1
Merge pull request #7676 from samuele3hu/v3_module
...
Split luabindings into serval modules and adjust project settings of test cases
2014-08-06 17:09:12 +08:00
andyque
ab33e6f9a2
Let Widget class don't support cascaded opacity and cascaded color on default.
2014-08-06 16:21:00 +08:00
Huabing.Xu
64c2ede765
IOS work now
...
reset binding buffer to 0 after drawing
2014-08-06 15:46:35 +08:00
samuele3hu
497847f7e8
Reset cpp-tests/cpp-empty-tests Mac build configure to ‘debug’ and delete some auto-bindings files.
2014-08-06 14:46:30 +08: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
minggo
187dc29f6d
Merge pull request #7679 from andyque/fixComponentContainerRemoveIssue
...
add safe guard when remove component from node componentContainer
2014-08-06 14:21:49 +08:00
samuele3hu
9912b596f8
Reset lua-empty-test Mac/iOS build configure to ‘debug’ and delete CCModuleManager.h/cpp by mistake
2014-08-06 13:51:46 +08:00
andyque
e2e8325f58
add safe guard when remove component from node componentContainer
2014-08-06 13:51:16 +08:00
Kenichi Hamada
771996f9f3
Added a function getAssetManager() on CCFileUtilsAndroid
2014-08-06 13:36:04 +09: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
samuele3hu
63b3f838b6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-08-06 09:56:07 +08:00
minggo
e43b05955f
Merge pull request #7674 from darkdukey/patch-12
...
Fix opacity for Slider
2014-08-06 09:50:47 +08:00
minggo
16653bf24e
Merge pull request #7675 from darkdukey/chore/reuse-file-utils-for-video-path
...
Chore/reuse file utils for video path
2014-08-06 09:41:28 +08:00
Nite Luo
0a2afe983c
Fix spacing
2014-08-05 17:56:55 -07:00
Nite Luo
9f34a5c0f2
Fix build for ios
2014-08-05 17:53:15 -07:00
Nite Luo
ac20f51f7b
Fix formatting
2014-08-05 16:53:00 -07:00
Nite Luo
e0855d64df
Merge branch 'v3' into patch-12
...
Conflicts:
cocos/ui/UISlider.cpp
2014-08-05 16:51:02 -07:00
samuele3hu
0daa30419b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/scripting/lua-bindings/auto/api/lua_cocos2dx_auto_api.lua
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
cocos/scripting/lua-bindings/auto/lua_cocos2dx_extension_auto.hpp
tools/tolua/cocos2dx.ini
2014-08-06 00:37:19 +08:00
samuele3hu
6f763917a7
Delte liblua project for win32 and adjust cocos2d-win32 project
2014-08-06 00:26:02 +08:00
samuele3hu
4d4d5374df
Delete Android.mk for cocos_lua_static
2014-08-06 00:18:56 +08:00
samuele3hu
99c52f0102
Split module for Linux on Lua and adjust related test cases
2014-08-06 00:15:44 +08:00
David Partouche
118d4d39f0
Fixed the video player not showing on iOS if it's not in FullScreen mode
2014-08-05 16:07:28 +02:00
samuele3hu
d86a37110d
Split module for win32 and adjust related test cases
2014-08-05 19:46:13 +08:00
Huabing.Xu
b1954ef516
clean up primitive code
2014-08-05 17:49:35 +08:00
Huabing.Xu
01b69c9e4f
Merge branch 'v3' into v3_migrateFastTMX
2014-08-05 17:30:11 +08:00
Huabing.Xu
7353f036db
Merge branch 'v3' into v3_addNewAttribFlag
2014-08-05 15:23:14 +08:00
Huabing.Xu
7fbd81aeca
add NORMAL, BLEND_WEIGHT, BLEND_INDEX flag to be correspondent to GLProgram::VertexAttrib
2014-08-05 15:15:17 +08:00
Huabing.Xu
56551e6787
fast_tmx migrate to primitive command
2014-08-05 15:08:01 +08:00
minggo
1bad9ddbc2
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
...
V3 wp8glviewhookpr
2014-08-05 13:51:15 +08:00
CocosRobot
24da61e443
[AUTO]: updating luabinding automatically
2014-08-05 05:35:12 +00: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
samuele3hu
da18657f4f
Add module Android.mk config and adjust related test cases
2014-08-05 13:29:54 +08:00
CocosRobot
f3e2ebf215
[AUTO]: updating luabinding automatically
2014-08-05 03:57:51 +00:00
CocosRobot
8dd1be5172
[AUTO]: updating luabinding automatically
2014-08-05 02:05:02 +00:00
minggo
cc75a8e860
Merge pull request #7632 from super626/v3
...
SubMesh and AttachMement
2014-08-05 09:59:38 +08:00
minggo
6d09b00e1d
Merge pull request #7649 from andyque/fixPotentialCarshWhenRemoveSelfInCallback
...
fix potential crash when user remove self in widgets callback
2014-08-05 09:46:00 +08:00
minggo
34a0603a52
Merge pull request #7658 from andyque/fixButtonOpacityIssue
...
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled
2014-08-05 09:39:13 +08:00
minggo
007e42faa0
Merge pull request #7616 from gin0606/fix_videoPlayer_ios_memory_leak
...
Fix iOS VideoPlayer memory leak.
2014-08-05 09:30:52 +08:00
andyque
f44906d56c
fix scale9Sprite anchorPoint bug when switch anchor point and scale9Enabled property
2014-08-05 08:11:37 +08:00
Huabing.Xu
f7ad98b15b
using primitve->draw in Fast_tmx on draw
2014-08-04 17:57:31 +08:00
Huabing.Xu
95a8b23d64
fix draw bug in primitive when using indices
2014-08-04 17:56:56 +08:00
huangshiwu
9c87522199
little more modefy
2014-08-04 17:34:50 +08:00
Huabing.Xu
a0d1b0dad8
allow null index buffer when create primitive
2014-08-04 17:21:23 +08:00
samuele3hu
cd0c82f8b7
Split deprecated class, functions and enums to related module and adjust iOS/Mac test case and templates
2014-08-04 17:11:57 +08:00
Huabing.Xu
2dca0a4809
remove IndexData class
2014-08-04 17:00:08 +08:00
huangshiwu
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
Huabing.Xu
414d67851f
add _vertexBuffer back in Fast_tmx
2014-08-04 16:36:20 +08:00
minggo
93ee009366
Merge pull request #7656 from zii/v3
...
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
2014-08-04 16:30:41 +08:00
Huabing.Xu
bbf11f5d06
refactor vertex data
...
using vertex data in fast_tmx
2014-08-04 16:08:54 +08:00
yangxiao
8ffd0fe16e
spelling error
2014-08-04 16:07:16 +08:00
yangxiao
4084fdc461
add new file to cmake
2014-08-04 15:49:12 +08:00
yangxiao
11a13ce9e2
Merge branch 'newcode' into v3
2014-08-04 15:41:21 +08:00
minggo
5deb273486
Merge pull request #7644 from 2youyouo2/v3
...
update ActionTimeline
2014-08-04 15:35:35 +08:00
samuele3hu
e5f9c1b488
Adjust common script and related test cases
2014-08-04 15:22:07 +08:00
zii
20c43e5684
Update ccUtils.h
2014-08-04 15:21:10 +08:00
zii
7659a1623f
Update ccUtils.h
2014-08-04 15:20:45 +08:00
zii
e151795c43
Update ccUtils.cpp
2014-08-04 15:18:01 +08:00
yangxiao
47838ce945
reset
2014-08-04 14:37:26 +08:00
yangxiao
01e0192a2d
reset
2014-08-04 14:29:55 +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
zii
825209dd04
Update ccUtils.cpp
2014-08-04 11:48:23 +08:00
zii
97f06306e3
Update ccUtils.cpp
...
希望加入一个简单获得绝对时间的方法, 包装了gettimeofday.
2014-08-04 11:45:50 +08:00
Huabing.Xu
a44f4c95e1
using indexBuffer instead of raw VBO
2014-08-04 10:40:07 +08:00
samuele3hu
6f4cafcc1b
Add module register functions and adjust iOS and Mac test cases
2014-08-04 09:39:42 +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
andyque
d7b17c598d
fix potential crash when user remove self in widgets callback
2014-08-01 20:58:42 +08:00
Huabing.Xu
3d4bfe7780
using VertexBuffer instead of raw buffer
2014-08-01 17:50:22 +08:00
AppleJDay
b736202a55
replace tab to spaces. Fix compile error of UIRichTextTest.cpp in windows visual studio vs2013.
2014-08-01 17:37:30 +08:00
AppleJDay
2239fafade
Merge branch 'v3' of github.com:AppleJDay/cocos2d-x
2014-08-01 17:22:43 +08:00
CocosRobot
fda11428bf
[AUTO]: updating luabinding automatically
2014-08-01 07:53:19 +00:00
huangshiwu
575c9787c0
Merge branch 'v3' into v3_pr
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-08-01 15:11:34 +08:00
Huabing.Xu
f269d7345e
original version of PrimitiveCommand
2014-08-01 14:46:35 +08:00
kaile.yin
3dcdb1cde4
remove some update condition of Frame::apply function
2014-08-01 14:40:42 +08:00
CocosRobot
26c76f5cf1
[AUTO]: updating luabinding automatically
2014-08-01 04:02:13 +00:00
minggo
0b6254d095
Merge pull request #7587 from dzl-ian/fixTextWidgetColor
...
Add getter and setter for TextColor to Text Widget
2014-08-01 11:57:10 +08:00
kaile.yin
d1407ca929
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-08-01 11:42:18 +08:00
AppleJDay
bcecf09b6c
Merge branch 'v3' of git@github.com:AppleJDay/cocos2d-x.git
2014-08-01 09:18:22 +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
52d3c4461f
adjust
2014-07-31 20:20:29 +08:00
yangxiao
7562214c63
adjust
2014-07-31 20:19:43 +08:00
yangxiao
342dc05890
adjust
2014-07-31 20:17:51 +08:00
yangxiao
4aec1d37c8
code adjust
2014-07-31 20:14:43 +08:00
yangxiao
e03d284e26
merge cocos2d
2014-07-31 18:55:41 +08:00
yangxiao
49052ab28d
code adjust
2014-07-31 18:42:58 +08:00
yangxiao
ca0afcfa92
add Quaternion::ZERO
2014-07-31 18:36:30 +08:00
yangxiao
17304b4775
add comment
2014-07-31 18:28:52 +08:00
yangxiao
780914687e
code style adjust according minggo
2014-07-31 18:14:01 +08:00
kaile.yin
2fc082cac1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-31 17:52:49 +08:00
samuele3hu
6bb21c0f4d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
tools/tolua/cocos2dx.ini
2014-07-31 17:52:22 +08:00
zhangbin
d224c77bd4
Move the CCProtectedNode.cpp & .h from ui to cocos2d on wp8.
2014-07-31 17:51:06 +08:00
kaile.yin
170e1a5d7b
init widget properties
2014-07-31 17:48:45 +08:00
minggo
d44a359a1f
Merge pull request #7635 from samuele3hu/v3_new_module
...
Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting
2014-07-31 17:39:01 +08:00
samuele3hu
2b562ace1a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
2014-07-31 17:22:33 +08:00
minggo
2851bd9193
Merge pull request #7627 from andyque/fixScale9Sprite
...
refactor ui::widgets to use ui::Scale9Sprite instead of extension::Scale9Sprite
2014-07-31 16:58:56 +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
samuele3hu
a47e52b5bc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-07-31 15:22:46 +08:00
samuele3hu
9666f1ad7f
Split luabindings module to some independent modules
2014-07-31 15:20:23 +08:00
Huabing.Xu
a5add07fb5
Merge branch 'v3' into v3_renderPrimitive
2014-07-31 14:31:24 +08:00
minggo
0e7eb3614e
Merge pull request #7618 from dabingnn/v3_buildAllTarget
...
add target to build All target
2014-07-31 14:25:37 +08:00
songmiao
58c32e52c7
windows works
2014-07-31 14:08:05 +08:00
Huabing.Xu
dfee337db1
original version of Primitive
2014-07-31 13:52:39 +08:00
CocosRobot
095d4ed3c5
[AUTO]: updating luabinding automatically
2014-07-31 05:49:25 +00:00
minggo
a77b8e7320
Merge pull request #7608 from andyque/fixTextFieldUtf8Issue
...
add utf8 support for TextField widget
2014-07-31 13:41:57 +08:00
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
Huabing.Xu
99eed6a0be
finish index data
2014-07-30 15:51:41 +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
23406c6463
Merge branch 'v3' into v3_renderPrimitive
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-07-30 15:09:25 +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
AppleJDay
0bd4b608b7
Merge pull request #1 from cocos2d/v3
...
Merge pull request #7604 from minggo/xcode-project-fix Xcode project fix
2014-07-29 08:34:15 +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
AppleJDay
bd5ca6a244
Add Feature #5633:EventMouse should support getDelta, getDeltaX, getDeltaY functions
2014-07-28 10:39:35 +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
Huabing.Xu
68894e622f
add indexData
2014-07-25 11:58:54 +08: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
Huabing.Xu
a4cd61f30a
compiles OK: raw version of vertex Index buffer, half version of vertex data
2014-07-25 09:58:24 +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
Huabing.Xu
b281c38c20
init version of VertexIndexBuffer
2014-07-23 09:20:33 +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
84e82bf497
stopAllActionsByTag && removeAllActionsByTag
2014-07-22 17:14:27 +04: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
minggo
e128a432c1
Merge pull request #7521 from andyque/fixTextFieldDeleteBug
...
fix TextField backspace delete bug
2014-07-18 18:37:07 +08:00
andyque
73b38fbc6b
fix TextField backspace delete bug
2014-07-18 18:13:17 +08:00
minggo
b347c93f47
Merge pull request #7520 from andyque/fixListViewInsertAtIndexBug
...
fix listview insert child at index bug
2014-07-18 18:09:49 +08:00
andyque
4fa1af584c
fix listview insert child at index bug
2014-07-18 18:02:46 +08:00
minggo
aef1e01ce5
Merge pull request #7518 from natural-law/android-dependencies
...
Android dependencies
2014-07-18 17:57:42 +08:00
Huabing.Xu
0be2210724
rename CGSize to NSSize
2014-07-18 16:51:29 +08:00
edwardzhou
6b9e79629f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-18 15:36:54 +08:00
pandamicro
b614854cf9
Refactor #5580 : Improve createDirectories
2014-07-18 15:09:00 +08:00
Huabing.Xu
23db16b0bd
convert indention to space
2014-07-18 14:53:00 +08:00
Huabing.Xu
8afd7614d1
Merge branch 'v3' into v3_dll
2014-07-18 14:01:17 +08:00
minggo
9409a73a06
Merge pull request #7511 from Mazyod/const-data-copy
...
[FIX]: copied data should be const
2014-07-18 11:35:09 +08:00
minggo
405ea3b7b9
Merge pull request #7510 from MSOpenTech/wp8-v3-fix
...
Wp8 v3 shader update
2014-07-18 10:03:48 +08:00
Mazyad Alabduljaleel
a4b4efff1b
[FIX]: copied data should be const
2014-07-18 03:44:39 +04:00
Dale Stammen
24462e1ded
updated wp8 precompiled shaders
2014-07-17 09:41:07 -07:00
samuele3hu
b482a5e971
Use relative path in the cocos2dxLuaLoader for showing useless msg when lua script trigger errors
2014-07-17 23:53:36 +08:00
CocosRobot
8ea5083e32
[AUTO]: updating luabinding automatically
2014-07-17 14:20:04 +00:00
minggo
867fb18c5d
Merge pull request #7503 from CaiCQ/v3
...
修正Linux下中文显示问题
2014-07-17 22:05:15 +08:00
minggo
b4c75bb7f5
Merge pull request #7504 from CocosRobot/update_lua_bindings_1405603442
...
[AUTO]: updating luabinding automatically
2014-07-17 21:41:45 +08:00
andyque
76ffb2261d
fix ios comiple error
2014-07-17 21:44:33 +08:00
CocosRobot
ffaa0d9c04
[AUTO]: updating luabinding automatically
2014-07-17 13:26:35 +00:00
minggo
61597e0e5a
Merge pull request #7496 from Dhilan007/v3-320final
...
Fixed VideoPlayer can't quitting the full screen mode by press the back key on Android.
2014-07-17 21:19:56 +08:00
Dhilan007
51aba5dae4
fixed magic number.
2014-07-17 21:19:09 +08:00
Dhilan007
229b30ed8b
Fixed VideoPlayer can't quitting the full screen mode by press the back key.
2014-07-17 21:10:26 +08:00
Huabing.Xu
21b3e55339
Mac dylib version works now
2014-07-17 20:58:50 +08:00
minggo
462f9bdd78
Merge pull request #7502 from visiblelight/render_texture_disabled
...
The orientation of render texture should be rotated
2014-07-17 20:09:01 +08:00
visiblelight
7e7c3aeb1c
The orientation of render texture should be rotated when _keepMatrix is true
2014-07-17 19:53:35 +08:00
CCQ
2bda9f62a1
Merge branch 'v3' of github.com:CaiCQ/cocos2d-x into v3
2014-07-17 18:58:55 +08:00
CCQ
cb3b9b8405
修正Linux下中文显示不全问题
2014-07-17 18:42:23 +08:00
andyque
7ff78c61ba
fix richText UTF8
2014-07-17 18:36:09 +08:00
Huabing.Xu
52ac47aea8
Merge branch 'v3' into v3_dll
2014-07-17 18:27:36 +08:00
minggo
578af01ef1
Merge pull request #7499 from andyque/fixRichTextUTF8
...
fix richText utf8 error
2014-07-17 17:57:41 +08:00
andyque
fc2ab110cc
fix richText utf8 error
2014-07-17 17:58:40 +08:00
minggo
8381069c75
Merge pull request #7497 from chengstory/v3_fixesActionManagerCrash
...
V3 fixes action manager crash
2014-07-17 17:42:04 +08:00
minggo
1f4b516f66
Merge pull request #7495 from boyu0/physics_flip_bug
...
Fix the bug: flip scale for physics body make it's size incorrect.
2014-07-17 17:28:03 +08:00
zhangcheng
6d0bf8e143
Merge branches 'v3' and 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fixesActionManagerCrash
2014-07-17 17:25:32 +08:00
zhangcheng
24d87ad05b
1. fixes ActionManagerEx crashes.
2014-07-17 17:24:41 +08:00
boyu0
e07215995a
Fix the bug: flip scale for physics body make it's size incorrect.
2014-07-17 17:21:09 +08:00
minggo
91a537dec6
Merge pull request #7493 from visiblelight/render_texture_disabled
...
no need to save/restore for render texture when entering background
2014-07-17 17:07:54 +08:00
vision
a2413a6538
no need to save/restore for render texture when entering background
2014-07-17 17:03:10 +08:00
minggo
c482e2e14f
Merge pull request #7491 from Dhilan007/v3-320final
...
fixed text line wrap issue in UITextField.
2014-07-17 16:48:41 +08:00
Dhilan007
21ea289eb1
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-320final
2014-07-17 16:48:08 +08:00
samuele3hu
10d498e1ae
Fix type judgment error.
2014-07-17 16:41:09 +08:00
Dhilan007
8ac1398037
fixed text line wrap issue in UITextField.
2014-07-17 16:23:38 +08:00
CocosRobot
aabfdfebed
[AUTO]: updating luabinding automatically
2014-07-17 07:46:20 +00:00
minggo
5c0ac02f70
Merge pull request #7479 from samuele3hu/v3_hot_fix
...
Update bindings-generator submodule and update the related Lua bindings for experimental and test cases
2014-07-17 15:40:07 +08:00
minggo
3b3a29ed68
Merge pull request #7477 from Dhilan007/v3-gc0717
...
Fix the y-inverse Joystick bug[IOS].
2014-07-17 15:13:57 +08:00
samuele3hu
db18530d63
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 14:58:50 +08:00
samuele3hu
e975b0d5f9
Update experimental lua bindings、related test cases and project setting
2014-07-17 14:54:34 +08:00
CocosRobot
fda93df648
[AUTO]: updating luabinding automatically
2014-07-17 06:12:42 +00:00
Huabing.Xu
3c6e87d34e
Merge branch 'v3' into v3_dll
...
Conflicts:
cocos/base/ccUtils.h
2014-07-17 14:12:10 +08:00
samuele3hu
ab0fe54d32
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 14:11:15 +08:00
andyque
4f5cd2a368
change FastTileMap to TileMap
2014-07-17 14:09:53 +08:00
minggo
0fe0be18e8
Merge pull request #7475 from CocosRobot/update_lua_bindings_1405566114
...
[AUTO]: updating luabinding automatically
2014-07-17 13:37:20 +08:00
samuele3hu
5682a983bb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 12:57:31 +08:00
samuele3hu
eb8d1d70f7
Update the FastTileMapTest and VideoPlayerTest
2014-07-17 12:55:28 +08:00
samuele3hu
6f109f330f
Update the related Lua bindings for experimental
2014-07-17 12:54:50 +08:00
Dhilan007
a457db53b0
Fix the y-inverse Joystick bug[IOS].
2014-07-17 11:14:53 +08:00
minggo
e58626c11c
Merge pull request #7476 from Dhilan007/v3-gc0717
...
Fixed bugs[Ouya controller]
2014-07-17 11:12:31 +08:00
Dhilan007
1ff937aa48
Fixed bugs[Ouya controller]:
...
1.fix joysticks are reporting the same keycode
2.fix lose disconnected event
2014-07-17 11:09:08 +08:00
CocosRobot
9217589b9f
[AUTO]: updating luabinding automatically
2014-07-17 03:04:08 +00:00
minggo
5a5b245e84
Merge pull request #7474 from andyque/fixFastTileMap
...
change FastTiledMap namespace to cocos2d::experimental
2014-07-17 10:52:40 +08:00
andyque
880c2c4c3f
change FastTiledMap namespace to cocos2d::experimental
2014-07-17 10:46:20 +08:00
minggo
43fe305cc9
Merge pull request #7283 from taug/v3
...
could add seach path and resolution order path in front.
2014-07-17 10:34:45 +08:00
minggo
ab3a394d08
Merge pull request #7472 from CocosRobot/update_lua_bindings_1405563998
...
[AUTO]: updating luabinding automatically
2014-07-17 10:29:18 +08:00
CocosRobot
e72fffe5c9
[AUTO]: updating luabinding automatically
2014-07-17 02:28:34 +00:00
minggo
54da8be54f
Merge pull request #7467 from ntotani/fix-lua-accelerometer
...
fix enabled to interval
2014-07-17 10:23:45 +08:00
minggo
4c7d777f25
Merge pull request #7471 from visiblelight/wp8_shader_update
...
Wp8 shader update
2014-07-17 10:14:54 +08:00
vision
c47d844d20
update the buildin shaders on WP8. Disable the effect 3d test.
2014-07-17 10:08:49 +08:00
samuele3hu
39e3f29e92
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 10:07:03 +08:00
minggo
2403bc2e50
Merge pull request #7343 from zhouxiaoxiaoxujian/feature/COC-10
...
Add getChildByName method for get a node that can be cast to Type T
2014-07-17 10:02:57 +08:00
samuele3hu
ce4f5f0e96
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-17 10:02:16 +08:00
minggo
c0fdc747e8
Merge pull request #7460 from andyque/fixComments
...
modify widget class comments
2014-07-17 10:00:12 +08:00
minggo
a192ddfebd
Merge pull request #7466 from andyque/fixPageView
...
remove unused functions
2014-07-17 09:59:46 +08:00
minggo
a653d0eb28
Merge pull request #7440 from boyu0/add_utils_atof
...
Add utils::atof(), fix bug: particle not shown on android.
2014-07-17 09:59:15 +08:00
samuele3hu
b782814b4b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-16 22:08:48 +08:00
minggo
b25cb5ccf3
Merge pull request #7468 from CocosRobot/update_lua_bindings_1405515629
...
[AUTO]: updating luabinding automatically
2014-07-16 21:28:37 +08:00
minggo
ac82fdca59
Merge pull request #7462 from chengstory/v3_FixLuaTriggerTestBug
...
1、 fixes lua TriggerTest bug.
2014-07-16 21:28:15 +08:00
CocosRobot
af231d78db
[AUTO]: updating luabinding automatically
2014-07-16 13:02:27 +00:00
Naoyuki Totani
cd025158f6
fix enabled to interval
2014-07-16 19:10:05 +09:00
samuele3hu
1b2d389011
Update ListViewEventType for Lua
2014-07-16 17:18:01 +08:00
andyque
46aafeecc6
remove unused functions
2014-07-16 16:28:01 +08:00
zhangcheng
1530ba4a90
1、fixes Trigger condition value can't be export.
2014-07-16 16:12:55 +08:00
minggo
c7473611b8
Merge pull request #7463 from Dhilan007/v3-320final
...
Remove prompt box of connect controller[Nibiru].
2014-07-16 15:26:24 +08:00
zhangcheng
80de57be39
1、 fixes lua TriggerTest bug.
2014-07-16 14:50:35 +08:00
Huabing.Xu
a0be6d9ac7
remove Storage project, merge code into cocos2d
2014-07-16 14:49:05 +08:00
Dhilan007
7e76b7b9a1
Remove prompt box of connect controller[Nibiru].
2014-07-16 14:48:22 +08:00
zhangbin
7e7c3a1e55
Merge branch 'v3' into android-dependencies
2014-07-16 13:49:20 +08:00
zhangbin
14f3d6f230
Adjust the dependencies of extensions & cocostudio on android.
2014-07-16 13:47:57 +08:00
joshuastray
190460018f
use CC_CONSTRUCTOR_ACCESS in ParallaxNode
2014-07-16 11:40:09 +08:00
Huabing.Xu
0350186589
Merge branch 'v3' into v3_dll
2014-07-16 11:15:16 +08:00
andyque
70ae3bf980
modify widget class comments
2014-07-16 10:12:13 +08:00
zhangcheng
8bf4c8b6c9
1. Fixes CCTimeLine warning.
...
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
2014-07-15 18:07:33 +08:00
samuele3hu
a6c30bc495
Update bindings-generator config files and manual bindings files to fix the compile warning
2014-07-15 17:38:56 +08:00
minggo
a59a86df0a
Merge pull request #7439 from boyu0/merge_arm64_lib_to_fat_lib
...
merge iOS arm64 libs to fat libs, change the project setting.
2014-07-15 16:57:10 +08:00
minggo
920c3f905a
Merge pull request #7449 from andyque/cleanupComments
...
update UI module code comments
2014-07-15 15:52:04 +08:00
andyque
dae29e5678
update UI module code comments
2014-07-15 15:56:07 +08:00
joshuastray
da9563f623
fix LabelAtlas constructor to CC_CONSTRUCTOR_ACCESS
2014-07-15 15:26:37 +08:00
Huabing.Xu
ed690114d7
add CC_DLL for mesh, lua works now
2014-07-15 15:19:34 +08:00
minggo
b282970833
[ci skip]
2014-07-15 15:11:17 +08:00
minggo
b5f9a45ee4
Merge pull request #7448 from andyque/fixTypo
...
fix Layout typo
2014-07-15 14:56:37 +08:00
andyque
1dc1df0827
fix Layout typo
2014-07-15 14:57:10 +08:00
minggo
d830580dc3
Merge pull request #7442 from pandamicro/ArmatureTrans
...
Fixed #5724 : Fix armature bone's transform issue
2014-07-15 14:37:02 +08:00
boyu0
8400ce2e84
fix error.
2014-07-15 14:14:35 +08:00
boyu0
812ad7cd5b
fix lua compile error in xcode6 beta3
2014-07-15 14:10:36 +08:00
Huabing.Xu
dbd3fce0a5
windows dll version of cpp-tests works
2014-07-15 13:54:08 +08:00
samuele3hu
19cc5b9c4d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-15 13:34:46 +08:00
Huabing.Xu
63de5f6acc
add CC_DLL
2014-07-15 12:00:31 +08:00
andyque
52596dc97f
fix Text line wrap issue
2014-07-15 11:46:53 +08:00
samuele3hu
55e77d8fd2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-15 11:34:57 +08:00
pandamicro
216af377d0
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans
2014-07-15 11:32:12 +08:00
pandamicro
db8f0ea3ab
Fixed #5724 : Use correct transform in CCSkin's updateTransform function
2014-07-15 11:31:10 +08:00
pandamicro
67c07f94f4
Issue #5724 : Correction of property name in CCBone
2014-07-15 11:30:36 +08:00
Huabing.Xu
4b059689d3
add CC_DLL for functions
2014-07-15 11:18:05 +08:00
Huabing.Xu
9db59c0046
add CC_DLL for Event and Physics
2014-07-15 10:55:40 +08:00
Huabing.Xu
cd9e42eb99
add CC_DLL for colorXXX
2014-07-15 10:04:24 +08:00
Huabing.Xu
60334e8b3e
add CC_DLL for 3d
2014-07-15 09:45:43 +08:00
boyu0
2354c79c3f
Fix compile error
2014-07-14 23:05:16 +08:00
Huabing.Xu
8bbce767f3
add CC_DLL for ActionEase
2014-07-14 22:42:44 +08:00
minggo
ff31144bd2
Merge pull request #7438 from Dhilan007/v3-320final
...
disable warn on zero-sized structure[android].
2014-07-14 21:04:03 +08:00
boyu0
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
boyu0
7fd0ca217c
Implement utils::atof()
2014-07-14 20:42:08 +08:00
Huabing.Xu
91314ed504
remove CC_DLL for template class and CC_DLL for CCValue
2014-07-14 18:40:10 +08:00
samuele3hu
7757df222a
Add bit extend module
2014-07-14 18:26:39 +08:00
Dhilan007
5e10575ab0
disable warn on zero-sized structures.
2014-07-14 17:53:55 +08:00
Huabing.Xu
9806b37398
add CC_DLL of DrawPrimitive
2014-07-14 17:40:02 +08:00
Huabing.Xu
952ca0eb75
add CC_DLL in Renderer folder
2014-07-14 17:02:06 +08:00
CocosRobot
1ef1a809b5
[AUTO]: updating luabinding automatically
2014-07-14 08:53:13 +00:00
Huabing.Xu
190264c090
add CC_DLL in Event systems
2014-07-14 16:43:28 +08:00
Huabing.Xu
09a75f73cf
add CC_DLL in math folder
2014-07-14 16:40:54 +08:00
minggo
981922eb95
Merge pull request #7432 from joshuastray/transition_ctor_access
...
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
2014-07-14 16:28:18 +08:00
samuele3hu
4cb6c1c74f
Add lua bindings for TextureCache::addImageAsync and update the related test cases
2014-07-14 16:05:48 +08:00
Huabing.Xu
52c0bd365b
add chipmunk.lib for release
2014-07-14 14:47:00 +08:00
Huabing.Xu
469dbea7da
window dll version work now
2014-07-14 14:40:47 +08:00
joshuastray
98b1c0bbed
add needed constructors for js bindings
2014-07-14 14:25:36 +08:00
joshuastray
e14c2587b5
move constructors and destructors to CC_CONSTRUCTOR_ACCESS
2014-07-14 14:25:06 +08:00
minggo
92cfe90937
Merge pull request #7424 from kyokomi/bugfix_UITextField_ttfFont
...
Fix the bug that UITextField doesn't support TTF font
2014-07-14 13:57:54 +08:00
edwardzhou
c0254c9318
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-14 11:14:03 +08:00
Dhilan007
b3017fb773
fixed crash cause by incorrect font name.
2014-07-14 10:01:29 +08:00
zhangbin
272146cfb6
Solve the error when compiling lua projects on android.
2014-07-14 09:48:16 +08:00
zhangbin
e4319bf534
Adjust the dependencies of cocosbuilder & cocostudio on android.
2014-07-14 09:48:16 +08:00
zhangbin
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
kyokomi
915bdae4a6
Fix the bug that UITextField doesn't support TTF font
2014-07-12 22:42:44 +09:00
minggo
7c43b59c6b
Merge pull request #7422 from minggo/get-curent-language
...
return correct language type
2014-07-12 20:45:05 +08:00
minggo
bf4b376ae5
return correct language type
2014-07-12 20:40:15 +08:00
minggo
cfc291e49d
Merge pull request #7379 from joshuastray/v3
...
move JumoTo's copy constuctor and operator= to private
2014-07-12 20:19:03 +08:00
minggo
5c26dc5db4
Merge pull request #7417 from geron-cn/chukongv3
...
fix bug: crash in ui csbs
2014-07-11 20:37:51 +08:00
geron-cn
64408a5d8f
fix bug: crash in ui csbs
2014-07-11 19:02:14 +08:00
minggo
05b485cd41
Merge pull request #7407 from visiblelight/fix_wp8_errors
...
Fix compile errors on WP8
2014-07-11 18:51:23 +08:00
minggo
86e5b37f16
Merge pull request #7413 from CocosRobot/update_lua_bindings_1405071955
...
[AUTO]: updating luabinding automatically
2014-07-11 18:50:58 +08:00
minggo
8cdbe5a019
Merge pull request #7412 from Dhilan007/v3-320final
...
fixed warning: deleting pointer to incomplete type.
2014-07-11 18:50:25 +08:00
CocosRobot
87aaf7dcef
[AUTO]: updating luabinding automatically
2014-07-11 09:48:20 +00:00
Dhilan007
d2e8154dc3
fixed warning: deleting pointer to incomplete type.
2014-07-11 17:45:15 +08:00
minggo
7308668e63
Merge pull request #7411 from minggo/warning-fix
...
fix warnings
2014-07-11 17:42:12 +08:00
minggo
ecb915fabf
fix warnings
2014-07-11 17:39:56 +08:00
samuele3hu
01c3f2a4ed
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/tolua/cocos2dx.ini
2014-07-11 16:44:59 +08:00
samuele3hu
d1bd21b1db
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
2014-07-11 16:17:51 +08:00
samuele3hu
d9291031cd
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
2014-07-11 16:10:42 +08:00
vision
7495a611ea
fix conflict
2014-07-11 16:03:40 +08:00