Huabing.Xu
be4bcf7c36
add init value for flag
2014-08-08 13:47:50 +08:00
yangxiao
1eeb4fa105
not export getCameras
2014-08-08 13:31:05 +08:00
gin0606
6722f8d546
Fix typo
2014-08-08 13:27:09 +09:00
minggo
29888b9d74
Merge pull request #7705 from zii/patch-1
...
让replaceScene更安全
2014-08-08 12:03:48 +08:00
minggo
49ea910d94
[ci skip]
2014-08-08 11:59:39 +08:00
minggo
3ccce066b0
Merge pull request #7712 from andyque/testLoadingBar
...
fixed loadingBar change direction affect position issue
2014-08-08 11:57:28 +08:00
minggo
ad9eb7ca8d
Merge pull request #7714 from CocosRobot/update_cocosfiles_1407469867
...
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 11:56:31 +08:00
minggo
92a4a8c42c
[ci skip]
2014-08-08 11:55:26 +08:00
minggo
dcb1a1001c
[ci skip]
2014-08-08 11:53:12 +08:00
yangxiao
911144b720
wrong parameter for visit
2014-08-08 11:52:40 +08:00
CocosRobot
75bd97b82e
[AUTO][ci skip]: updating cocos2dx_files.json
2014-08-08 03:51:09 +00:00
yangxiao
4dce59582b
visiting camera
2014-08-08 11:49:59 +08:00
minggo
800ab18457
Merge pull request #7700 from GavinThornton/patch-1
...
Update CCSpriteBatchNode.cpp
2014-08-08 11:49:39 +08:00
minggo
2a7e3dced8
Merge pull request #7711 from CocosRobot/update_lua_bindings_1407466030
...
[AUTO]: updating luabinding automatically
2014-08-08 11:49:14 +08:00
minggo
b9e84370f6
Merge pull request #7699 from huangshiwu/v3_wp8fix
...
V3 wp8fix
2014-08-08 11:49:02 +08:00
minggo
83a204a720
[ci skip]
2014-08-08 11:48:06 +08:00
zhangbin
5e85990f0e
Merge branch 'v3' into gen-prebuilt-script
2014-08-08 11:45:26 +08:00
andyque
d00e3349a3
fixed loadingBar change direction affect position issue
2014-08-08 11:17:17 +08:00
lvlong
28769c9b15
add obb sample
2014-08-08 11:16:33 +08:00
CocosRobot
aa68a63757
[AUTO]: updating luabinding automatically
2014-08-08 02:49:17 +00:00
huangshiwu
6ce16546b5
winrt compile fix -addtional
2014-08-08 10:47:14 +08:00
minggo
83aa94761d
[ci skip]
2014-08-08 10:45:23 +08:00
minggo
2f638c67fd
Merge pull request #7598 from AppleJDay/master
...
Add Feature :EventMouse should support getDelta, getDeltaX, getDelt...
2014-08-08 10:43:32 +08:00
minggo
d87cdfa20e
Merge pull request #7698 from samuele3hu/v3_module
...
Extract ui,network and storage module form cocos2d and modify lua template projects
2014-08-08 10:25:13 +08:00
minggo
ace0e3d989
Merge pull request #7709 from darkdukey/fixJenkins
...
[ci skip]Fix Jenins pull request build script
2014-08-08 09:43:07 +08:00
minggo
566e184d2f
Merge pull request #7704 from heliclei/github-pr-watchdog
...
[jenkins][ci skip]fix ci skip mal-function
2014-08-08 09:42:30 +08:00
samuele3hu
201b33b465
Set intermediate directory for related lua bindings projects on win32 platform
2014-08-08 09:40:13 +08:00
Nite Luo
5b626822e6
Fix Jenins pull request build script
2014-08-07 11:22:41 -07:00
yangxiao
9471b572f7
add to cocos2d.h
2014-08-08 00:05:02 +08:00
yangxiao
813e954f4e
aabb, obb
2014-08-08 00:00:58 +08:00
gin0606
2ca881287f
CCRANDOM macro use ccRandom
2014-08-07 21:17:41 +09:00
gin0606
5349aa7efb
Add ccRandom.h
2014-08-07 21:17:36 +09:00
huangshiwu
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
zii
212e059917
让replaceScene更安全
...
如果可以这样的话 就不用担心用runWithScene还是replaceScene了. 可以省略getRunningScene判断.
2014-08-07 18:34:21 +08:00
heliclei
70841cf240
[jenkins][ci skip]fix ci skip mal-function
2014-08-07 18:24:11 +08:00
heliclei
3276c10b31
[jenkins]Tracking lib size for pull request build
2014-08-07 18:03:41 +08:00
minggo
fca467ae2f
Merge pull request #7703 from heliclei/prb-stats
...
[jenkins]Tracking lib size for pull request build
2014-08-07 18:03:11 +08:00
Huabing.Xu
e7e94ffe70
add const constrain for getVertexData() and getIndexData()
2014-08-07 17:59:36 +08:00
heliclei
b19dacd400
[jenkins]Tracking lib size for pull request build
2014-08-07 17:50:56 +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