Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
30,831 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

9577 Commits

Author SHA1 Message Date
yangxiao c3593c9d64 merge cocos 2015-06-23 18:29:39 +08:00
pandamicro 60372056ce Merge pull request #12484 from andyque/fix-nine-patch-image-error 
fix nine patch image parser error on Windows.
 2015-06-23 18:26:16 +08:00
yangxiao 251c81d7be Merge branch 'newcode' into v3 2015-06-23 18:25:41 +08:00
pandamicro 2a0c2b6e32 Merge pull request #12250 from hawkwood/patch-10 
Fails if file does not exist
 2015-06-23 17:32:47 +08:00
WenhaiLin f95245312a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 17:08:25 +08:00
pandamicro 4c7f33e66f Merge pull request #12481 from jianglong0156/restartGameBug 
fix Restart game bug
 2015-06-23 17:02:09 +08:00
WenhaiLin cbb073e905 Fixed Application may be created more than once on Android. 2015-06-23 16:58:38 +08:00
XiaoYang 59e6b6fdc2 Merge pull request #352 from tangziwen/v3 
Using ray-triangle intersect test instead of the newton method
 2015-06-23 16:30:18 +08:00
pandamicro ac138a3287 Merge pull request #12474 from xiaofeng11/v3_xiaofeng 
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
 2015-06-23 16:27:32 +08:00
XiaoFeng befe97a78b Update js parser for compatible with CocosStudio 2.3.2 json format export 2015-06-23 16:24:53 +08:00
tangziwen 5b857f7d66 fix some bug 2015-06-23 16:11:00 +08:00
andyque 7fff2bd3c4 fix nine patch image parser error on Windows. 2015-06-23 15:42:58 +08:00
子龙山人 fca9b89a4c Merge pull request #12480 from andyque/fix-rapidjson-assert-error 
fix rapidjson assert error
 2015-06-23 15:34:47 +08:00
pandamicro f617d6f1aa Merge pull request #12478 from WenhaiLin/v3-37-label-sfFix 
Label:Fixed IllegalArgumentException on Android 2.3.x
 2015-06-23 15:27:43 +08:00
Vincent Yang 4b768c5fd8 fixbug: cpp-test -> NewRenderer （drag the layer to test the result of culling）, some object will be culling before out of screen. 2015-06-23 15:22:27 +08:00
jianglong0156 90f9bf37cd fix redmine issue #20277 RestartGameTest only used in native will crash 2015-06-23 14:41:41 +08:00
tangziwen 1e016dc6d8 Always get the minimum distance intersect point. 2015-06-23 14:41:20 +08:00
tangziwen f71ca4f179 Using ray-triangle intersect test instead of the newton method 2015-06-23 14:27:19 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
WenhaiLin 79aa300448 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-37alpha0 2015-06-23 13:42:32 +08:00
WenhaiLin b275ce2283 Label:Fixed IllegalArgumentException on Android 2.3.x 2015-06-23 13:38:06 +08:00
pandamicro 9445aeacb7 Merge pull request #12456 from super626/camera 
quaternion instead of euler angle
 2015-06-23 13:16:39 +08:00
XiaoFeng 375e80bd70 Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 
Update easing default speed
 2015-06-23 11:31:16 +08:00
子龙山人 6bd61a3a5f Merge pull request #12469 from WenhaiLin/v3-37-label-lineheightfix 
Label should be invisible when the line height is set to zero.
 2015-06-23 11:02:48 +08:00
WenhaiLin fbe1bd8253 Label should be invisible when the line height is set to zero. 2015-06-23 09:42:48 +08:00
Anniruddh 4a15d57093 Fixed issue #168 2015-06-20 00:20:15 -07:00
yangxiao d252250968 quaternion instead of euler angle 2015-06-19 18:46:14 +08:00
andyque 55b86b2e14 add more docs for samsung enhanced API 2015-06-19 18:09:42 +08:00
子龙山人 8ca0f18575 Merge pull request #12446 from pandamicro/v3 
Add auto bindings for navmesh
 2015-06-19 17:21:00 +08:00
子龙山人 869e3c5243 Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix 
Label:Fixed line wrap error without space.
 2015-06-19 15:08:13 +08:00
pandamicro 7b1694bfeb Merge pull request #12443 from VisualSJ/v3-aa 
[ci skip]Studio parser: Code for defense
 2015-06-19 14:24:39 +08:00
WenhaiLin d32a317ea0 Label:Fixed line wrap error without space. 2015-06-19 13:39:19 +08:00
VisualSJ 8fa755d0e4 Studio parser: Code for defense 2015-06-19 13:15:10 +08:00
VisualSJ ea0ab5c738 Studio parser: Code for defense 2015-06-19 11:13:07 +08:00
pandamicro 8e9fed936c Add auto bindings 2015-06-19 10:36:36 +08:00
pandamicro 276ce3a0a7 Update versions 2015-06-19 09:56:19 +08:00
pandamicro c6d4f283bb Fix compilation issue in navmesh conversion 2015-06-19 08:11:45 +08:00
pandamicro f405d00336 Fix linux compilation 2015-06-19 01:14:16 +08:00
江龙 91bc19fb29 Merge branch 'v3_origin' into navmesh 
Conflicts:
	tests/js-tests/src/Physics3DTest/Physics3DTest.js
 2015-06-18 23:50:19 +08:00
江龙 8fc5835dee modify linux file 2015-06-18 23:29:04 +08:00
江龙 61db9ef103 modify cocos2d_specifics ， add navmesh head file。 modify template。add navmesh head file and register code 2015-06-18 23:21:53 +08:00
江龙 8c97fec5af add navmesh project file path 2015-06-18 23:17:49 +08:00
jianglong0156 618d8f01e8 Merge pull request #9 from pandamicro/navmesh 
Improve bindings for navmesh
 2015-06-18 23:15:05 +08:00
pandamicro b757837239 Move NavMesh to jsb namespace 2015-06-18 22:57:41 +08:00
jianglong0156 56382aae37 winphone project 2015-06-18 22:50:24 +08:00
CocosRobot ea2ec582f0 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 14:05:05 +00:00
Bin Zhang a4ecfdb7e2 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 22:00:57 +08:00
CocosRobot e2268bb16f [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 22:00:57 +08:00
WenhaiLin e2f834e96b Fixed warn 2015-06-18 22:00:56 +08:00
CocosRobot c069da629e [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 22:00:56 +08:00
Huabing.Xu b17702e6f1 fix compile error for linux 2015-06-18 22:00:55 +08:00
pandamicro cd7252014a Merge pull request #12432 from pandamicro/v3 
Change physics3d api to jsb namespace
 2015-06-18 21:53:39 +08:00
pandamicro e09ba8080f Fix create Sprite with PolygonInfo issue 2015-06-18 21:48:57 +08:00
jianglong0156 05c40b13f9 fix the win32 head error 2015-06-18 21:30:30 +08:00
pandamicro 10a8adad53 Change physics3d api to jsb namespace 2015-06-18 20:39:40 +08:00
pandamicro 491d89baec Merge pull request #12429 from natural-law/v3 
Build engine with LOCAL_ARM_MODE=arm when building JS projects for android.
 2015-06-18 20:28:52 +08:00
jianglong0156 e0b66707f9 add nerviest android file 2015-06-18 19:30:05 +08:00
jianglong0156 4fe1542d17 add navmesh tests 2015-06-18 19:22:27 +08:00
Bin Zhang d288b13957 Build engine with LOCAL_ARM_MODE=arm when building JS projects for android. 2015-06-18 17:22:30 +08:00
CocosRobot 6e849a158d [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 08:18:00 +00:00
pandamicro aa566a3722 Merge pull request #12424 from pandamicro/physics3d 
Fix Physics3D test and js bindings
 2015-06-18 16:09:49 +08:00
pandamicro 4d588c7837 Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix 
Fixed warn
 2015-06-18 15:09:36 +08:00
jianglong0156 85c40b6580 Merge pull request #8 from pandamicro/physics3d 
Physics3d
 2015-06-18 14:54:32 +08:00
XiaoYang 96bb244d69 Merge pull request #351 from tangziwen/v3 
fix terraintest and Terrain::getInstersectionPoint()
 2015-06-18 14:47:49 +08:00
pandamicro 811173ea3b Fix Physics3D test and js bindings 2015-06-18 14:33:16 +08:00
WenhaiLin 05522afaa1 Fixed warn 2015-06-18 14:24:52 +08:00
CocosRobot b76db94725 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-18 05:43:02 +00:00
tangziwen 1989de7a04 fix terraintest and Terrain::getInstersectionPoint() 2015-06-18 12:20:44 +08:00
pandamicro 7952477469 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into physics3d 2015-06-18 12:05:01 +08:00
Huabing.Xu 92824537ac fix compile error for linux 2015-06-18 11:15:45 +08:00
pandamicro 3ffc0e6be6 Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d 2015-06-18 09:20:37 +08:00
Dale Stammen fd0605416e moved clipper files to external/clipper filter in VS solution 2015-06-17 11:48:56 -07:00
Dale Stammen 9ef92b71dd added missing external/clipper files. Removed obsolete files 2015-06-17 11:40:38 -07:00
pandamicro a94b49bdef Add nav mesh bindings 2015-06-17 23:41:12 +08:00
pandamicro 85e8a407b1 Merge branch 'navmesh' of https://github.com/jianglong0156/cocos2d-x into v3 
# Conflicts:
#	tests/js-tests/project/Classes/AppDelegate.cpp
#	tools/tojs/genbindings.py
 2015-06-17 19:58:24 +08:00
samuele3hu 683812d817 Update Physics3D test for js. 2015-06-17 18:50:55 +08:00
jianglong0156 b265033a41 add testcase and manual bindings 2015-06-17 18:38:18 +08:00
jianglong0156 897b5fd0e9 add navmesh test project file and binding file 2015-06-17 18:37:19 +08:00
pandamicro bb275351f0 Merge pull request #12363 from super626/v3 
Fix terrain lod computing bugs
 2015-06-17 17:49:39 +08:00
yangxiao 12a352a1db add comment 2015-06-17 16:32:08 +08:00
XiaoYang 5dd2aa2884 Merge pull request #349 from tangziwen/v3 
fix camera position
 2015-06-17 16:01:02 +08:00
tangziwen e9c95229e0 fix camera position 2015-06-17 15:58:17 +08:00
pandamicro b534f85679 Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 15:38:17 +08:00
CocosRobot 22f04da582 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 07:18:18 +00:00
pandamicro 6f6c317f87 Merge pull request #12386 from WenhaiLin/v3-label-spacefix 
Label:Fixed wrong letter spacing with outline enabled
 2015-06-17 15:16:49 +08:00
pandamicro 5ee22c4142 Merge pull request #12174 from pajeroquan/v3 
Fix JNI object memory leak!
 2015-06-17 15:14:36 +08:00
pandamicro b1831ea5fb Merge pull request #12384 from chengstory/GBKToUTF8_v3 
GBKToUTF8
 2015-06-17 15:09:15 +08:00
CocosRobot 55c7de75e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:48:41 +00:00
Wenhai Lin cbd428f6ac Label:Fixed wrong letter spacing with outline enabled 2015-06-17 13:57:23 +08:00
zhangcheng 1c983f1f39 GBKToUTF8 2015-06-17 13:16:06 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
CocosRobot 6bed988354 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 03:47:36 +00:00
子龙山人 0915565b8d Merge pull request #12373 from samuele3hu/v3_navigation 
Add the Lua bindings for NavMesh and the related test case.
 2015-06-17 11:36:52 +08:00
Jacky 13e0fb22f5 fix compile on linux platform. 2015-06-17 11:34:19 +08:00
songchengjiang c08a355a06 fix the bug of light 
replace atanf with atan2f
 2015-06-17 11:17:46 +08:00
pandamicro a2deddcf59 Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib 
fix android background and foreground bug with VertexAttributeBinding
 2015-06-17 09:34:47 +08:00
Dale Stammen eb2bc78970 Merge branch 'v3' into v3-winrt-librecast 2015-06-16 07:13:53 -07:00
tangziwen 60115b1ce1 update 2015-06-16 17:46:21 +08:00
tangziwen 0eaf9b5acc Fix camera's incorrect position in chunks' LOD calculating. 2015-06-16 17:29:43 +08:00
WuHao 6e138e7b9b add clipper to cmakelist 2015-06-16 17:09:27 +08:00
WuHao d3e0439972 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into fix_spritepolygon 2015-06-16 16:15:57 +08:00
WuHao 3b56d2a66f fix cmake for cmake platforms 2015-06-16 16:15:19 +08:00
Hao Wu 2ddad84c73 Merge pull request #17 from pandamicro/spritepolygon 
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
 2015-06-16 15:11:36 +08:00
pandamicro e4d5db30eb Remove jsb_cocos2dx_experimental in projects to fix compilation issue 2015-06-16 15:09:06 +08:00
pandamicro 3f8923648b Merge pull request #12359 from super626/opt_navigation 
remove unused code, and use nullptr for pointer
 2015-06-16 14:58:58 +08:00
Justin Hawkwood 90db6fe5d6 Added check that callback is set 2015-06-15 23:36:04 -07:00
Justin Hawkwood 9378b6704c Moved file check to alternate location 2015-06-15 23:31:52 -07:00
Huabing.Xu 19982aae00 fix android background and foreground bug with VertexAttributeBinding 2015-06-16 14:04:50 +08:00
pandamicro 0866180918 Merge pull request #12162 from namezero111111/patch-4 
JumpTo::clone() results in incorrect end position
 2015-06-16 13:37:04 +08:00
samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation 
Conflicts:
	tools/bindings-generator
 2015-06-16 11:36:11 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon 
# Conflicts:
#	external/config.json
 2015-06-16 11:19:20 +08:00
yangxiao 4d1aa56193 remove unused code, and use nullptr for pointer 2015-06-16 11:15:39 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
子龙山人 0b5c7d74b7 Merge pull request #12160 from namezero111111/patch-3 
Blink::stop() access violation
 2015-06-16 10:27:38 +08:00
子龙山人 271e3295eb Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix 
Fixed NotificationNode might crash program when the program exits.
 2015-06-16 09:53:39 +08:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
Dale Stammen 03fc2eca5e added missing navmesh files 2015-06-15 18:19:28 -07:00
Ricardo Quesada b167ab3e78 StateBlock() is public 2015-06-15 17:43:37 -07:00
Ricardo Quesada ca3da86da7 StateBlock::restore() is public 
It is possible to restore to default state
 2015-06-15 14:12:44 -07:00
Dale Stammen 9262cc95bf fixed project filters broken by recent additions of files 2015-06-15 11:38:52 -07:00
Ricardo Quesada c17da7e90d Removes not-needed draws 2015-06-15 10:40:47 -07:00
WenhaiLin 3c8d15f6f8 Fixed NotificationNode might crash program when the program exits. 2015-06-15 17:55:00 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 2015-06-15 16:13:36 +08:00
Hao Wu b4ca8c1489 Merge pull request #15 from pandamicro/spritepolygon 
Add SpritePolygon JSB bindingsJSB bindings
 2015-06-15 15:47:02 +08:00
子龙山人 86b6ea702a Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix 
[ci skip]Android Studio projects:Fixed compile error.
 2015-06-15 14:48:42 +08:00
WenhaiLin 518de1ff57 [ci skip]Android Studio projects:Fixed compile error. 2015-06-15 14:42:45 +08:00
CocosRobot 8ec924c206 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-15 05:46:51 +00:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00
pandamicro c9c05ff982 Merge pull request #12314 from xiaofeng11/v3_xiaofeng 
Fix when button reader bug
 2015-06-15 13:13:39 +08:00
yangxiao 16a0ddc74e rename CCNavMeshTool to CCNavMeshUtils 2015-06-15 12:52:55 +08:00
pandamicro d0db40c4a6 Merge pull request #12080 from linshun/v3 
issue #12078 added audio, network, physics, platform and storage group.
 2015-06-15 12:45:11 +08:00
pandamicro 852b9b42b9 Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
linshun efed0da8bc issue #12078: added subgroup of physics 2d. 2015-06-15 10:28:37 +08:00
pandamicro 707e9d4d7b Merge pull request #12205 from ffskyfan/v3 
Update extension.h, amend a really  dangerous macros that may cause memory allocation error
 2015-06-14 20:09:57 +08:00
Ricardo Quesada 5c419ff7bc compiles on windows 2015-06-12 20:49:20 -07:00
pandamicro 032f231ed4 Add bindings for AutoPolygon and PolygonInfo 2015-06-13 11:14:57 +08:00
Ricardo Quesada 9b7c12aa38 updates invalidate documentation 2015-06-12 17:44:48 -07:00
Ricardo Quesada a8cf72dc43 pass bits to invalidate 2015-06-12 17:14:09 -07:00
Ricardo Quesada 4278bf51b1 Adds RenderState::StateBlock::invalidate(); 
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
 2015-06-12 16:47:08 -07:00
Ricardo Quesada 32aae46343 fixes 2015-06-12 15:37:29 -07:00
Ricardo Quesada 2a3347dd49 RenderState: default state fixes 
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
 2015-06-12 15:03:48 -07:00
子龙山人 38cd74933d Merge pull request #12320 from CocosRobot/update_lua_bindings_1434115258 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-12 22:42:40 +08:00
pandamicro 9806c09b0e Merge pull request #12299 from WenhaiLin/v3-label-cropped 
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
 2015-06-12 21:33:09 +08:00
CocosRobot 60d68ab4de [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-12 13:27:20 +00:00
pandamicro f9057b3f32 Merge pull request #12284 from pandamicro/v3 
Fix template android compilation issue on physics3d
 2015-06-12 21:10:40 +08:00
子龙山人 c01d1fe00a Merge pull request #12310 from WenhaiLin/v3-particlefile-key 
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
 2015-06-12 16:44:12 +08:00
Jacky 29c108bdef Merge remote-tracking branch 'origin' into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-12 16:28:41 +08:00
XiaoFeng 8d19ea7320 Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode 2015-06-12 15:47:34 +08:00
pandamicro e9d648f151 Fix physics 3d macro include issue 2015-06-12 15:41:46 +08:00
pandamicro 19ef0e0983 Fix indent 2015-06-12 13:01:13 +08:00
pandamicro df1219c92d Update manual conversion for sprite polygon 2015-06-12 12:56:37 +08:00
WenhaiLin 9f5a36b817 Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner. 2015-06-12 11:03:32 +08:00
子龙山人 7a9b48bd83 Merge pull request #12214 from andyque/optimize-ui-memory-usage 
Optimize ui memory usage
 2015-06-12 10:11:21 +08:00
子龙山人 463198b3ad Merge pull request #12307 from MSOpenTech/v3-winrt-viewport 
V3: Removed obsolete winrt override of setViewPortInPoints
 2015-06-12 09:53:59 +08:00
pandamicro b1b9c808eb Merge pull request #12074 from samuele3hu/v3_material 
Issue #10570: Make getItemForTouch of Menu virtual.
 2015-06-12 08:21:18 +08:00
pandamicro 9acc51a5eb Merge pull request #12301 from jianglong0156/webviewCrash 
fix webview crash in android
 2015-06-12 08:12:14 +08:00
Dale Stammen 0f64a2d192 removed obsolete override of setViewPortInPoints 2015-06-11 07:59:52 -07:00
pandamicro 12de53726d Merge pull request #12182 from VisualSJ/v3-jsb 
[ci skip] Synchronization studio parser
 2015-06-11 17:35:15 +08:00
jianglong0156 c317eb428a fix webview crash in android 2015-06-11 17:28:02 +08:00
WenhaiLin 5aa31ea83a Label:the texture of character have not cropped if character cross the axis-aligned bounding-box. 2015-06-11 17:16:44 +08:00
yangxiao 44c2b0d5ad merge cocos 2015-06-11 15:54:42 +08:00
samuele3hu 17b1dee363 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon 2015-06-11 14:39:35 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
pandamicro 8e3e928efd Merge pull request #12040 from geron-cn/v3 
fix bug:  fix actiontimeline can not step to last frame when loop play
 2015-06-11 14:36:08 +08:00
子龙山人 03814a569d Merge pull request #12256 from WenhaiLin/v3-simpleaudio-fix 
SimpleAudioEngine:Fixed thread safety problem on android.
 2015-06-11 14:30:36 +08:00
CocosRobot 94a47fabcf [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-11 06:16:36 +00:00
pandamicro 6dfe937cae Merge pull request #11892 from dabingnn/v3FrameBufferObject 
V3 frame buffer object
 2015-06-11 14:04:30 +08:00
Vincent Yang 097bf455c2 Rename CCRenderBufferObject to CCRenderBuffer in windows projects. 2015-06-11 11:45:10 +08:00
VisualSJ 2d12d6a295 Plist file parsing (action-2.x.js) 2015-06-11 11:14:10 +08:00
Jacky a32fec8471 change clipper version to 6.1.3. 2015-06-11 10:45:37 +08:00
pandamicro 70606caa14 Fix template android compilation issue on physics3d 2015-06-10 19:37:52 +08:00
Jacky 4b5bcc06a1 remove draw points and add expand precision. 2015-06-10 18:54:53 +08:00
samuele3hu 8935ad0226 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon 2015-06-10 13:54:32 +08:00
子龙山人 b666b373c7 Merge pull request #12261 from iris-wy/v3 
fix bug #12200
 2015-06-10 11:39:22 +08:00
Jacky b41c60dbdb Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2 
# Conflicts:
#	external/config.json
 2015-06-10 10:23:43 +08:00
Huabing.Xu 10352c40b2 Merge branch 'v3' into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/CCCamera.h
 2015-06-10 10:16:42 +08:00
anniruddh.koppal 3f4d1c4ed3 Fixed merge conflict issue 2015-06-09 14:06:24 -07:00
yangxiao 7f26ccb9ba code style 2015-06-09 14:06:09 -07:00
tangziwen fc34881ab9 fix Terrain::getIntersectionPoint 2015-06-09 13:23:33 -07:00
Justin Hawkwood 852639cfe7 Added empty string check 2015-06-09 09:19:04 -07:00
Dale Stammen 0cb2f87d3e Merge branch 'v3' into v3-winrt-ogg 2015-06-09 08:21:09 -07:00
子龙山人 a202387800 Merge pull request #12247 from stari4ek/v3-outline-inner-holes 
improve rendering of letter's inner shapes when outline is used
 2015-06-09 23:11:39 +08:00
Jacky 88b3fc3c7e fix memory leakage about operation= 2015-06-09 18:45:55 +08:00
iris-wy 79b3d70b60 fix bug #12200 
solve warning ""Service Intent must be explicit: Intent {
act=com.enhance.gameservice.IGameTuningService }""
 2015-06-09 18:43:46 +08:00
Huabing.Xu 67a94c4485 compiles on android and linux 2015-06-09 17:57:07 +08:00
XiaoFeng 20a6151f4c Fix indent 2015-06-09 17:40:42 +08:00
Huabing.Xu b79eec0b20 fix grid bug for viewport 2015-06-09 17:24:30 +08:00
Huabing.Xu ef4978f0cd move viewport to experimental namespace 2015-06-09 16:21:50 +08:00
Jacky d8369dda94 fix on the wp8 universal. 2015-06-09 16:00:51 +08:00
Huabing.Xu 3e331128c6 file rename CCFrameBufferObject->CCFrameBuffer 2015-06-09 15:32:12 +08:00
WenhaiLin 6fec9c40b0 SimpleAudioEngine:Fixed thread safety problem on android. 2015-06-09 15:07:35 +08:00
XiaoFeng f6083f3490 Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
Huabing.Xu 97b387560b revert some accidental changes 2015-06-09 14:06:11 +08:00
yangxiao e433ad305b decopule physics and navmesh from Director 2015-06-09 13:49:07 +08:00
Jacky 74aed5ae85 fix on the android. 2015-06-09 13:47:29 +08:00
Jacky 562d4b9a78 fix on the windows. 2015-06-09 11:23:37 +08:00
Huabing.Xu 9acab65e4f rename FrameBufferObject->FrameBuffer 
Move FrameBufferObject related class to experimental namespace
 2015-06-09 10:59:43 +08:00
Justin Hawkwood eca488b85a Fails if file does not exist 
This adds a callback with nullptr if the file does not exists.  Checking this before checking cache means that if a file is cached then deleted, the async call will fail.  To allow a cached but deleted file to return the texture, move the isFileExist check to ALTERNATIVE.

If leaving check where it is, on failure should it also check if the file was cached and remove it?
 2015-06-08 17:14:15 -07:00
Dale Stammen a2b677d300 Merge branch 'v3' into v3-winrt-ogg 2015-06-08 08:22:46 -07:00
Michael Sotnikov dae8f788c1 improve rendering of inner shapes when outline is used 2015-06-08 12:56:43 +03:00