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

536 Commits

Author SHA1 Message Date
Бесшапошников Никита 273281ecce Add ListView js tests 2016-04-11 11:27:38 +08:00
Бесшапошников Никита 8ae6d68640 Add scroll view bar js test 2016-04-11 11:27:25 +08:00
Ricardo Quesada fea84b8af3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-11 11:12:34 +08:00
Бесшапошников Никита 9459d2b67e Fixed ccui.ListView Test 2016-04-08 15:31:51 +03:00
Бесшапошников Никита c7bea705af Add PageView js tests 2016-04-08 14:01:20 +03:00
Бесшапошников Никита dbd2b5fd03 Add ListView js tests 2016-04-08 13:40:21 +03:00
Бесшапошников Никита c0dc8b0637 Add scroll view bar js test 2016-04-08 11:14:45 +03:00
Ricardo Quesada f243cc4ce3 fix: use chipmunk v6.2 API whenever possible 
fix: make it more compatible with chipmunk v6.2 code

fix: make it more compatible with chipmunk v6.2.2
 2016-04-07 16:22:49 -07:00
Ricardo Quesada 88ff4da348 buoyancy fix. 
first commit
 2016-04-05 17:52:19 -07:00
pandamicro 3d7d5de95d Merge pull request #15317 from pandamicro/v3 
Fix Socket IO handshake issue with latest version libwebsocket
 2016-04-01 22:27:57 +08:00
pandamicro d93fbea0f6 Fix Socket IO connection issue on iOS 2016-03-31 21:21:20 +08:00
minggo b4ee6e8971 don't set wrong string for atlas label 2016-03-30 14:32:11 +08:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
zilongshanren 8f30d01156 Merge pull request #15286 from xpol/remove-uncessary-search-paths 
Removed unnecessary search paths.
 2016-03-22 19:51:59 +08:00
minggo 4b47750e1f Merge pull request #15171 from xiaofeng11/v3_jsFix 
[ci skip] js-test bug fix
 2016-03-22 16:24:31 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
zilongshanren 7993ad93d2 fix jsb API inconsistency. 
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
 2016-03-18 16:18:40 +08:00
zilongshanren 589d7e47bf fix polygon api typo 2016-03-17 17:16:56 +08:00
zilongshanren a1b4cd845f Revert "Fix incorrect function name of getTrianglesCount" 2016-03-17 16:38:17 +08:00
mogemimi 23a05ddab2 Fix incorrect function name of getTrianglesCount 2016-03-15 07:39:42 +09:00
XiaoFeng ce555f68de Fix CocosDenshionTest playMusic won't work under android system 
Fix click setNotificationNode button in SceneTest then return to main menu the animation is still play on screen
 2016-03-03 16:47:05 +08:00
Ricardo Quesada 462f4f4c0a Merge pull request #15156 from ricardoquesada/cmake_android_squash_2 
cmake for android
 2016-03-02 17:24:35 -08:00
Ricardo Quesada 028f8c28e1 Squashed commit of the following: 
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 15:19:48 2016 -0800

    uses new naming convention for projects

    uses _ instead of -

commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:49:22 2016 -0800

    fooling cmake for real

commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:43:05 2016 -0800

    fooling cmake

commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 14:26:59 2016 -0800

    makes CMake for Mac happy

commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 13:50:15 2016 -0800

    linux fix

commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Mar 2 11:18:18 2016 -0800

    links correctly!

commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Mar 1 17:44:58 2016 -0800

    Squashed commit of the following:

    commit 2ef52723dae44204c047cb177d5a5670fb659c79
    Merge: 8a5c998 25cf1f1
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Mar 1 16:54:04 2016 -0800

        Merge branch 'v3' into cmake_android

    commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:34:46 2016 -0800

        Fix module name in Android template to match CMake project.

    commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Thu Feb 11 18:27:45 2016 -0800

        Add missing platform specific source file to CMake project.

    commit 705389ac6582107a381d0cbc56268eaa98ffc5c3
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:21:12 2016 -0800

        Find AndroidNdkModules.cmake relative to android.toolchain.cmake.

    commit a10075e2cb30af2e1f9a30da99efac880658ad6b
    Author: Chaoren Lin <chaorenl@google.com>
    Date:   Wed Feb 10 19:03:11 2016 -0800

        Remove cpp-empty-test from project templates.

    commit e070fcbf210b8628f75785e738202a80a95ac0ff
    Author: WenhaiLin <wenhai.lin@chukong-inc.com>
    Date:   Mon Aug 31 09:56:03 2015 +0800

        Fix CMake for Android Target
 2016-03-02 16:51:54 -08:00
zilongshanren 19caf2d276 Merge branch 'v3' into add-listview-cellreuse-tests 2016-03-01 16:40:07 +08:00
zilongshanren 7ec4450fc0 add js ListView item reuse tests 2016-03-01 15:22:32 +08:00
Ricardo Quesada 248978bac1 force multiple for windowsphone 2016-02-29 15:23:22 -08:00
Ricardo Quesada bc11e24019 Squashed commit of the following: 
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 13:11:40 2016 -0800

    binary file 82

commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:56:39 2016 -0800

    fore multiple in windows phone 8.1 too

commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 12:50:45 2016 -0800

    force multiple

commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 10:44:40 2016 -0800

    compiles

commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Feb 29 09:37:24 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Feb 27 01:11:13 2016 -0800

    correct paths for win8.1

commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 22:46:58 2016 -0800

    projects works on win32

commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:57:10 2016 -0800

    Merge branch 'v3' into chipmunk_v7_2

commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Fri Feb 26 21:26:55 2016 -0800

    trying to make it compile on win32

commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 10:28:12 2016 -0800

    quick hack to make it compile...

    ...autogenerated files will fix it.

commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Wed Feb 24 09:20:59 2016 -0800

    Squashed commit of the following:

    commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 20:10:13 2016 -0800

        compiles.. sort of

    commit a7990e2888d5ef1e43b811148b23c0b899105ab3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:55:24 2016 -0800

        more chipmunk fixes

    commit 1174f6ec8201324161d7946af0f493b136a56690
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:36:15 2016 -0800

        more chipmunk fixes

    commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
    Merge: f942c5a 0594d3c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:29:27 2016 -0800

        Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed

    commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 19:28:51 2016 -0800

        correct path for chipmunk

    commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 18:44:05 2016 -0800

        compiles on ios

    commit 379503399c384ad77d25d68a2f83b71a829b1c04
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:51:36 2016 -0800

        chipmunk include fixes

    commit 95839fb7b406a32255853294b016d8c15aec1ed6
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 17:09:04 2016 -0800

        fixes for cmake + mac

    commit 39449ea3b7efccae2946785c1c11433d964ee480
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:51:25 2016 -0800

        correct includes

    commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 16:35:40 2016 -0800

        fixes chipmunk with cmake

    commit 337f21f9466703722847635301d841ace9b757cb
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:42:01 2016 -0800

        updates android and linux projects

    commit 7111a9993b97f78cf73206804b25665c21a59ca8
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 14:18:26 2016 -0800

        cosmetic changes

    commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:53:41 2016 -0800

        chipmunk autogenerated files

    commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:47:41 2016 -0800

        compatibility both in JS (to reduce space)

        and in C for (C++ users)

    commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 06:10:02 2016 -0800

        mooooore fixes

    commit 9ab23014093677e8eda69b105f50410b8c792aa3
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:30:58 2016 -0800

        doesn't crash with collision handler

    commit 69275a16817a038244bbaaff9e82a011b6729cb2
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Tue Feb 23 05:16:29 2016 -0800

        adds missing space functions

    commit a6b97bbc76cb9ab293356bb7451cfa858353f589
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 22:22:27 2016 -0800

        queries... better

    commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 19:48:41 2016 -0800

        adds more missing functions

        fixes other chipmunk JS issues

    commit 3797a033896d059da58a05ce0de832ed9c150eff
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 18:30:21 2016 -0800

        yep... poly works ok

    commit d1bb57776891605b9d3e4fb90736c6869d96b944
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:29 2016 -0800

        neede compat files

    commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Mon Feb 22 17:28:04 2016 -0800

        query working!

    commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:57:03 2016 -0800

        almost there

    commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 21:18:46 2016 -0800

        fixes return values

    commit 7218778da846e1e36a510c0a19a5ee76f91db032
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 20:36:14 2016 -0800

        cpMomentForSegment is manual since parameter 4 is optional

        in chipmunk 6, but not in 7

    commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 17:29:28 2016 -0800

        yeah... process the arguments correctly

        works both for functions and auto_classes

    commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 16:49:00 2016 -0800

        compiles and links

        fixes some issues with the queries.
        returns shapes instad of the queryInfo

    commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Fri Feb 19 15:03:18 2016 -0800

        adds removeCollisionHandler and other fixes

    commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Thu Feb 18 20:59:24 2016 -0800

        compiles... doesn't work yet

    commit bd64de81713fb2d7652a538d667d73f05f5d9320
    Author: Ricardo Quesada <ricardoquesada@gmail.com>
    Date:   Wed Feb 17 18:17:39 2016 -0800

        WIP: chipmunk bindings
 2016-02-29 13:53:00 -08:00
James Chen 7d43e35741 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket 2016-02-17 14:56:32 +08:00
pandamicro 72be9a3966 Fix other issues 2016-02-02 23:39:18 +08:00
pandamicro e2568b3a6f Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory 
Conflicts:
	tests/js-memory-gc-tests/src/tests-main.js
 2016-01-28 01:12:49 +08:00
pandamicro de9b51c0cf Fix other GC issues 2016-01-28 01:03:50 +08:00
pandamicro 55756cb043 Improve test cases 2016-01-26 19:34:01 +08:00
zilongshanren bc44769b8b add more deprecated functions 2016-01-25 18:14:48 +08:00
zilongshanren 00ad5bd620 fix jsb deprecated constants 2016-01-25 15:40:51 +08:00
pandamicro 0daa846020 Improve gc test case and add cycle reference tests 
t

Improve gc test case and add action cycle reference test
 2016-01-24 19:47:24 +08:00
Ricardo Quesada 7735a75651 adds JS tests for RichText 2016-01-20 17:59:13 -08:00
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
 2016-01-18 16:40:00 +08:00
James Chen 5d1e98340e Updates WebSocket::onSocketCallback & WebSocketTest.js 2016-01-13 21:15:48 +08:00
XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	CHANGELOG
	cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp
	tests/js-tests/src/RenderTextureTest/RenderTextureTest.js
 2016-01-09 18:01:56 +08:00
Ricardo Quesada 7cd80cb669 Adds iOS tests, calls GC after replacing scene 
and some bug fixes

Squashed commit of the following:

commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:07:01 2015 -0800

    adds missing file

commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 19:02:27 2015 -0800

    disables GC by default

commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 18:57:14 2015 -0800

    Adds iOS test and calls GC after replacing the scene

commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Tue Dec 22 15:29:01 2015 -0800

    Merge branch 'v3' into v3_js_memory_test_and_fixes

commit 79e926a970e3153ee826b299c3417fb6ac599153
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 21:27:19 2015 -0800

    fixes crashes

commit 76f3910748e15c4ea179eab846f24f3e65d52d2d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Mon Dec 21 11:57:56 2015 -0800

    Adds standalone test for JS GC memory

    and fixes leaks on extended/subclassed objects
 2015-12-29 17:36:02 -08:00
Ricardo Quesada 692c0f8a0e adds tvOS support 
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
 2015-12-28 15:59:36 -08:00
pandamicro 169d3fc4b8 Merge pull request #14797 from VisualSJ/v3.10 
Fixed a bug about should not be used `gl` in canvs mode
 2015-12-24 17:51:03 +08:00
VisualSj 79bf3897d7 Fixed a bug about should not be used `gl` in canvs mode 2015-12-24 16:33:46 +08:00
pandamicro dea1ef1290 Merge pull request #14790 from pandamicro/v3.10 
Fixed WebSocket JSB crash issue
 2015-12-24 01:37:17 +08:00
pandamicro acf03c06d5 Fixed WebSocket JSB crash issue 2015-12-23 23:28:14 +08:00
xiaofeng11 519e69813d Merge pull request #14785 from xiaofeng11/v3.10 
Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash
 2015-12-23 18:43:07 +08:00
XiaoFeng c181390881 Fix in js-test, after UITest->UIFocus tests, in all other test scene when button clicked program will crash 2015-12-23 18:39:06 +08:00
VisualSj 1c60ae6ff1 Close webgl dedicated test in canvas mode 2015-12-22 19:07:46 +08:00
VisualSj 843694cea5 Close webgl dedicated test in canvas mode 2015-12-22 18:46:30 +08:00
VisualSj 875a2d83b1 Close webgl dedicated test in canvas mode 2015-12-22 18:36:48 +08:00
zilongshanren fa172b9da9 Merge pull request #14765 from liamcindy/v3_ui_js 
update for js uiTextAtlasTest
 2015-12-21 19:17:41 +08:00
fanli 81f9d20158 update for js uiTextAtlasTest 2015-12-21 16:29:16 +08:00
pandamicro 8d8ac60625 Merge pull request #14761 from pandamicro/v3.10 
Correct return type to adopt GC Rooting API
 2015-12-21 11:46:59 +08:00
pandamicro 81918f51ea Fix event handle function issue with compartment 
and  Fix a crash issue caused by malformed js usage
 2015-12-21 00:16:17 +08:00
pandamicro 34c7331b99 Issue fixes for new memory model 2015-12-21 00:16:17 +08:00
pandamicro 8ddaf310ef Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
pandamicro 80973677ed Improve UICheckBox issue 2015-12-20 21:13:16 +08:00
fanli ffbac99dc5 fix script samples error with controlButton 2015-12-19 22:22:41 +08:00
pandamicro 7303895866 Improve error message for Downloader and add test case 2015-12-16 15:43:18 +08:00
pandamicro d33062ac35 Merge pull request #14667 from chengstory/#24347 
Fix #24347
 2015-12-14 15:03:21 +08:00
zhangcheng 436db6e932 Fix #24347 
JSTest(web)-->UI Test-->UIFocus-->UIFocusTestVertical displays focus first.
 2015-12-14 11:20:26 +08:00
Ricardo Quesada c5058aa2f9 more conversions 2015-12-11 17:18:20 -08:00
Ricardo Quesada 47911e0c24 more js fixes 
fixes in how ref count is measured
opengl bindings converted to new API
 2015-12-11 15:18:09 -08:00
Ricardo Quesada 8b2dfb1a4b Mooooores fixes 
but GC memory model doesn't work yet... somewhere someone is still
retaining a reference that prevents the whole thing from
releasing
 2015-12-10 22:15:44 -08:00
Ricardo Quesada c034303ad8 Adds MemoryModelTest 2015-12-10 18:22:10 -08:00
Ricardo Quesada 0e34a864b2 Merge pull request #14528 from xiaofeng11/v3_3dtouch 
Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device
 2015-12-03 22:21:48 -08:00
pandamicro b6fd2e9449 Permit http access to cocos2d-x.org in test projects 2015-12-03 18:00:48 +08:00
pandamicro e7dca08df9 Add js test case for fix, improve template 2015-12-03 16:55:15 +08:00
slackmoehrle 1b4d12ced7 changed to cocos2d-x.org server 2015-12-02 15:16:05 -05:00
yangxiao ebd5c1cca7 resolve conflict and fix checktexture bug 2015-12-02 11:26:05 +08:00
肖峰 5dfc8f6a26 Remove default arguments 2015-12-02 11:02:27 +08:00
yangxiao 2e38dcb1a0 add normalmaping test 2015-12-01 18:13:50 +08:00
肖峰 bb832f8d60 Add 3d touch support to iOS 9.0 or higher version on iPhone6s or later device 2015-12-01 13:02:53 +08:00
pandamicro 955ddaafb7 Use rooted object for js_proxy new and get (missed) 2015-11-27 10:20:04 +08:00
pandamicro d23ffe4fc7 Fix some issue of js_type_class usage 2015-11-27 10:16:11 +08:00
pandamicro ae2b75c8be Fix issues causing by temporary RootedObject passed as function parameters 2015-11-27 01:35:06 +08:00
pandamicro a6fdd9aa09 Improve js template documentation 2015-11-24 16:31:14 +08:00
Бесшапошников Никита 89798d949b [js-tests] Test case for Scale9Sprite fade actions with cascade opacity enabled 
Test case for https://github.com/cocos2d/cocos2d-html5/pull/3181
 2015-11-10 15:13:05 +03:00
pandamicro a74c8ccded Merge pull request #14292 from xiaofeng11/v3 
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
 2015-11-03 17:46:34 +08:00
pandamicro 6a454d3eba Fix SocketIO test on iOS 9 2015-11-03 17:26:37 +08:00
XiaoFeng 8e6e46d596 Fix "BillBoard Test->Rotation Test" won't resume after switch back from background. 2015-11-02 14:50:45 +08:00
pandamicro 0d6bf3263b Improve js templates with noCache and cc.view.setRealPixelResolution docs 2015-11-01 18:33:05 +08:00
XiaoFeng 53d2874507 Fix "UItest->UicheckBox" display status, make it same as C++ version 2015-10-28 17:38:17 +08:00
XiaoFeng c55f030218 Fix "Test change animation intenal" under js test can not change back to 60fps 2015-10-28 11:18:12 +08:00
pandamicro 175f4c02ad Merge pull request #14197 from xiaofeng11/v3_xf 
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
 2015-10-22 14:45:20 +08:00
pandamicro 43c19fd1e7 Merge pull request #14205 from pandamicro/v3 
Fix Scheduler API inconsistency
 2015-10-21 22:11:16 +08:00
pandamicro 9eeda122e9 Fix Scheduler API inconsistency 2015-10-21 22:10:48 +08:00
Dale Stammen f9d8907697 updated winrt temporary app certificates expiration dates 2015-10-20 07:39:42 -07:00
XiaoFeng 3d626940af Roll back debug commented code 2015-10-20 17:23:31 +08:00
XiaoFeng 7e54a91ee6 Fix CCDownloader-curl will crash in js-test 
Fix broken image link in TextureCacheTest.js
 2015-10-20 16:28:03 +08:00
pandamicro cde67d1261 Merge pull request #14162 from mogemimi/fix-warnings 
Fix warnings on Xcode 7
 2015-10-18 22:56:12 +08:00
pandamicro c365fc5883 Merge pull request #14180 from pandamicro/v3 
Fix issue for web engine upgrade
 2015-10-18 22:48:16 +08:00
pandamicro 11890d6c4b Fix issue for web engine upgrade 2015-10-18 00:19:02 +08:00
mogemimi 4600c41f9b Add override keywords 2015-10-16 15:01:10 +09:00
pandamicro 8b0a6a6c29 Merge pull request #14099 from pandamicro/v3 
[ci skip]Sync with CCBoot for web
 2015-10-10 10:16:16 +08:00
pandamicro 5ae2812bf8 Sync with CCBoot for web 2015-10-10 10:15:36 +08:00
pandamicro bc9b59b7f7 Merge pull request #14096 from pandamicro/v3 
[ci skip]Add opacity/color cascade test case for Scale9Sprite
 2015-10-09 21:07:27 +08:00
pandamicro 0ea54868e2 Add opacity/color cascade test case for Scale9Sprite 2015-10-09 21:01:49 +08:00
pandamicro 87677cdbd1 Merge pull request #14088 from chengstory/Fix#23321 
Fix Bug #23321
 2015-10-09 15:27:56 +08:00
zhangcheng 77062acfa7 Fix Bug #23321 2015-10-08 14:48:38 +08:00
zhangcheng 4bf56e5853 Fix #23337 
Hide menu "cocostudio 2.1", because cocostudio 1.6 Api can't load json exported from cocostudio 2.x.
 2015-10-08 11:35:43 +08:00
pandamicro 91928aa23d Add ComponentJS test case and fix windows platforms 2015-09-26 19:43:36 +08:00
江龙 9eb05707fb add custom spine skeletonAnimation test 2015-09-25 13:36:48 +08:00
ZhangMenghe 03e5573f79 button Opacity setting 2015-09-24 11:13:41 +08:00
pandamicro 149775ea10 Merge pull request #13962 from ZhangMenghe/v3-scrollView 
[ci skip] Testcase for multiple items in scrollView
 2015-09-24 09:35:05 +08:00
ZhangMenghe 68713d2074 Multiple items testcase 2015-09-21 18:22:58 +08:00
pandamicro cddd7dfdf6 Merge pull request #13965 from ZhangMenghe/v3-drawLabels 
[ci skip] DrawLabel Mode testcase
 2015-09-21 15:08:47 +08:00
ZhangMenghe 26358c9c2c DrawLabel Mode testcase 2015-09-21 11:05:21 +08:00
ZhangMenghe 4054686903 Testcase for multiple items in scrollView 2015-09-21 10:24:44 +08:00
zhangting bb8d9a4145 add testcase for writeDataToFile to jstests 2015-09-20 16:46:54 +08:00
pandamicro 6b8d400517 Merge pull request #13804 from ZhangMenghe/v3-UItestcase 
[ci skip] UItestcase modification to be friendly
 2015-09-19 00:22:41 +08:00
ZhangMenghe 6e4d39e909 s9sprite action testcase 2015-09-18 09:45:43 +08:00
ZhangMenghe 5f8351ea32 UItestcase modification to be friendly 2015-09-14 15:31:25 +08:00
zhangbin edb964a673 Remove the performance related config in project.json. 2015-09-11 16:03:07 +08:00
zhangbin 8e9928ad99 Remove performance tests from lua-tests & js-tests. 2015-09-11 10:53:17 +08:00
pandamicro 941cd3c9de Merge pull request #13717 from jianglong0156/assetsmanagerContinue 
fix the AssetsManagerEx can not continuous transmission
 2015-09-10 11:34:03 +08:00
江龙 4509a316cc add uniform conversion 
relate issue:https://github.com/cocos2d/cocos2d-x/issues/13747
relate pr:https://github.com/cocos2d/bindings-generator/pull/191
 2015-09-09 16:03:57 +08:00
pandamicro 747fab26a8 Merge pull request #13735 from jianglong0156/actionExtendReverse 
[ci skip]add action reverse issue test case
 2015-09-09 11:12:47 +08:00
江龙 ac1af6cd91 add action reverse issue test case 2015-09-09 11:09:40 +08:00
pandamicro dc607a1784 Merge pull request #13726 from jianglong0156/actionExtendSquash 
support custom action, and rewrite update function
 2015-09-09 10:25:56 +08:00
江龙 badd80bf3a support custom action, and rewrite update function 
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
    ctor:function (duration, deltaPos, deltaY) {
        this._super(duration, deltaPos, deltaY);
    },
    update:function (dt) {
        this._super(dt);

        if (this.getTarget()) { // rand color
            this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
        }

    }
});
 2015-09-09 10:08:07 +08:00
江龙 8daf026c6c fix the AssetsManagerEx can not continuous transmission for large zip file. 
the testcase is extension/assetsmanager
 2015-09-08 16:34:02 +08:00
ZhangMenghe f3190206e0 Remove clickAndMove testcase 2015-09-01 14:21:08 +08:00
WenhaiLin a3b5becb45 Sync v3.8 to v3 2015-08-31 22:05:37 +08:00
pandamicro 9d72d6a924 Merge pull request #13496 from ZhangMenghe/v3-notification 
[ci rebuild] Notification effect enhancement
 2015-08-28 14:10:42 +08:00
VisualSj 2d77609fb7 Update socket@1.3.6 and web index 2015-08-28 11:48:58 +08:00
ZhangMenghe 1bcc2dec37 Notification effect enhancement 2015-08-21 10:20:59 +08:00
Dale Stammen d55bc653e0 update c++ debug info settings 2015-08-20 13:25:17 -07:00
pandamicro 08fcf7e35b Merge pull request #13463 from ZhangMenghe/v3.8-materialSys 
[ci skip] Delete blur shader in js-resj
 2015-08-19 13:49:31 +08:00
ZhangMenghe e9bd14e1d7 Delete blur shader in js-resj 2015-08-19 13:41:45 +08:00
pandamicro 31bc04a301 Merge pull request #13455 from MSOpenTech/v3-win10 
Windows 10 UWP and WP8.1 app certification fixes
 2015-08-19 13:36:29 +08:00
Dale Stammen 47b72ba30e Merge branch 'v3' into v3-win10 2015-08-18 11:07:38 -07:00
Dale Stammen 8493365be7 updates to pass Windows App Certification tests 2015-08-18 11:06:47 -07:00
WenhaiLin 5cdfdf8497 [ci skip][Android Studio Projects]Update Gradle Plugin from 1.2.3 to 1.3.0 2015-08-18 22:37:00 +08:00
ZhangMenghe 9fbc45171e Fix shader position abnormal 2015-08-18 17:07:08 +08:00
VisualSj 22c8163bc8 [js-tests][PageView] Button position error 2015-08-18 16:12:32 +08:00
pandamicro 40581c1c25 Merge pull request #13422 from VisualSJ/v3-pb-21865 
[ci skip] Change ActionManager test name
 2015-08-17 21:47:20 +08:00
VisualSJ be93b6bf2e Change ActionManager test name 2015-08-17 20:35:38 +08:00
ZhangMenghe eaa5643c7c Fix invisiable testcase of effects 2015-08-17 17:26:25 +08:00
pandamicro 3f160ddbb1 Merge pull request #13382 from ZhangMenghe/v3-physics3d 
[ci skip] Avoid to trigger touch event multiple times
 2015-08-17 11:21:51 +08:00
pandamicro c0eea61109 Merge pull request #13375 from ZhangMenghe/v3-effectAdvance 
[ci skip] Fix abnormal effects in effectsTest
 2015-08-17 11:18:27 +08:00
pandamicro 1700230213 Merge pull request #13379 from ZhangMenghe/v3-rtexture 
[ci skip] Modify renderTexture stencilDepth test
 2015-08-17 10:20:22 +08:00
pandamicro 6d7c05f0b7 Merge pull request #13356 from VisualSJ/v3-updateIndex 
[ci skip] Update js-test
 2015-08-17 10:18:59 +08:00
ZhangMenghe 06864479f3 Avoid to trigger touch event multiple times 2015-08-14 18:34:46 +08:00
ZhangMenghe 61ef51849c Modify renderTexture stencilDepth test 2015-08-14 17:53:48 +08:00
子龙山人 a4a26ccdbe Merge pull request #13357 from ZhangMenghe/v3-effectsTestcase 
[ci skip] Modify effects testcases
 2015-08-14 17:02:02 +08:00
ZhangMenghe 45f6c16d72 Fix abnormal effects in effectsTest 2015-08-14 15:58:31 +08:00
子龙山人 d13f4df356 Merge pull request #13372 from fusijie/fix_tiledmap_vertexZ 
[ci skip]Fixed JS-Tests TiledMap VertexZ bug.
 2015-08-14 15:31:11 +08:00
fusijie 77ef03d696 Fixed JS-Tests TiledMap VertexZ bug. 2015-08-14 15:13:08 +08:00
pandamicro dfabf8a5a0 Merge pull request #13347 from ZhangMenghe/v3-rtexture 
[ci skip] Rewrite testcase for stencil depth mask
 2015-08-14 12:23:11 +08:00