Dale Stammen
ee05081f3a
fixed include paths
2016-03-23 12:14:12 -07:00
minggo
3c676d9712
Merge pull request #15037 from Shulepov/spriteframecache_pixel_format
...
SpriteFrameCache: take pixelFormat into account if specified
2016-03-23 09:48:35 +08: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
Xpol Wan
a225130010
Fixes windows universal build.
2016-03-22 18:51:58 +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
zilongshanren
11ed05a0be
Merge pull request #15245 from mogemimi/fix-function-name
...
Fix incorrect function name of getTrianglesCount
2016-03-17 16:08:40 +08:00
mogemimi
23a05ddab2
Fix incorrect function name of getTrianglesCount
2016-03-15 07:39:42 +09:00
Naruto TAKAHASHI
cf38b1fbfd
fix build failed of gradle
2016-03-11 19:23:26 +09:00
Ricardo Quesada
9477bfd801
Merge pull request #15135 from dumganhar/ws-close-fix
...
Closes websocket connection by dispatching a 'resetDirector' event.
2016-03-10 17:39:47 -08:00
geron-cn
4247292c82
add test case for fix bugs
2016-03-10 18:06:54 +08:00
XiaoFeng
cce46195ca
Add websocket close test
2016-03-10 14:01:38 +08:00
beichen.liu
b207d559ae
Change the interface of LocalizationHelper::setCurrentManager.
2016-03-04 10:34:04 +08: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
beichen.liu
0489fd76e8
1.Change the interface in LocalizationManager.
...
2.Add new args of localization in simulator.
2016-03-03 15:49:50 +08:00
geron-cn
4f6fd3ef64
Squashed commit of the following:
...
commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 13:43:04 2016 +0800
change enum to enum class
use tabitem as pointer to replace _currentTabItemIndex
commit c0830cc581b8a07d6eed63268bf5be6a828c113a
Merge: 3663156 166931a
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:44 2016 +0800
Merge remote-tracking branch 'gero/tabview' into tabcontrol
commit 366315624143ff01c3e2b22b415ab79050e381e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Thu Mar 3 11:48:15 2016 +0800
Squashed commit of the following:
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
commit 166931a28c8736ab58b7c4319c1139b5e4865a9e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:35:06 2016 +0800
fix
commit e0eb069846a8ceb4b726c3c945801c944404b102
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 21:30:44 2016 +0800
fix active deactive in tabcontrol
commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 20:16:22 2016 +0800
fix active -1
commit e57796cbbae851e8cff52656b3265c80c2e8f6f7
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 16:00:51 2016 +0800
fix merge file
commit cdd44f1c577ad190bc175896107a48fbb36b65bb
Merge: 1658ad6 6bf55ed
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:57:48 2016 +0800
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview
# Conflicts:
# cocos/ui/CMakeLists.txt
commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Wed Mar 2 15:27:31 2016 +0800
configure for win8.1
commit ec236bff711b72952d48ec4d8b9137b4812b7a72
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:20:23 2016 +0800
configure for iOS mac twos android linux
commit 9d6678a4388461a791abe968fa637df2fc6839d3
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Tue Mar 1 10:02:17 2016 +0800
add lack files
commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 22:05:22 2016 +0800
add test case for TabControl
commit 97b8d8d87a37881b33ebe90478392150ef341b3e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 15:43:29 2016 +0800
add const to getter setter
commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 14:50:04 2016 +0800
format the comments
commit a1989a8f89d33ef8d9eefff6c8117b45977308ad
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:51:06 2016 +0800
remove reference
commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:40:04 2016 +0800
configure for win8.1
commit c015ac54028534202f62ff85f9a9d4b62b12801e
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:27:54 2016 +0800
fix error
commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Mon Feb 29 11:25:51 2016 +0800
add interface
commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:21:22 2016 +0800
fix compile error for tw-os
commit 3bfaa2976751e844a591ae5524bfd81249927c7c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 03:04:23 2016 +0800
fix linux compile error
commit fafe3ad660e644924fd02665b77e1df4076a4802
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:54:34 2016 +0800
re-indent code with X-Code
commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:37:51 2016 +0800
add reader configure for android
commit 07033f7b6074edf8a333e40c2382a09a2b2325e4
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:22:00 2016 +0800
format code, remove some warning
commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sun Feb 28 02:02:27 2016 +0800
configure for mac project
commit de21cea12c0a898ea95f9951022be85bdddeefaf
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 18:28:10 2016 +0800
add comment for apis
commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Sat Feb 27 15:32:46 2016 +0800
fix parse objects in container
commit 53bcce68b053a5b918a29735fed393c210d9cc2c
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 22:10:54 2016 +0800
fix flatbuffer parse
commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055
Author: geron-cn <c.ever.fallen@gmail.com>
Date: Fri Feb 26 18:26:07 2016 +0800
Init ui::TabControl
2016-03-03 14:17:48 +08:00
beichen.liu
05411a44f5
Add comment.
2016-03-03 13:41:32 +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
beichen.liu
91581754a4
Add introductions of localization manager in test.
2016-03-01 14:34:13 +08:00
zilongshanren
552d7d0132
add vertical list cell reuse tests
2016-03-01 13:44:42 +08:00
zilongshanren
b3b08271e6
improve Listview item demo
2016-03-01 10:37:48 +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
zilongshanren
a839d5818e
add horizontal cell reuse ListView
2016-03-01 00:07:49 +08:00
肖峰
6b4a0f808f
Add cocostudio localization editor export data parser and demo
2016-02-26 17:15:24 +08:00
zilongshanren
92dca220ce
improve mac editbox
2016-02-25 11:05:18 +08:00
Ricardo Quesada
37db8407f1
Merge pull request #14867 from dumganhar/refactor-websocket
...
WebSocket refactoring, bug fixes, improvements, and passes most Autobahn Test (The most standard WebSocket Protocol Test).
2016-02-21 06:59:59 -08:00
Mikhail Shulepov
fb7044c535
Add SpriteFrameCacheTest to Android, Windows, Linux project files
2016-02-17 20:52:30 +03: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
XiaoFeng
9224a9d03b
Remove test/lua-tests/project/Classes/lua_module_register.h, use the one in libluacocos2d instead.
2016-02-17 14:54:15 +08:00
pandamicro
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
Mikhail Shulepov
c26fe122ad
SpriteFrameCacheTest: test for PixelFormat
2016-02-12 19:06:16 +03:00
zilongshanren
4db0d2c47a
Merge pull request #15016 from zilongshanren/addMacEditBoxMultilineSupport
...
add Mac Editbox multiline support.
2016-02-11 21:33:56 +08:00
Ricardo Quesada
4a318c0048
Renderer improvments: TriangleCommand and QuadCommand merged
...
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
- QuadCommand is just a subclass of TriangleCommand (simpler)
- but statically it allocates indices internally (like any TriangleCommand) (more
memory, but not that much)
- adds more tests for SpritePolygon
- adds test for batching Tri + Quad command
- and fixes some other bugs
Squashed commit of the following:
commit cce893a9114da5dda91a895e4e661894f365e2c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 8 06:56:57 2016 -0800
QuadCommand: indices are static
thanks @Darinex
commit e5fd1c14e93d2f07b8266bfec03cf7206d348f59
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:18:42 2016 -0800
little improvements in xcode proj management
commit 6cd29764e01ad300f4e89e62aa6b399f73e94f01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 19:05:52 2016 -0800
Renderer improvments: TriangleCommand and QuadCommand merged
- more options for batching (faster)
- less flushing in between commands (faster)
- less renderer code (easier to maintain)
- less VBO/VAO (less memory)
- uses temporary buffer for faster rendering (more memory)
and fixes some other bugs
Squashed commit of the following:
commit af7a209435c5f2430c31ab3ebcc7f45051eacb1a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:55:27 2016 -0800
adds test for batching quads and tris
commit 25816e3eaeffd4b0cfe5fa15e97ff84e9013b8be
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 18:40:15 2016 -0800
cleanup renderer
commit 7f9785056681756c865d603516c7e14c46040e82
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:34:48 2016 -0800
clean up docs
commit 92a8b679dd404e4ca2839d85e2bd925195b12996
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun Feb 7 15:18:52 2016 -0800
QuadCommand converted to Triangles command
commit 7e21ec12d3781f6964b4d639cfa4bdc79eb8ae80
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 16:17:29 2016 -0800
adds missing files... new test as well
commit d1bd4391785515bdc2e1bebbeb3f321f983b51f2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 14:35:41 2016 -0800
more tests for poly sprites
commit 5775a25b1046671bd0f5af4c5ab52b308b34bb39
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 5 00:30:13 2016 -0800
malloc instead of std::vector
commit 14a5d45cc978c55a182c03f181ca2bc603776561
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 21:40:46 2016 -0800
little optimization
commit 5667cb2b62416f8a439a54c3973d5841fbe1b68b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 19:13:13 2016 -0800
quad works as expected
commit 462aef05baa6586591882faa366839bead4be068
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 15:22:59 2016 -0800
works
commit c789e6c42811278563c7682b5620296ae8d84aeb
Merge: d6c3729 de62924
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 14:08:49 2016 -0800
Merge branch 'v3' into uniform_matrix_auto
commit d6c37297954af752ebf42ec5f71e5e2fe28c9cc2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 13:54:07 2016 -0800
works ok...
commit 45c288631989ea735cc31ec5aa683d9d41aacab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 4 12:58:34 2016 -0800
quad works!
commit 7137cff51df09adee7129738cea2b69da090756e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 3 16:19:34 2016 -0800
more optimizations... WIP... doesn't work yet
commit a8324c1a9acb6b82102e05eee6e5e5f341306c7b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 21:59:42 2016 -0800
compiles in release mode
more tests... better threshold
commit 884ffc756e7520fcbb9252260181538ec81b8368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 2 17:21:32 2016 -0800
initial uniform_auto_matrix commit
Changes the CC_matrix uniform in runtime depending on whether the command can be batched or not.
Lot of things missing, though... like performance tests.
2016-02-08 11:25:37 -08:00
zilongshanren
a93bc88d31
add Mac Editbox multiline support.
...
1. It also refactor the original logic and optimize the iOS EditBox implementation.
2016-02-04 14:21:07 +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
74e7bd2083
fix win32 compile error
2016-01-26 09:52:53 +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
zilongshanren
b43764fc92
fix lua deprecated function bindings
2016-01-25 14:48:17 +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
25f78e490d
RichText with word wrapping working as expected
2016-01-21 21:44:45 -08:00
zilongshanren
be7c8c7553
Merge pull request #14888 from xiaofeng11/v3_actiontimeline
...
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-21 15:35:30 +08:00
Ricardo Quesada
ec2d29ed16
Merge pull request #14930 from ricardoquesada/rich_text_fixes
...
adds JS tests for RichText
2016-01-20 22:47:35 -08:00
geron-cn
be6fd6a2ee
format code indent
2016-01-21 10:27:37 +08:00
Ricardo Quesada
7735a75651
adds JS tests for RichText
2016-01-20 17:59:13 -08:00
geron-cn
87434e2774
add scrollview bar parse for cocostudio in reader
2016-01-20 21:13:59 +08:00
geron-cn
e2a3fb4a04
update ccs-res for scroll bar test
2016-01-20 21:12:52 +08:00
Ricardo Quesada
e36d71a24c
adds Invalid test
...
UIRichText reports error on console when parsing invalid xml
2016-01-19 21:16:53 -08:00
Ricardo Quesada
27c8e5227d
Adds xml support in UIRichText
...
Supported tags:
- <small>: makes the font 20% smaller
- <big>: makes the font 25% bigger
- <img src="" />: to add an image
- <font face="path to font" size="size" color="#00ffaa">: font
attributes
- <i>: italics
- <b>: bold
- <u>: underline
- <del> strike-through
- </br>: new line
Also adds support for strikethrough, italics, bold and underlie to
`Label`
Contains tests for UIRichText and Label
Squashed commit of the following:
commit a0d6ae0513d40dbf414930210ab032a49d8984a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:39:21 2016 -0800
cleanup LabelTestNew
commit 0cf423af85d88a42fc1317207feeb3d05da7f8ab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 19 20:34:53 2016 -0800
adds maaaany tests
...and fixes width and height in <img src="">
commit e8ba6acd5d79bbc766d7aa02ef166e166c801d01
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 19:41:37 2016 -0800
Label + URL working Ok
commit 36689e29ee3d77310e92264a09084cc06e30664c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 15 18:24:44 2016 -0800
adding this code just in case...
... should use a listener component instead
commit af03708950e74483b875d0baad593aa6ed242a04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 14 20:23:36 2016 -0800
URL node
plus <de><u> and <a img
commit e3a4930b012c0b3756752dac6ffb5ad43d24ae99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jan 13 18:42:18 2016 -0800
strikethrough and underline implemented
they support multiline and horizontal alignment as well
includes test
however vertical alignment might not work
commit 640ccf39f56e153db46785a61be7000e898174c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 18:14:57 2016 -0800
bug fixes
commit 5e41fb76e91c571639585a609a255eb41797a302
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 16:47:20 2016 -0800
adds italics and bold "disable test"
commit 202c5a45bb9c8ea160b9f6880ef858874e07814b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Jan 12 14:40:13 2016 -0800
adds italics test
commit d1a8b421445053cc36860fc376f52692a3672dfe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Jan 11 20:53:23 2016 -0800
italics is working ok
commit fdd02087fce920c27c2409301ec88685fe68085b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jan 8 17:18:56 2016 -0800
color, size and face working
commit c01bdef6b1d49f8805b69d4c162b74cd00c8f5b3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jan 7 19:02:16 2016 -0800
initial commit
2016-01-19 20:41:31 -08:00
pandamicro
39ab445f7d
Merge pull request #14904 from pandamicro/v3
...
[ci skip]Add more test case to jsb memory test
2016-01-20 11:43:49 +08:00
pandamicro
751e2f6eb8
Improve gc test case and add action cycle reference test
2016-01-20 11:15:06 +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
pandamicro
ec5b5f0014
Add TreeScene test case to jsb memory test
2016-01-18 14:28:02 +08:00
James Chen
41c0881ab5
SpriteTest fix
...
* Image is Ref class, please new & release it. Don't allocate it on stack.
* Fixes complicated logic of getting string from file.
2016-01-15 00:55:10 +08:00
XiaoFeng
0f3cb16efd
Fix when add two ActionTimeLine object in one node, play state is wrong
2016-01-14 16:16:37 +08:00
xiaofeng11
be6f9c0f03
Merge pull request #14882 from geron-cn/playableframe
...
add PlayableFrame
2016-01-14 09:42:17 +08:00
Ricardo Quesada
d589e44b0a
Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist
...
Load anchor points from plist files
2016-01-13 15:58:02 -08:00
James Chen
5d1e98340e
Updates WebSocket::onSocketCallback & WebSocketTest.js
2016-01-13 21:15:48 +08:00
geron-cn
eab1de0f1e
format code and remove fixes already in https://github.com/cocos2d/cocos2d-x/pull/14885
2016-01-13 16:34:04 +08:00
geron-cn
e3c50caf11
add test case for PlayableFrame
2016-01-13 15:25:31 +08:00
zilongshanren
e1d0d7f722
Merge pull request #14854 from zilongshanren/fixScale9GrayShader
...
fix scale9sprite gray state opacity issue.
2016-01-12 11:50:41 +08:00
zilongshanren
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +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
zilongshanren
7d943f200f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 17:17:55 +08:00
zilongshanren
2797277de8
Revert "fix scale9sprite gray state opacity issue."
2016-01-07 17:07:27 +08:00
zilongshanren
1910f79b2f
fix scale9sprite gray state opacity issue.
...
Ticket: https://github.com/cocos2d/cocos2d-x/issues/14378
2016-01-07 15:26:14 +08:00
zilongshanren
81428737c9
fix compilation errors
2016-01-05 09:51:37 +08:00
Wenhai Lin
168e851cce
Fixed WebSocket may automatically disconnected if invoke `send` several times in quick succession on Android.
2015-12-31 10:42:06 +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
3a09bd400d
Merge pull request #14799 from xiaofeng11/v3.10_xf
...
[ci skip] Bug fix
2015-12-24 21:38:16 +08:00
XiaoFeng
88196a4879
Both Image/blocks9ss.plist and animations/grossini.plist have image frames grossini_dance_*.png, and in Image/blocks9ss.plist the frames is smaller than frames in animations/grossini.plist, so if load Image/blocks9ss.plist first, the samples use frames named grossini_dance_*.png in animations/grossini.plist will crash. After check in source file, we found these frames in Image/blocks9ss.plist hasn't been used, so we changed frames name in Image/blocks9ss.plist to avoid crash.
2015-12-24 20:22:01 +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
Ricardo Quesada
707f08c557
Revert "fix setflip for batch sprite"
2015-12-23 09:54:04 -08:00
Ricardo Quesada
0d0534a2e1
Merge pull request #14697 from super626/v3.10-fixsprite
...
fix setflip for batch sprite
2015-12-23 09:53:24 -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
zilongshanren
830eb3433f
Merge pull request #14786 from liamcindy/v3_ui_widget
...
fix uiWidget clipping error with Node
2015-12-23 18:57:15 +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
Liam
bcc2ed0e2a
update for scrollView test
2015-12-23 18:14:09 +08:00
mogemimi
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
pandamicro
45d1d655cc
Merge pull request #14779 from xiaofeng11/v3.10
...
Bug fix & update
2015-12-23 12:35:52 +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
XiaoFeng
82867b0073
Roll back disable force GC change on windows platform, this cause lua binding can not respond mouse click
...
Remove 3d touch demo iOS sdk checking, it SDK defines won't work in cpp compile
2015-12-22 18:41:44 +08:00
VisualSj
875a2d83b1
Close webgl dedicated test in canvas mode
2015-12-22 18:36:48 +08:00
zilongshanren
064cd8d04f
Merge pull request #14722 from newnon/v3.10_webp_improvement
...
WebP loading improvements WebP loaded as premultiplied alpha if it has
2015-12-22 13:43:11 +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
yangxiao
09c139039f
add tmx with flipped spritebatch test
2015-12-21 10:00:15 +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
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
pandamicro
80973677ed
Improve UICheckBox issue
2015-12-20 21:13:16 +08:00
Sergey
a342866083
Test for WebP with & without alpha
2015-12-20 14:22:04 +03:00
fanli
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
zilongshanren
ac4f66fff2
fix lua focus test
2015-12-19 18:32:43 +08:00
zilongshanren
795637c0c5
Merge pull request #14743 from liamcindy/v3_ui_LoadingBar
...
fix loadingbar direction changed error
2015-12-19 16:59:42 +08:00
Liam
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
pandamicro
6481a0f3c1
Merge pull request #14740 from xiaofeng11/v3.10
...
Bug Fix & h5 engine ref update
2015-12-19 14:13:37 +08:00
XiaoFeng
f6021d502d
Fix pageViewTest Horizontal scroll won't work in Lua-test
2015-12-19 13:12:32 +08:00
zilongshanren
b480e9191d
Merge pull request #14729 from newnon/v3.10_scale9sprite_cropped_spriteframes_support
...
Scale9Sprite cropped sprite frames support
2015-12-19 13:07:25 +08:00
XiaoYang
593a619dc8
Merge pull request #14715 from liamcindy/v3_textureCache
...
update for 3D object render, revert old changes
2015-12-18 21:22:31 +08:00
Ricardo Quesada
e2f94a7a44
Merge pull request #14698 from super626/v3.10-fixshader
...
fix Shader-Sprite crash when shader can not compile
2015-12-17 23:22:09 -08:00
Sergey
9025b010ba
changeв russian letter с to english c
2015-12-18 10:19:08 +03:00
Liam
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
Sergey
714c01991e
Scale9Sprite test improvemets
2015-12-18 01:38:53 +03:00
Sergey
98fe1d46cc
Scale9Sprite now fully support cropped sprite frames in both mode simple & slice
2015-12-18 00:32:59 +03:00
pandamicro
b079705dcd
Merge pull request #14702 from pandamicro/v3.10
...
Fix Downloader callback bug on iOS9
2015-12-17 01:05:10 +08:00
zilongshanren
2881ce7c40
Merge pull request #14632 from liamcindy/UITest
...
update for ui resource test
2015-12-16 18:18:35 +08:00
pandamicro
7303895866
Improve error message for Downloader and add test case
2015-12-16 15:43:18 +08:00
Wenhai Lin
b91882f150
Fixed label's letter can't be hide by `setVisible(false)`.
2015-12-16 14:59:33 +08:00
yangxiao
5e61e37d80
fix crash when shader can not compile
2015-12-16 13:54:43 +08:00
Joachim Grill
8e75cdcd42
SpriteOffsetAnchorRotation test: moved setup code from ctor to onEnter(), as ctor is called before onExit() of previous test case, which might mess up sprite frame cache
2015-12-15 14:14:09 +01:00
Joachim Grill
4dd3595b1e
added test with plist file containing anchor points
2015-12-14 16:17:41 +01:00
zilongshanren
6318634887
Merge pull request #14641 from liamcindy/v3_ui_controlButton
...
fix controlButton test error
2015-12-14 19:47:41 +08:00
Liam
508d54ec3c
fix pageview child size
2015-12-14 15:29:02 +08:00
pandamicro
d33062ac35
Merge pull request #14667 from chengstory/#24347
...
Fix #24347
2015-12-14 15:03:21 +08:00
zilongshanren
6781c96fe0
Merge pull request #14661 from zilongshanren/v3.10
...
fix scale9sprite global zorder issue.
2015-12-14 13:56:29 +08:00
pandamicro
cbce4d37c3
Merge pull request #14671 from ricardoquesada/more_js_fixes
...
More js fixes
2015-12-14 13:41:59 +08:00
pandamicro
41218a65e7
Merge pull request #14668 from pandamicro/v3
...
Sync v3 and Fix win32 js project crash issue
2015-12-14 13:12:42 +08:00
zhangcheng
436db6e932
Fix #24347
...
JSTest(web)-->UI Test-->UIFocus-->UIFocusTestVertical displays focus first.
2015-12-14 11:20:26 +08:00
zilongshanren
8c9b03112e
fix scale9sprite global zorder issue.
...
1. it also fix the positiong issue when call setScale9Enabled(false)
2015-12-14 10:09:06 +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
zilongshanren
d75767bfc4
Merge pull request #14639 from liamcindy/v3_ui_text
...
update for text effect clone
2015-12-11 13:54:46 +08:00
Liam
f877f26bd2
update for controlButton
2015-12-11 11:56:58 +08:00
Ricardo Quesada
c034303ad8
Adds MemoryModelTest
2015-12-10 18:22:10 -08:00
Liam
1a17e94e1c
update for scrollview test
2015-12-10 15:25:27 +08:00
Liam
136b2bd514
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into UITest
2015-12-10 14:53:43 +08:00
Liam
e92db43e14
update for text clone
2015-12-10 13:17:31 +08:00
Liam
c823821a08
fix controlButton test error
2015-12-10 10:36:00 +08:00
zilongshanren
aedd48e74b
Merge pull request #14615 from xiaofeng11/v3_testBugFix
...
Remove default focus item from "Node:UI->1:GUI Dynamic Create Test->4:Focus Test"
2015-12-09 18:36:08 +08:00
zilongshanren
bb515dce58
fix issue 12249
2015-12-09 17:15:09 +08:00
zilongshanren
db05c13407
update ccs-res ref
2015-12-09 14:45:41 +08:00
zilongshanren
df2ebfbc9c
change uibutton nons9 to simple rendering mode
2015-12-09 14:21:26 +08:00
XiaoFeng
724e9b42a2
Remove default focus item from "Node:UI-->1:GUI Dynamic Create Test-->4:Focus Test"
2015-12-09 11:12:42 +08:00
XiaoFeng
73d0f8a46e
Bug fix & make test case more clear.
...
1. In CameraBackgroundSkyBoxBrush _actived and _textureValid should set true as default, otherwise will cause user get wrong display status.
2. "Enable Wrap" check box in "31:Node: Label - New API -> 55:Resize content Test" is not used, so set it to disabled, won't let user to change it.
3. When set blank texture to UISlider or UISlider button, use resetRender function to clear texture, use init with blank file name will cause error.
2015-12-07 18:36:28 +08:00
pandamicro
51acfa8908
Merge pull request #14581 from xiaofeng11/v3_xf
...
Add missing lua engine export declaration.
2015-12-04 17:51:38 +08:00
XiaoFeng
1b6a13d4b5
Fix compile error
2015-12-04 17:22:41 +08:00
pandamicro
1820a006ba
Merge pull request #14502 from xiaofeng11/v3_combine_2d
...
Combine Studio change for 2d components
2015-12-04 16:05:24 +08:00
XiaoFeng
1171c6aaa1
Remove desktop only function, set ondraw serial function in DrawNode override able.
2015-12-04 14:55:54 +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
XiaoFeng
6fb65b5610
Editing code as comment.
...
Move CocosStudioExtension path and update related files.
2015-12-04 10:43:39 +08:00
XiaoFeng
2da192a1c2
Remove cocostudio header file from sprite and particle, and adjust tests
...
Fix compile error under iOS & Mac
2015-12-04 09:26:14 +08:00
Ricardo Quesada
f14688464f
spawn2 in the correct place
2015-12-03 12:18:33 -08:00
Ricardo Quesada
3646d1e9fc
Adds init(array) for Sequence and Spawn
...
it also makes the code cleaner.
this is needed for JS
2015-12-03 12:16:21 -08:00
zilongshanren
ea42c09243
Merge pull request #14566 from zilongshanren/fixIssue14564
...
fix scale9sprite be culled unexpectedly
2015-12-03 19:17:40 +08:00
pandamicro
b6fd2e9449
Permit http access to cocos2d-x.org in test projects
2015-12-03 18:00:48 +08:00
zilongshanren
73d00b9262
fix scale9sprite be culled unexpectedly
...
tickets: https://github.com/cocos2d/cocos2d-x/issues/14564
2015-12-03 17:53:02 +08:00
pandamicro
e7dca08df9
Add js test case for fix, improve template
2015-12-03 16:55:15 +08:00
XiaoFeng
30874d457f
Update sub module
2015-12-03 15:04:08 +08:00
XiaoFeng
70b9183ddb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
tools/bindings-generator
2015-12-03 14:35:36 +08:00
XiaoFeng
32b81a69f5
Add test for new API
...
remove Sprite::setOffsetPosFromCenter api add by cocos studio, and reset _unflippedOffsetPositionFromCenter to zero in Sprite::setTexture
2015-12-03 14:21:00 +08:00
slackmoehrle
1b4d12ced7
changed to cocos2d-x.org server
2015-12-02 15:16:05 -05:00
XiaoFeng
a804c67a12
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d
...
Conflicts:
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
2015-12-02 15:07:58 +08:00
yangxiao
bb23015f73
make sure attributes greater than 8 before use normal map
2015-12-02 12:03:31 +08: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
xiaofeng11
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
yangxiao
2e38dcb1a0
add normalmaping test
2015-12-01 18:13:50 +08:00
XiaoFeng
ea077c5141
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_LuaJsSim
...
Conflicts:
cocos/scripting/js-bindings/manual/js_manual_conversions.h
2015-12-01 15:12:32 +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
81f590e52a
Merge pull request #14478 from pandamicro/v3
...
Improved JS bindings with more secured memory management
2015-12-01 12:24:21 +08:00
Liam
096efe8744
rename print interface
2015-12-01 11:07:02 +08:00
Liam
34da2aabb2
fix compile error
2015-11-30 17:34:49 +08:00
Liam
6054dc0197
update for ui test
2015-11-30 16:17:13 +08:00
Liam
e0349ae975
update sprite 3d test
2015-11-30 14:48:19 +08:00
zilongshanren
01e619f686
Merge pull request #14476 from cesarpachon/linuxAudioEngine
...
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudio…
2015-11-28 14:27:15 +08:00
fnz
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
zilongshanren
0f8c3e0c1c
Merge pull request #14435 from zilongshanren/improve-label-layout-v2
...
Add Overflow to Label
2015-11-27 17:31:40 +08:00
cesarpachon
40f6f76030
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
2015-11-26 22:22:05 -05: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
songchengjiang
dcfdfd3a78
LUA tests: add Sprite3DNormalMappingTest
2015-11-26 11:27:33 +08:00
songchengjiang
64f082ab7c
add bumped testing model
2015-11-26 10:14:27 +08:00
zilongshanren
b1490c96b6
Merge branch 'v3' into fixListViewClippingIssue
2015-11-25 18:25:40 +08:00
songchengjiang
9241797acb
support normal mapping material
2015-11-25 10:45:03 +08:00
zilongshanren
b36f464c09
update ccs-res submodule
2015-11-24 18:06:11 +08:00
zilongshanren
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
pandamicro
a6fdd9aa09
Improve js template documentation
2015-11-24 16:31:14 +08:00
zilongshanren
8d1f1a9933
Merge pull request #14457 from zilongshanren/testEditBoxScaleSize
...
Fix edit box setPlaceholderFontName and scale font size issue
2015-11-24 11:33:52 +08:00
zilongshanren
7676b1cb73
improve label layout logic
2015-11-23 17:47:30 +08:00
zilongshanren
361daf7f5f
fix wrong indentation
2015-11-23 11:50:04 +08:00
François Dupayrat
12df5ae1cc
Fix wrong variable use for setPlaceholderFontName
...
1. fix editbox scale not affect native font size
2015-11-23 11:49:22 +08:00
zilongshanren
689c0f4af3
Merge pull request #14327 from wohaaitinciu/editbox-win32
...
Fix a fatal bug in EditBox implement for platform win32
2015-11-23 11:35:40 +08:00
zilongshanren
7ee82f20fc
fix getLetter crash issue.
...
1. make vertical clamp works in non-wrap mode.
2. make the lineHeight and letterSprite scale work correct.
2015-11-20 16:39:48 +08:00
zilongshanren
19257d6120
Add Overflow feature char map font.
...
1. fix single line clamp.
2015-11-19 18:14:46 +08:00
zilongshanren
ccdb2a75f9
Add Label Overflow and wrap option.
...
Squashed commit of the following:
commit 7176582def3686f78701f92ead4d0976bccd115d
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 19 10:30:54 2015 +0800
add char map font test
commit 7ea7c251ff549e4a74d5c5c3faa49893fe5defc4
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 15:00:17 2015 +0800
system font overflow is not supported
commit a02fe0c7f94692b95a0bfd6f194a94c4519cee3a
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 18 11:04:15 2015 +0800
add system font test
commit eb098da8b16f485c86929a9b2ba00a64068264e9
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 17 10:29:35 2015 +0800
Finish resize height mode
commit ca78ba35abdbacc23bf6f8315454ec0a356a6aca
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 16 11:01:27 2015 +0800
fix wrap issue
commit baf1a5e0dc3a08da0a13500aea5afc82017b054a
Author: zilongshanren <guanghui8827@126.com>
Date: Sat Nov 14 08:28:57 2015 +0800
horizontal shrink still has a issue
commit 7e8abc0990cdf299d23c8072c5c1d4aa561bf798
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 11:42:34 2015 +0800
finish shrink without wrap
commit c9c45bd1f304ba00a6f9a274fa5631659a075bc1
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 13 10:09:46 2015 +0800
update shrink
commit ad82010ea846679e4d1a09f5127be29ae2e6adae
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 12 17:55:15 2015 +0800
refactor shrink logic
commit effc1ee1cd9f06eaa4f46dd5c2a1401f6a285af6
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 18:25:34 2015 +0800
add resize overflow type
commit 194d552adc2a4ba2c439eff969b082556315e0ae
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 11 11:49:51 2015 +0800
no wrap, shrink is working.
commit e2222ef14d5392817bd727895b3c2caec5ce4faf
Author: zilongshanren <guanghui8827@126.com>
Date: Tue Nov 10 16:16:27 2015 +0800
add overflow type to label.
1. optimize the testcase
commit b65e2de4bfb3cb86a0d0cfa118be891a3f9fe858
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:22:34 2015 +0800
finish bmfont wrap by char
commit f339ff0309dc9e2ca2871f03f4551d329afce5e1
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 17:04:51 2015 +0800
finish bmfont wrap by word
commit 4c8edc65204a1294ac81315e72f1299acbdf43c0
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 11:29:21 2015 +0800
add BMFont size support
commit 3282481bda9dcb0f88b41f2568f7e5c856af6d53
Author: zilongshanren <guanghui8827@126.com>
Date: Mon Nov 9 09:58:01 2015 +0800
add font size support for BMFONT
commit 0c8e2a0374983625507a183cb2eb53a0b1709e25
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 16:36:27 2015 +0800
add toggle wrap option.
1. make hirozontal clamp working
commit 19dcd3e80a34c54b20934d08937eb270e689a7db
Author: zilongshanren <guanghui8827@126.com>
Date: Fri Nov 6 15:12:59 2015 +0800
tweak label layout
commit e36a40babf4817ea7e9830614ac7560f2e69c583
Author: zilongshanren <guanghui8827@126.com>
Date: Thu Nov 5 11:11:02 2015 +0800
finish the test skeleton
commit a144a3a5d388d15c4f37cbfc12563eccabffb8e1
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 16:38:54 2015 +0800
add setFontSize api to label.
1. add new chinese-english bmfont
2. beautify base test
commit b22551c9eb3738fbb1c38ae4a3bfd07a202dcaf0
Author: zilongshanren <guanghui8827@126.com>
Date: Wed Nov 4 11:27:18 2015 +0800
add label layout test skeleton
2015-11-19 16:06:13 +08:00
Jeff Wang
efeae1eae9
add a test case for pr 14327
2015-11-18 22:52:47 +08:00
zilongshanren
5d8cfa889c
Merge pull request #14252 from neokim/change_pageview_to_derive_from_listview
...
Change PageView to derive from ListView
2015-11-17 12:02:10 +08:00
zilongshanren
a5b7674b4d
Merge pull request #14263 from zilongshanren/improve-scale9sprite-v4
...
improve scale9sprite
2015-11-17 10:48:09 +08:00
Neo Kim
603d788fbf
PageView - Fix that page indicator was not working well in vertical page view.
2015-11-15 22:49:42 +09:00
fnz
d86d32fb09
constexpr for signature, garbage collection and compile-time error for unsupported argument types
2015-11-10 23:39:16 +03:00
Neo Kim
9cbbd283c7
PageView - Deprecate the APIs related to custom scroll threshold.
2015-11-10 21:35:01 +09: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
fnz
23118cb587
fix missing include
2015-11-08 01:26:15 +03:00
fnz
ef89025d4b
fix missing include
2015-11-08 00:25:02 +03:00
fnz
80e8b58b53
easy jni
2015-11-07 23:57:05 +03:00
XiaoFeng
668558b99f
Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system
2015-11-06 11:38:41 +08: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
6010879ecf
Merge pull request #14305 from pandamicro/v3
...
[ci skip] Fix SocketIO test on iOS 9
2015-11-03 17:27:21 +08:00
pandamicro
6a454d3eba
Fix SocketIO test on iOS 9
2015-11-03 17:26:37 +08:00
zhangcheng
39f68e9885
Update ccs-res submodule to the latest.
2015-11-03 13:08:56 +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
XiaoFeng
0c8aed8a1a
Remove redundancy code
2015-11-02 13:40:08 +08:00
pandamicro
0d6bf3263b
Improve js templates with noCache and cc.view.setRealPixelResolution docs
2015-11-01 18:33:05 +08:00
zilongshanren
3e2094981f
add scale9sprite rendering type test
2015-10-30 14:01:01 +08:00
zilongshanren
f84c2de1e2
add sprite and scale9sprite batch test
2015-10-30 09:58:02 +08:00
zilongshanren
1417534194
add rendering type to scale9sprite
2015-10-29 23:13:36 +08:00
pandamicro
b66fa04c21
Merge pull request #14255 from xiaofeng11/v3_23634
...
Fix "UItest->UicheckBox" display status, make it same as C++ version
2015-10-28 18:32:49 +08:00
XiaoFeng
53d2874507
Fix "UItest->UicheckBox" display status, make it same as C++ version
2015-10-28 17:38:17 +08:00
Neo Kim
543fff63fb
PageView - Add indicators to some test cases
2015-10-28 17:23:08 +09:00
Neo Kim
abc309edb2
PageView - Replace the deprecated APIs with new ones.
2015-10-28 16:57:54 +09:00
Neo Kim
b9a4449494
PageView - Add `handleReleaseLogic()` for page view.
2015-10-28 16:56:35 +09:00
Neo Kim
97acf52cc8
PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.
2015-10-28 16:56:34 +09:00
Neo Kim
e567259826
PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.
2015-10-28 16:56:34 +09:00
Neo Kim
a09f2af14c
PageView - Trivial change on test code
2015-10-28 16:56:34 +09:00
pandamicro
15e400fb2e
Merge pull request #14248 from xiaofeng11/v3_23634
...
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
2015-10-28 15:49:52 +08:00
XiaoFeng
80b2def648
Fix "PhysicsTest->Fixed Update Test" under lua-test perform in wrong status.
2015-10-28 14:12:24 +08:00
pandamicro
5a963c66cd
Merge pull request #14240 from neokim/android_test_app_landscape_reversible
...
Change the android test app to be landscape reversible.
2015-10-28 13:03:33 +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
Neo Kim
11b46a7b04
Change the android test app to be landscape reversible.
2015-10-27 20:43:56 +09:00
pandamicro
aa9f0d5bd5
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
...
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
2015-10-27 17:28:22 +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
3f359381dc
moved file to correct folder in vcxproj
2015-10-20 10:07:30 -07: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
3bf0d0fe44
Merge pull request #14168 from MSOpenTech/v3-win10-fix
...
V3: fixed msbuild by removing incorrect AppxBundle properties from project
2015-10-19 08:22:24 +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
Dale Stammen
e2730a3d92
fixed msbuild by removing incorrect AppxBundle properties from project
2015-10-16 09:25:24 -07:00
mogemimi
73c0ce1a9a
Replace String::createWithFormat() with StringUtils::format()
2015-10-16 15:02:14 +09:00
mogemimi
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
pandamicro
efeb6a44fb
Merge pull request #14143 from MSOpenTech/v3-win10-curl
...
V3 win10 curl
2015-10-16 13:35:48 +08:00
pandamicro
e789ab97be
Merge pull request #14139 from super626/v3
...
fix obb performance test
2015-10-15 16:00:51 +08:00
Dale Stammen
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
pandamicro
1c085c96f1
Merge pull request #14136 from songchengjiang/cocos2d-v3-bugfix
...
fix lua Scene3DTest "back" button not working issue
2015-10-14 14:01:58 +08:00
yangxiao
85f40de424
fix obb performance test
2015-10-14 13:43:02 +08:00
songchengjiang
29c5ca6ea9
fix the #23309 bug
2015-10-14 11:23:11 +08:00
XiaoFeng
767a4afb9f
Fix UIPageViewVerticalTest in cpp-test can not scroll back to page 1
2015-10-14 09:16:34 +08:00
pandamicro
f2e3a0c071
Merge pull request #14104 from xiaofeng11/v3_bugfix
...
Bug fix
2015-10-12 10:14:26 +08:00
XiaoFeng
aee3244ad3
Fix test cocostudio test->cocostudio GUItest->MoveBy vertical direction under lua test project can not scroll back to page 1 from page 2
2015-10-10 17:50:48 +08:00
pandamicro
cff1a8ed50
Merge pull request #14103 from xiaofeng11/v3_bugfix
...
Bug fix
2015-10-10 17:20:07 +08:00
XiaoFeng
4df211fa0b
Fix particle test under lua test project display different in different platform
...
Fix cocostudio 3d test under lua test project crash bug
2015-10-10 14:51:14 +08:00
pandamicro
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
pandamicro
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08: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
Liam
68f25f65c4
update submodule
2015-10-08 14:59:48 +08:00
zhangcheng
77062acfa7
Fix Bug #23321
2015-10-08 14:48:38 +08:00
pandamicro
d6bb62beee
Merge pull request #14083 from chengstory/Fix#23337
...
Fix Bug #23337
2015-10-08 11:54:07 +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
2dbe0c1a90
Merge pull request #14016 from xiaofeng11/v3
...
Fix quickly click mouse in "41:Node:Physics -> 6:joints" in cpp-test may cause program crash
2015-10-08 11:12:36 +08:00
Dale Stammen
84e0d7fe7b
fixed another missing image asset in Win10 UWP manifest
2015-10-04 09:19:18 -07:00
Dale Stammen
6df43e60c0
fixed Windows 10 UWP app manifest by correcting image asset paths
2015-10-02 13:28:39 -07:00
Joachim Grill
79656ffe13
fixed typo, indentation
2015-09-29 16:50:14 +02:00
Joachim Grill
b14b251628
added Sprite performance test: load sprite from sprite sheet, with rectangular frame as well as with polygon outline
2015-09-29 15:45:48 +02:00
Joachim Grill
80ca579a01
added Sprite test case which loads PolygonInfo of sprite from plist file
2015-09-29 15:44:13 +02:00
Liam
8368762b37
update for light3D
2015-09-29 18:33:28 +08:00
zhangbin
f715a93521
Solve the crash of performance-tests on windows.
2015-09-29 15:32:51 +08:00
XiaoFeng
84347bb056
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-09-29 09:35:35 +08:00
XiaoFeng
0bdb1b099d
Fix particle test under performance test project memory overflow
2015-09-28 14:06:02 +08:00
pandamicro
0af7f29cfd
Merge pull request #14024 from TheCodez/fix_refptr_testcase
...
Fix : RefPtr test wasn't executed even in debug build
2015-09-27 23:16:27 +08:00
pandamicro
17c78ad3b1
Merge pull request #14018 from natural-law/v3
...
Solve the crash of performance-tests on windows.
2015-09-27 23:11:19 +08:00
Michael Kösel
744b7f54c9
Fix wrong debug check
2015-09-26 16:58:26 +02:00
pandamicro
91928aa23d
Add ComponentJS test case and fix windows platforms
2015-09-26 19:43:36 +08:00
pandamicro
a1bbd43f9f
Add component test to lua-tests and remove it from lua empty test
2015-09-26 19:43:36 +08:00
pandamicro
7e2b8c71a7
Improve lua script component
2015-09-26 19:43:35 +08:00
minggo
26632ec69a
linjia demo finish
2015-09-26 19:43:35 +08:00
minggo
3d1318fdf1
enemy can run
2015-09-26 19:43:35 +08:00
minggo
7326369ed2
pass dt to lua update
2015-09-26 19:43:35 +08:00
minggo
63af026769
can use any lua type to extend component
2015-09-26 19:43:35 +08:00
minggo
3f066d156a
lua script can access c++'s functions
2015-09-26 19:43:35 +08:00
minggo
85c297f53b
temple save
2015-09-26 19:43:35 +08:00
minggo
10427fb7ae
add lua component
2015-09-26 19:43:35 +08:00
zhangbin
6697cad212
Solve the crash of performance-tests on windows.
2015-09-25 18:23:13 +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
zilongshanren
bee52e378d
fix ui::WebView callback operate OpenGL issue.
...
All the OpenGL operations should be in OpenGL thread.
This PR wraps the callbacks in OpenGL thread.
2015-09-23 11:22:36 +08:00
pandamicro
49f6a863ea
Merge pull request #13966 from zilongshanren/fix-xcode7-override-issue
...
CCScrollView should override removeChild
2015-09-22 01:53:37 +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
zilongshanren
1c40f7b61b
CCScrollView should override removeChild
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
2015-09-21 11:35:11 +08:00
ZhangMenghe
26358c9c2c
DrawLabel Mode testcase
2015-09-21 11:05:21 +08:00
pandamicro
6ab7f3804e
Merge pull request #13960 from TimothyZhang/jsb-writeDataToFile
...
Add jsb.fileUtils.writeDataToFile()
2015-09-21 10:48:25 +08:00
ZhangMenghe
4054686903
Testcase for multiple items in scrollView
2015-09-21 10:24:44 +08:00
pandamicro
fa9afd6c2b
Merge pull request #13953 from himynameschris/fix-socketio
...
Fix socketio to work with servers v1.0+
2015-09-20 23:15:27 +08:00
zhangting
bb8d9a4145
add testcase for writeDataToFile to jstests
2015-09-20 16:46:54 +08:00
geron-cn
f93cfac0f7
rename setAnimationEndCallFunc
2015-09-20 16:24:41 +08:00
geron-cn
0cfc33e4d3
format apis added in https://github.com/cocos2d/cocos2d-x/pull/13770
2015-09-20 12:34:34 +08:00
Chris Hannon
e7c2436d85
fixes bug in socketio extension when connecting to socketio servers v1+ (incorrect separator in v1 packet strings)
...
Signed-off-by: Chris Hannon <chris@channon.us>
2015-09-19 20:31:48 -04:00
pandamicro
6bf54a3eda
Merge pull request #13770 from geron-cn/v3
...
add Frame End Call Back and Animation Clip End Call Back
2015-09-19 00:24:21 +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
pandamicro
3fc1349561
Merge pull request #13945 from WenhaiLin/v3-physics-testcase-fix
...
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:05:26 +08:00
WenhaiLin
db102f2030
[ci skip]Lua-tests:Fixed physical test cases.
2015-09-19 00:03:21 +08:00
pandamicro
0cbc1e5f40
Merge pull request #13923 from WenhaiLin/v3-physics-refine
...
Refine components to improve physics performance
2015-09-18 21:56:36 +08:00
pandamicro
cc8e944050
Merge pull request #12220 from hanxi/v3
...
add UIEditBox support linux platform
2015-09-18 21:53:09 +08:00
pandamicro
add24ccf95
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
...
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 21:43:42 +08:00
hanxi
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
WenhaiLin
a17a702cd1
Refine components to improve performance
2015-09-18 14:34:02 +08:00
yangxiao
36d4f5564d
merge cocos
2015-09-18 14:08:33 +08:00
pandamicro
8d0d053249
Merge pull request #13909 from ZhangMenghe/v3-s9sprite
...
[ci skip] testcase for s9sprite action
2015-09-18 13:03:13 +08:00
pandamicro
3f5df0ccc3
Merge pull request #13647 from super626/motionstreak3d
...
Motionstreak3d
2015-09-18 11:59:33 +08:00
偶尔e网事
eb480fb021
Revert "remove CCClippingRectangleNode transform error support."
2015-09-18 11:31:37 +08:00
ZhangMenghe
6e4d39e909
s9sprite action testcase
2015-09-18 09:45:43 +08:00
yangxiao
6f1b04fd89
merge cocos
2015-09-18 09:37:26 +08:00
pandamicro
ded9a9e6d4
Merge pull request #13893 from yangws/downloader
...
Remove AssetsManager dependence with CRUL.
2015-09-17 22:18:56 +08:00
Vincent Yang
5eafc93d86
Remove AssetsManager dependence with CRUL.
2015-09-17 16:52:31 +08:00
pandamicro
1eeafed072
Merge pull request #13884 from yangws/v3
...
Fix bug: in Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 16:32:56 +08:00
pandamicro
5b99ada936
Merge pull request #13842 from yangws/issue_13818
...
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong
2015-09-17 16:23:25 +08:00
yangxiao
572ee3adb2
merge cocos
2015-09-17 14:24:01 +08:00
Vincent Yang
4b83240bed
Fix bug: in ui::Widget::isClippingParentContainsPoint, _hittedByCamera may be null.
2015-09-17 11:20:36 +08:00
andyque
1be5402050
Merge branch 'v3' into addiOSMultiline-support
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
2015-09-16 21:49:55 +08:00
pandamicro
0479cca364
Merge pull request #13832 from yangws/downloader
...
Restructure CCDownloader implement on iOS and Android don't use libcurl.
2015-09-16 14:01:28 +08:00
Vincent Yang
c85dc71846
Fixed #13818 : Node:Text Input test in cpp-tests touch detection is wrong.
2015-09-16 11:07:37 +08:00
yangxiao
ea538cd9da
merge cocos
2015-09-16 10:37:24 +08:00
Vincent Yang
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
子龙山人
f2bee23696
Merge pull request #13789 from neokim/fix-13668
...
Fix for #13668
2015-09-15 18:28:24 +08:00
子龙山人
73d2c5d1b8
Merge pull request #13577 from fusijie/fix_13454
...
Fixed sprite debug draw.
2015-09-15 14:24:23 +08:00
andyque
556175df1e
add iOS EditBox multiline support
...
When the inputMode is ANY, then we use TextView to input.
otherwise we use normal UITextField.
Fixed issue https://github.com/cocos2d/cocos2d-x/issues/13436
2015-09-15 13:52:39 +08:00
andyque
2fea4db9fc
fix ui::Button title location issue
2015-09-15 13:37:32 +08:00
Vincent Yang
ebf308d88c
Test case Downloader Test restructured.
2015-09-14 15:33:34 +08:00
ZhangMenghe
5f8351ea32
UItestcase modification to be friendly
2015-09-14 15:31:25 +08:00
pandamicro
9fbefb8eed
Merge pull request #13786 from dumganhar/lua-xmlhttprequest-fix
...
[Lua] Life control fix for XMLHttpRequest
2015-09-14 12:12:41 +08:00
pandamicro
d3a76bc872
Merge pull request #13792 from natural-law/v3
...
Add tools for converting the performance tests data to excel files.
2015-09-14 10:55:27 +08:00
zhangbin
5d47ce8f23
Add tools for converting the performance tests data to excel files.
2015-09-14 09:52:21 +08:00
Neo Kim
3fff195c20
Override 'jumpToSomewhere' functions in list view to recalculate inner container's size if necessary.
2015-09-13 22:32:22 +09:00
James Chen
10e45ee744
Updates XMLHttpRequestTest.lua
2015-09-12 19:11:32 +08:00
子龙山人
96d6221daf
Merge pull request #13723 from neokim/add_scroll_to_item_and_magnetic_scroll_into_listview
...
Add scrolling to item and magnetic scroll into ListView
2015-09-11 17:48:40 +08:00
zhangbin
edb964a673
Remove the performance related config in project.json.
2015-09-11 16:03:07 +08:00
Neo Kim
22b2f8b7b3
ListView - Change the order of test cases and fix for windows builds.
2015-09-11 16:00:53 +09:00
zhangbin
8e9928ad99
Remove performance tests from lua-tests & js-tests.
2015-09-11 10:53:17 +08:00
geron-cn
966e568051
add ActionTimeline Frame End Call Back and Animation Clip End Call Back
2015-09-10 18:29:09 +08:00
Vincent Yang
bd80eb6f46
CCDownloader-android implements Data Task Download.
2015-09-10 18:03:15 +08:00
zhangbin
6f06ea19ac
Merge branch 'v3' into performance-test
2015-09-10 16:06:36 +08:00
zhangbin
e3161eb127
Remove performance tests from cpp-tests project.
2015-09-10 16:01:56 +08:00
Vincent Yang
7e2fe05050
CCDownloader-android implements File Task Download.
2015-09-10 15:56:06 +08:00
bill.zhang
c82fcfa6ca
Add win32 support for performance-tests.
2015-09-10 11:45:00 +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
yangxiao
d5fab0bd38
merge cocos
2015-09-10 10:44:09 +08:00
zhangbin
7fa1976fa6
Optimize the output test data.
2015-09-09 18:29:18 +08:00
zhangbin
5b90476f65
Write the test result file to sdcard on Android.
2015-09-09 17:00:38 +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
zhangbin
f3ade30b0b
Add proj.android & proj.android-studio support.
2015-09-09 16:02:33 +08:00
yangxiao
ff85173b4b
remove cached material switch test demo
2015-09-09 11:13:17 +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
Neo Kim
e58c073186
ListView - Apply magnetic to inertia scroll.
2015-09-09 10:29:18 +09:00
Neo Kim
ca3ea53ffd
ListView - Add enum for magnetic type and test cases for magnetic scroll.
2015-09-09 10:29:18 +09:00
Neo Kim
d8fc04d109
ListView - Add 'scrollToItem' method and its test cases.
2015-09-09 10:29:18 +09:00
Neo Kim
2599271410
ListView - Add APIs which return the closest item in specific position in current view.
2015-09-09 10:29:17 +09: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
zhangbin
523d4420bf
Add Container tests.
2015-09-08 16:33:03 +08:00
zhangbin
5bb3f1b9c4
Add Math tests.
2015-09-08 15:49:04 +08:00
yangxiao
7f7b4f83c4
add outline material
2015-09-08 15:33:24 +08:00
zhangbin
44b916ad74
Add Callback tests.
2015-09-08 15:29:56 +08:00
yangxiao
f944750627
add material cache
2015-09-08 15:29:54 +08:00
zhangbin
a3c730e014
Optimize the output file format.
2015-09-08 14:33:38 +08:00
yangxiao
2076071e8f
outline test using material file
2015-09-08 14:13:53 +08:00
zhangbin
8bceb9c0ba
Add Scenario tests.
2015-09-08 14:06:23 +08:00
yangxiao
a74e051b56
fix android back to foreground
2015-09-08 10:53:36 +08:00
minggo
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
zhangbin
669fc10d37
Clean the data when the auto tests are finished.
2015-09-07 16:40:47 +08:00
zhangbin
0571383889
Add EventDispatcher tests.
2015-09-07 16:20:20 +08:00
pandamicro
4fb34ba190
Merge pull request #13703 from cocos2d/v3.8
...
Sync v3.8 to v3
2015-09-07 14:56:37 +08:00
yangxiao
c3ac446f35
resolve conflict
2015-09-07 14:45:09 +08:00
zhangbin
646190af0e
Add Label tests.
2015-09-07 13:42:24 +08:00
Vincent Yang
9b4fe5b5a1
Add CCDownloader-android class frame to android project.
2015-09-07 11:55:00 +08:00
Vincent Yang
3a078540a0
Modify CCDownloader-apple.mm support continuly download.
2015-09-07 10:08:28 +08:00
zhangbin
5ce4ddfb1d
Add Texture tests.
2015-09-06 17:39:00 +08:00
zhangbin
bd47385bbd
Add Sprite tests.
2015-09-06 16:35:13 +08:00
Vincent Yang
0afa2bdfc6
Modify CCDownloader-curl.cpp to support continue download.
2015-09-06 15:57:51 +08:00
Vincent Yang
ea580ed2ee
Restructure CCDownload Interface and implements with curl.
2015-09-02 18:26:42 +08:00
andyque
c0f40ad4a5
fix Android EditBox font size issue
2015-09-02 18:25:30 +08:00
songchengjiang
cc6e2077f4
replace custom shaders by material files
...
add Sprite3DVertexColorTest
2015-09-02 16:30:24 +08:00
zhangbin
cc2dd7b225
Add Particle3D tests.
2015-09-02 14:31:35 +08:00
zhangbin
c664756dbe
Add particle tests.
2015-09-02 11:21:17 +08:00
ZhangMenghe
f3190206e0
Remove clickAndMove testcase
2015-09-01 14:21:08 +08:00
yangxiao
8499400514
motionstreak3d test demo
2015-09-01 10:39:31 +08:00
WenhaiLin
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
zhangbin
013ed60c15
Add node children tests.
2015-08-31 17:40:26 +08:00
zhangbin
46427bec59
Write the test data with json format.
2015-08-31 16:57:46 +08:00
zhangbin
351dee8c22
Optimize the implementation of Alloc Test.
2015-08-31 15:08:36 +08:00
zhangbin
0e0213b121
Add logic for auto test the test cases.
2015-08-31 11:42:48 +08:00
Vincent Yang
cf664800ac
refine #22483 : Restructure CCDownload Interface and implements on iOS.
2015-08-28 16:40:11 +08:00
zhangbin
00f2e99b2c
Add performance tests project for iOS & Mac.
2015-08-28 14:54:12 +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
pandamicro
d6045fdbea
Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/audio/winrt/Audio.cpp
cocos/platform/winrt/CCCommon.cpp
cocos/platform/winrt/CCWinRTUtils.cpp
cocos/platform/winrt/CCWinRTUtils.h
2015-08-27 10:40:04 +08:00
fusijie
5f527bfc1d
Fixed sprite debug draw.
2015-08-26 18:18:58 +08:00
江龙
7ce5542ffc
add scriptTest project manifest
2015-08-26 14:50:34 +08:00
Ricardo Quesada
dfed33f6f2
Adds `PrimitiveCommand` test
2015-08-25 15:07:03 -07:00
andyque
6cea66f932
fixed Scale9Sprite default capInset bug.
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13560
2015-08-25 23:31:34 +08:00
pandamicro
b6de58c21c
Merge pull request #13558 from WenhaiLin/v3.8-testcase-refine2
...
[cpp-tests]Refine test cases about label
2015-08-25 18:30:44 +08:00
WenhaiLin
d6ed3b417c
[cpp-tests]Refine test cases about label
2015-08-25 17:50:47 +08:00
fusijie
19901c43ea
fix spriteblur crash foreground.
2015-08-25 14:39:17 +08:00
WenhaiLin
a6412e431d
[cpp-tests]Fixed title of test cases.
2015-08-25 10:28:18 +08:00
fusijie
a7820c1eef
fix shaderTest draw twice.
2015-08-24 18:35:49 +08:00
pandamicro
350182c1aa
Refactor BackGround to Background
2015-08-21 10:43:59 +08:00
yangxiao
3e2001bdb1
Add CCCameraBackgroundBrush
...
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
2015-08-21 10:43:59 +08:00
ZhangMenghe
1bcc2dec37
Notification effect enhancement
2015-08-21 10:20:59 +08:00
pandamicro
f377a9bff1
Merge pull request #13491 from zilongshanren/v3.8
...
add RadioButton and RadioButtonGroup event type
2015-08-21 09:17:46 +08:00
Dale Stammen
d55bc653e0
update c++ debug info settings
2015-08-20 13:25:17 -07:00
andyque
15156a015a
add RadioButton and RadioButtonGroup event type
2015-08-20 22:49:42 +08:00
pandamicro
918d7ce5d6
Merge pull request #13480 from geron-cn/v3.8
...
add blendfunc Frame test case
2015-08-20 18:02:40 +08:00
子龙山人
f79d2c8a0a
Merge pull request #13483 from zilongshanren/fix-lua-ui-v3.8
...
[ci skip]add missing ui test in Lua
2015-08-20 15:28:25 +08:00
andyque
72496ae426
add missing ui test in Lua
2015-08-20 15:25:09 +08:00
geron-cn
ede4651b5e
add blendfunc Frame test case
2015-08-20 11:29:52 +08:00
子龙山人
f14c58877c
Merge pull request #13467 from fusijie/fix_testcase_as_compile_downloaderTest
...
[ci skip]fix as compile error.
2015-08-19 15:17:59 +08:00
fusijie
bdc22516c8
fix as compile error.
2015-08-19 15:05:18 +08: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
子龙山人
1f735b4f0e
Merge pull request #13437 from fusijie/fix_lua_testcase_setPointer_error
...
Fixed setVertexAttribPointer luabinding and Test case.
2015-08-19 11:43:18 +08:00
子龙山人
e3c88533fe
Merge pull request #13447 from WenhaiLin/v3.8-refine-testcases
...
Test cases:improve small problems.
2015-08-19 09:46:13 +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
WenhaiLin
5dd6d94c17
Test cases:improve small problems.
2015-08-18 22:19:24 +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
fusijie
f671d36e31
Fixed lua testacase setPointer error.
2015-08-18 11:19:32 +08:00
Dale Stammen
9259696847
disable Downloader test for Win10 UWP. No CURL support yet
2015-08-17 18:37:54 -07:00
Dale Stammen
97ecec1d64
updated Win10 UWP app asset files
2015-08-17 18:35:42 -07:00
pandamicro
b4ec30cc47
Merge pull request #13416 from WenhaiLin/v3.8-beta2
...
cpp-tests[win32 project]:Fixed link errors in release mode.
2015-08-17 22:32:42 +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
pandamicro
f2edb1c8f9
Merge pull request #13410 from ZhangMenghe/v3-retinaEffect
...
[ci skip] Fix invisiable testcase of effects
2015-08-17 17:51:04 +08:00
WenhaiLin
ae836bd364
cpp-tests[win32 project]:Fixed link errors in release mode.
2015-08-17 17:43:36 +08:00
ZhangMenghe
eaa5643c7c
Fix invisiable testcase of effects
2015-08-17 17:26:25 +08:00
pandamicro
9db78b2bb7
Merge pull request #13407 from liamcindy/v3.8
...
fix the skybox display error from editor files
2015-08-17 16:57:32 +08:00
Liam
7aa36d14be
fix the skybox display error from editor files
2015-08-17 13:04:25 +08:00
子龙山人
4000cff902
Merge pull request #13399 from WenhaiLin/v3.8-beta2
...
DownloaderAsyncTest:Fixed crash cause by double-click `start download` button.
2015-08-17 11:28:43 +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
WenhaiLin
aeca6ae024
DownloaderAsyncTest:Fixed crash cause by double-click `start download` button.
2015-08-17 10:16:04 +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
Ricardo Quesada
7047e0fbdb
Merge branch 'v3' into downloader_decouple_squash
2015-08-13 11:07:49 -07:00
子龙山人
20729e16ae
Merge pull request #13349 from yangws/v3
...
Fix bug: timer dt time error when interval = 0.
2015-08-13 17:02:55 +08:00
VisualSj
f9397f39f5
[js-tests] Update Particle test
2015-08-13 15:18:42 +08:00
ZhangMenghe
4f49993fef
Modify effects testcases
2015-08-13 15:15:04 +08:00
Ricardo Quesada
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
2015-08-13 00:14:10 -07:00
子龙山人
d8810abdd6
Merge pull request #13343 from zilongshanren/fix-template-deprecated-api
...
remove deprecated API in templates
2015-08-13 15:08:14 +08:00
Vincent Yang
295dcde2a8
Modify test case SchedulerPauseResumeAll and SchedulerPauseResumeAllUser.
2015-08-13 14:38:51 +08:00
andyque
c3abb48b98
remove deprecated API in templates
2015-08-13 13:42:47 +08:00
Vincent Yang
d333d24177
Fix bug: timer dt time error when interval = 0.
2015-08-13 12:55:07 +08:00
子龙山人
5e21580cdd
Merge pull request #13345 from VisualSJ/v3-updateIndex
...
[ci skip] update js-tests
2015-08-13 11:18:19 +08:00
VisualSj
dd7e00403f
[js-tests] that is undefined - script test
2015-08-13 10:56:41 +08:00
ZhangMenghe
7ffde1cdf8
Rewrite testcase for stencil depth mask
2015-08-13 10:45:45 +08:00
子龙山人
a4a1a62886
Merge pull request #13328 from zilongshanren/fix-ios-Appcontroller
...
remove unneeded protocol in AppController.h.
2015-08-13 10:35:00 +08:00
VisualSj
1458e06492
[js-tests] Optimization Cocosbuilder test
2015-08-13 10:03:10 +08:00
子龙山人
38b1da2c06
Merge pull request #13315 from ZhangMenghe/v3-touchInter
...
[ci skip]Add testcase to issue3053
2015-08-12 18:20:23 +08:00
子龙山人
986cce2872
Merge pull request #13316 from ZhangMenghe/v3-cameraOrbit
...
[ci skip] Fix camera orbit testcase
2015-08-12 18:19:09 +08:00
andyque
82f597ce98
Merge branch 'v3.7.1' into v3
...
# Conflicts:
# cocos/scripting/lua-bindings/auto/api/CheckBox.lua
# cocos/ui/UICheckBox.cpp
# cocos/ui/UICheckBox.h
2015-08-12 17:59:50 +08:00
fusijie
bed3640e6c
fixed retro pos.
2015-08-12 15:09:33 +08:00
pandamicro
58b8da9ccb
Merge pull request #13293 from jianglong0156/fixJstestsReleaseError
...
fix js-tests can't use cocos run -p web -m release
2015-08-12 14:24:15 +08:00
子龙山人
f78ebf5843
Merge pull request #13312 from super626/animate3d
...
Modify CCLOG to cocos2d::log
2015-08-12 13:57:31 +08:00
andyque
9a83ed9b28
remove unneeded protocol in AppController.h.
2015-08-12 13:55:36 +08:00
子龙山人
25d4f9fccc
Merge pull request #13326 from yangws/bug_22060
...
fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test cas…
2015-08-12 13:34:32 +08:00
Vincent Yang
9159b21c9a
fix bug: #22060 cpp-tests Scheduler -> Pause/Resume All User test case not correct.
2015-08-12 11:37:15 +08:00
子龙山人
0f99e09adb
Merge pull request #13325 from jianglong0156/fixTextField
...
textfield not create, don't need open ime.
2015-08-12 11:26:31 +08:00
jianglong0156
fc5e2233e9
textfield not create, don't need open ime.
2015-08-12 11:22:36 +08:00
pandamicro
3d65700400
Merge pull request #13295 from fusijie/refine_testcase_retro_pos
...
fix retro effect pos bug.
2015-08-12 10:45:14 +08:00
pandamicro
dfc17edb27
Merge pull request #13291 from dabingnn/v3_FixShaderTestCrash
...
fix shader test crash on android device
2015-08-12 10:40:14 +08:00
pandamicro
dbd0b6dd86
Merge pull request #13272 from yangws/bug_21800
...
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app…
2015-08-12 10:25:30 +08:00
ZhangMenghe
fc7dc66c05
Change to non-background
2015-08-12 10:09:11 +08:00
子龙山人
5fb0135bc2
Merge pull request #13297 from yangws/bug_21861
...
Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's ef…
2015-08-11 15:55:26 +08:00
子龙山人
65c4261cc6
Merge pull request #13301 from yangws/bug_21906
...
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 15:54:02 +08:00
ZhangMenghe
417652cbbd
Fix camera orbit testcase
2015-08-11 15:13:11 +08:00
子龙山人
aba3d40a52
Merge pull request #13309 from jianglong0156/improvetestcase
...
[ci skip]Improve test case
2015-08-11 14:38:58 +08:00
Vincent Yang
47ecb246b8
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into bug_21906
2015-08-11 14:24:02 +08:00
ZhangMenghe
abb5aff9ed
Add testcase to issue3053
2015-08-11 14:06:00 +08:00
yangxiao
7b04dbca88
modify CCLOG to cocos2d::log
2015-08-11 11:54:08 +08:00
jianglong0156
89949248de
sort the testcase by title.
2015-08-11 11:22:01 +08:00
jianglong0156
8a8515e998
fix the menu label size error
2015-08-11 11:21:19 +08:00
WenhaiLin
eeb4a38715
Label:Fixed letter can be flipped.
2015-08-11 10:06:14 +08:00
pandamicro
06f57600d4
Merge pull request #13294 from dabingnn/v3_fixMaterialParsingTestWP8.1
...
V3 fix material parsing test wp8.1
2015-08-10 22:30:43 +08:00
Vincent Yang
d0a5c02399
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-10 17:58:49 +08:00
jianglong0156
32223348cb
fix vigrate resource error, and hide the vibrateTest in web
2015-08-10 17:27:28 +08:00
Vincent Yang
0d1dfbc440
Fix bug: #21861 cpp-tests->Node:Sprite->Testing Sprite BatchNode's effect not correct.
2015-08-10 17:07:46 +08:00
Huabing.Xu
d848da0e7d
change max parsing count to 5000
2015-08-10 16:41:16 +08:00
fusijie
4965a9a11c
fix retro effect pos bug.
2015-08-10 16:32:24 +08:00
Huabing.Xu
ea9d6e7997
refine test case to be more testing friendly
2015-08-10 16:12:15 +08:00
jianglong0156
e3f09d03b1
Merge branch 'v3' into fixJstestsReleaseError
2015-08-10 16:01:27 +08:00
Huabing.Xu
b7c624805e
fix material parsing crash on WP8.1 because memory exhausted
2015-08-10 15:51:26 +08:00
jianglong0156
9a46b3b3b1
fix js-tests can't use cocos run -p web -m release
2015-08-10 15:10:54 +08:00
pandamicro
940b53e271
Merge pull request #13292 from natural-law/v3
...
[ci skip] Add copy resources config of js-tests for web platform.
2015-08-10 15:09:33 +08:00
Huabing.Xu
0dee83b154
fix shader test crash
2015-08-10 14:40:54 +08:00
zhangbin
f91908d651
Add copy resources config of js-tests for web platform.
2015-08-10 12:00:53 +08:00
pandamicro
acc5754f5e
Merge pull request #13269 from WenhaiLin/v3.8-audioengine-addtestcase
...
Add test case for issue 11143.
2015-08-10 11:39:53 +08:00
子龙山人
f6569f24f4
Merge pull request #13273 from zilongshanren/android-editbox-reimplement-fix
...
Re-implement Editbox on Android platform.
2015-08-09 10:25:19 +08:00
pandamicro
e825160750
Merge pull request #13266 from super626/fixtest
...
Fix Sprite3D test background to foreground bug
2015-08-08 19:44:41 +08:00
pandamicro
395b6cb91f
Merge pull request #13263 from super626/v3
...
avoid to trigger touch event multiple times
2015-08-08 17:58:41 +08:00
pandamicro
6644b06643
Merge pull request #13271 from WenhaiLin/v3.8-minorproblem-fix
...
Fixed minor problems in test cases.
2015-08-08 12:04:30 +08:00
肖峰
4575587cf7
Fix cocostudio 3d test crash on mobile platform
2015-08-08 11:57:40 +08:00
geron-cn
744fd74b3b
make skeleton's debugdraw contorls all subbone's debug draw
2015-08-08 00:39:01 +08:00
WenhaiLin
772dab2002
Fixed minor problems in test cases.
2015-08-07 23:08:49 +08:00
pandamicro
7f215e97ff
Merge pull request #13275 from jianglong0156/fixWebinitError
...
[ci skip]fix error tips in web
2015-08-07 20:26:39 +08:00
pandamicro
4fe7c6de2a
Revert "remove unused code"
2015-08-07 20:21:24 +08:00
pandamicro
5293dcb5bb
Merge pull request #13274 from super626/animate3d
...
remove unused code
2015-08-07 20:05:14 +08:00
jianglong0156
99a52a34cb
fix error tips in web
2015-08-07 18:29:45 +08:00
yangxiao
d74245bfa9
remove unused code
2015-08-07 18:03:50 +08:00
Vincent Yang
354f64ec51
fixed bug #21800 [CppTest]Node: Scene3D when player outof terrain app will no response.
2015-08-07 17:36:35 +08:00
andyque
a35e89225e
Re-implement Editbox on Android platform.
...
This PR also fixed issue:
https://github.com/cocos2d/cocos2d-x/issues/9572
For the new EditBox:
1. Added a ResizeLayout for updating layout when soft keyboard is shown.
This is because some Android devices won't refresh the view and when
the view is panned, the native EditText will turn black. This is really
a hack, but it works for many Android devices from 2.3 to 5.0.
When keyboard is beginning to show, the ResizeLayout's doLayout
method will be called 24 frames per second. Once the keyboard is closed,
or the user begins to input, the doLayout method will be disabled.
2. EditText is working in a different UI thread, so all the data
are passed to GL thread via callbacks in UI thead.
3. It also overrides onKeyDown method in Cocos2dxEditBox.
When the EditText got the focus, users could press back key to exit
the game. This behavior is not allowed. We give developer the choice to
handle back key event manually.
2015-08-07 17:27:15 +08:00
WenhaiLin
5c33f2f6ed
Add test case for issue 11143.
2015-08-07 16:50:54 +08:00
yangxiao
544c96385a
fix background to foreground
2015-08-07 16:16:43 +08:00
yangxiao
d744554a4b
avoid to trigger touch event multiple times
2015-08-07 15:09:01 +08:00
pandamicro
c794523613
Merge pull request #13260 from ZhangMenghe/v3-tileMap
...
TileMap Testcase abnormal
2015-08-07 11:52:28 +08:00
ZhangMenghe
7753a07359
TileMap Testcase abnormal
2015-08-07 11:20:17 +08:00
子龙山人
782c9588a4
Merge pull request #13253 from zilongshanren/fix-touch-intercept-issue
...
Fix improper touch intercept event propagation.
2015-08-07 10:28:51 +08:00
pandamicro
d182c37f29
Merge pull request #13257 from ZhangMenghe/v3-UItestcase
...
UIScene testcase modification
2015-08-07 09:47:42 +08:00
ZhangMenghe
0ddd4e4a5b
UIScene testcase modification
2015-08-07 09:30:22 +08:00
andyque
211dde38e9
Fix improper touch intercept event propagation.
...
When the container widget is disabled, it shouldn't intercept touch.
https://github.com/cocos2d/cocos2d-x/issues/8316
2015-08-06 22:50:53 +08:00
VisualSj
ca82f41c1b
Add loader tests
2015-08-06 19:03:26 +08:00
pandamicro
7a758bb961
Merge pull request #13243 from jianglong0156/fixExitButton
...
[ci skip]fix the close button function in main list frame
2015-08-06 17:33:47 +08:00
pandamicro
ad4c349800
Merge pull request #13245 from ZhangMenghe/v3-1586bugfix
...
Fix offset on retina screen in shaderTest
2015-08-06 17:27:47 +08:00
ZhangMenghe
91ae9e07b6
Fix offset on retina screen in shaderTest
2015-08-06 15:14:13 +08:00
子龙山人
a0a34deb78
Merge pull request #13242 from WenhaiLin/v3.8-cpptests-freeze
...
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 15:03:30 +08:00
jianglong0156
482b8f3583
fix the close button function in main list frame
2015-08-06 14:14:52 +08:00
WenhaiLin
ffda8ace82
CppTests: Avoid freeze when the program crashed on Android.
2015-08-06 13:50:15 +08:00
子龙山人
41afa9695c
Merge pull request #13230 from WenhaiLin/v3.8-label-space-lost
...
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-06 11:01:35 +08:00
WenhaiLin
e81d5af12d
Spaces should not be lost if label created with Fingerpop.ttf
2015-08-05 23:46:41 +08:00
pandamicro
6831e24deb
Merge pull request #13198 from ZhangMenghe/v3-UItestcase
...
[ci skip]Modify UItestcase structure
2015-08-05 19:06:11 +08:00
子龙山人
05e88ad279
Merge pull request #13211 from fusijie/v3
...
[ci skip]fixed title.
2015-08-05 16:59:37 +08:00
子龙山人
5aaf9aa1ef
Merge pull request #13210 from WenhaiLin/v3.8-FontAtlasCache-crash-fix
...
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 16:57:57 +08:00
pandamicro
5faf7a9d76
Merge pull request #13209 from ZhangMenghe/v3-textfield
...
[ci skip]textField cc.vertext to cc.p
2015-08-05 15:48:16 +08:00
fusijie
6072cf9a9d
[ci skip]fixed title.
2015-08-05 15:47:59 +08:00
WenhaiLin
2c220092e6
Fixed FontAtlasCache::purgeCachedData might cause crash.
2015-08-05 14:12:02 +08:00
ZhangMenghe
88cb3ab711
textField cc.vertext to cc.p
2015-08-05 11:59:36 +08:00
pandamicro
8cdcade07a
Merge pull request #13186 from jianglong0156/addEmotionTest
...
fix getStringUTFChars bug
2015-08-05 10:19:19 +08:00
ZhangMenghe
f01f21d06f
Modify UItestcase structure
2015-08-04 17:13:17 +08:00
jianglong0156
ee7e7d237f
improve the test case
2015-08-04 11:40:10 +08:00
jianglong0156
36e8e9740a
improve the test case
2015-08-04 11:30:55 +08:00
pandamicro
8d836dade6
Merge pull request #13181 from pandamicro/v3
...
Sync Cocos2d-x v3.7.1
2015-08-03 22:12:05 +08:00
pandamicro
25cb0d2896
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# web
2015-08-03 19:47:56 +08:00
pandamicro
6d3a00ad67
Merge pull request #13173 from geron-cn/3.7.1
...
fix bug: crash when use bone after erase it form Vector.
2015-08-03 19:45:54 +08:00
pandamicro
6a2440d6f1
Merge pull request #13176 from VisualSJ/v3-boneTest
...
[ci skip][js-tests] add Change skin tests
2015-08-03 18:13:08 +08:00
VisualSj
479676cbd8
[js-tests] add Change skin tests
2015-08-03 18:10:31 +08:00
pandamicro
4b7b85f113
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
...
remove CCClippingRectangleNode transform error support.
2015-08-03 18:01:01 +08:00
geron-cn
d00e54ad8a
remove comment in test case
2015-08-03 16:55:55 +08:00
pandamicro
80a207ae43
Merge pull request #13172 from jianglong0156/addEmotionTest
...
add emotion bug test current nothing will show
2015-08-03 16:36:47 +08:00
jianglong0156
f9b6d6b670
add emotion bug test
2015-08-03 16:09:45 +08:00
pandamicro
b13fddb18e
Merge pull request #13162 from super626/v3
...
Terrain: Add light map support
2015-08-03 15:37:42 +08:00
yangxiao
0de2a3b33d
add terrain test with light map
2015-08-03 14:02:46 +08:00
pandamicro
702e667143
Merge pull request #13152 from zilongshanren/addVerticalPageView
...
add PageView vertical scroll support
2015-08-03 13:00:48 +08:00
pandamicro
9393daaf8f
Add test for PhysicsSprite bug#11618
2015-08-03 11:07:27 +08:00
yangxiao
8a6c49b5a3
merge cocos
2015-08-03 09:54:29 +08:00
pandamicro
3c2e66e425
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
...
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
2015-08-02 22:28:27 +08:00
pandamicro
46bb4f8aae
Merge pull request #13149 from jianglong0156/constructedWith3D_3#12404
...
Constructed with3d
2015-08-01 21:15:08 +08:00
pandamicro
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
andyque
5f34c1f072
add PageView vertical scroll support
2015-08-01 18:18:46 +08:00
jianglong0156
69040ef472
add Physics3DHingeConstraint support constructor
...
add Physics3DSliderConstraint support constructor
add Physics3DConeTwistConstraint support constructor
add Physics3D6DofConstraint support constructor
add PhysicsSprite3D support constructor
2015-08-01 16:18:00 +08:00
jianglong0156
bcec599993
Merge branch 'v3' into constructedWith3D_3#12404
2015-08-01 15:38:26 +08:00
pandamicro
d52a5da1d8
Merge pull request #13114 from jianglong0156/constructedWith3D_2#12404
...
Constructed with3d
2015-08-01 10:09:08 +08:00
pandamicro
93c40d01c5
Merge pull request #13144 from WenhaiLin/v3.8-gradle-update
...
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-08-01 09:59:54 +08:00
pandamicro
3bdc7e4e1e
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
...
fix polygon sprite setFlipped bug.
2015-08-01 09:59:25 +08:00
WenhaiLin
875d01573a
[Android Studio Projects]Update Gradle from 2.2.1 to 2.4
2015-07-31 21:20:42 +08:00
jianglong0156
80e812e5a0
add Physics3DShape support constructor
2015-07-31 18:17:35 +08:00
VisualSj
04b05776a6
[JS-TESTS] Div should be black
2015-07-31 17:16:57 +08:00
fusijie
dcef1e9d31
fix polygon sprite setflipped bug.
2015-07-31 15:49:44 +08:00
pandamicro
aed6b0719e
Merge pull request #13089 from yangws/issue_12692
...
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-31 12:02:00 +08:00
pandamicro
ede9195d14
Merge pull request #13073 from super626/fixtest
...
Bug Fix
2015-07-31 09:58:14 +08:00
pandamicro
c9d23805e7
Merge pull request #12978 from yangws/issue_12249
...
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-31 09:54:38 +08:00
pandamicro
3fa016a280
Fix win32 project and add winrt support
2015-07-30 23:39:52 +08:00
pandamicro
3524af1ad6
Merge pull request #13059 from geron-cn/3.7.1
...
fix bug: BoneNode 's debugdraw can not be controlled by ancestor's vi…
2015-07-30 20:31:34 +08:00
pandamicro
c0066f9afd
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
2015-07-30 20:25:57 +08:00
pandamicro
9b5c8d5d12
Merge pull request #12601 from super626/physics3d
...
3d physics collider
2015-07-30 18:19:23 +08:00
jianglong0156
113233b8df
add Camera support constructor
2015-07-30 18:00:51 +08:00
jianglong0156
b016b642ce
add Terrain support constructor
2015-07-30 17:17:57 +08:00
pandamicro
8d8c7fe14b
Complete AudioEngineTest
2015-07-30 17:14:08 +08:00
pandamicro
39721c6eb6
Merge pull request #13105 from fusijie/fix_10487
...
fix Sprite/Label/FastTMX auto-culling bug.
2015-07-30 17:12:37 +08:00
jianglong0156
0f9483a0e3
add SpotLight support constructor
2015-07-30 15:21:35 +08:00
jianglong0156
8d3ceb7ac2
add PointLight support constructor
2015-07-30 15:11:37 +08:00
fusijie
17c7848e62
fix FastTiledMap auto-culling bug.
2015-07-30 15:07:03 +08:00
fusijie
f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
子龙山人
6818a97311
Merge pull request #13104 from fusijie/fix_cpptests_androidstudio_compile
...
[ci skip]fix android studio compile error.
2015-07-30 11:59:05 +08:00
fusijie
d2181e137e
fix android studio compile error.
2015-07-30 11:55:33 +08:00
子龙山人
c039c7a9bd
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
...
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-30 11:29:48 +08:00
pandamicro
f53ba42b3b
Fix test issues and Add audio engine to js templates
2015-07-29 21:22:44 +08:00
pandamicro
9972bfb98c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine
...
# Conflicts:
# tests/js-tests/src/NativeTest/NativeTest.js
2015-07-29 21:01:56 +08:00
pandamicro
347854e8d3
Add Audio Control test case
2015-07-29 20:48:11 +08:00
pandamicro
07fdea50de
Refine C++ test case
2015-07-29 20:47:38 +08:00
Vincent Yang
e1d4d22353
Fixed #12692 : UILayout viewing area cutting position calculation error
2015-07-29 18:43:11 +08:00
dualface
ea594b92b4
add ActionTime lua test
2015-07-29 17:50:50 +08:00
dualface
184225519e
add ActionTime lua test
2015-07-29 17:36:54 +08:00
zhangbin
e30d84bca0
Solve the error in .cocos-project.json of js-tests.
2015-07-29 17:10:19 +08:00
pandamicro
36b7ba5b75
Merge pull request #13081 from natural-law/v3
...
Remove unused config in android project of js-tests.
2015-07-29 17:00:26 +08:00
WenhaiLin
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
pandamicro
16b03f0ebe
Merge pull request #13065 from pandamicro/widget_onEnter
...
Ensure C++ classes onEnter, onExit can be safely override in JS
2015-07-29 15:36:12 +08:00
zhangbin
6fe880bee5
Remove unused config in android project of js-tests.
2015-07-29 15:35:59 +08:00
tangziwen
cee43ccebb
update terrain again
2015-07-29 14:32:36 +08:00
yangxiao
ad80c11235
sync render state
2015-07-29 10:35:37 +08:00
geron-cn
7e05538521
ADD SKELETON NEST TEST CASE
2015-07-29 10:23:03 +08:00
pandamicro
81842417c4
Merge pull request #13032 from xiaofeng11/v3
...
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-29 09:54:43 +08:00
geron-cn
d2de5b1c85
add test case for bug: #13060 and #13005
2015-07-28 19:18:58 +08:00
pandamicro
cc63ff5c03
Fix indent
2015-07-28 18:37:57 +08:00
pandamicro
8e883f9956
Merge pull request #13049 from jianglong0156/constructedWith3D#12404
...
Some 3d classes can't be constructed with new in JS
2015-07-28 18:31:04 +08:00
pandamicro
6c16a4b990
Add test cases for extended classes in JSB
2015-07-28 18:25:11 +08:00
pandamicro
66b21fb2a8
Merge pull request #12972 from yangws/issue_12145
...
Fixed #12145 : formarRenderers in RichText doesn’t update container s…
2015-07-28 17:13:26 +08:00
XiaoFeng
bca6934786
Normalization function names
2015-07-28 14:05:56 +08:00
Vincent Yang
b92733c402
Add items as protected children.
2015-07-28 11:38:21 +08:00
子龙山人
3a58668d71
Merge pull request #12744 from fusijie/fix_pageturndown
...
Fix PageTurn3D
2015-07-28 11:35:15 +08:00
jianglong0156
d5a6522a37
Merge branch 'v3' into constructedWith3D#12404
2015-07-28 09:59:35 +08:00
pandamicro
b9968a9dca
Merge pull request #13038 from ZhangMenghe/shaderTestCase
...
Fix OpenGL testcase 'center' uniform error
2015-07-28 09:34:09 +08:00
jianglong0156
cb2b427eed
add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp
2015-07-27 18:19:10 +08:00
jianglong0156
9c6b5730d0
add Physics3DPointToPointConstraint support new
2015-07-27 16:02:13 +08:00
Zhang Menghe
a96ea2342a
Update OpenGLTest.js
2015-07-27 15:53:48 +08:00
pandamicro
3cc039b063
Merge pull request #13036 from fusijie/fix_12505
...
fix shader-basic testcase 'center' uniform error.
2015-07-27 15:40:44 +08:00
ZhangMenghe
232f738bf7
Fix OpenGL testcase 'center' uniform error
2015-07-27 15:08:07 +08:00
jianglong0156
1be5981d6a
add Physics3DComponent support new
2015-07-27 14:26:50 +08:00
fusijie
f8de67a0c4
fix shader-basic testcase 'center' uniform error.
2015-07-27 14:18:17 +08:00
子龙山人
7f383f961a
Merge pull request #13026 from fusijie/fix_13025
...
fix 13025 wild pointer.
2015-07-27 13:38:38 +08:00
XiaoFeng
f410fcd737
Fix issue https://github.com/cocos2d/cocos2d-x/issues/12968
2015-07-27 11:55:18 +08:00
子龙山人
bd0bdae530
Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine
...
Label:refine the implementation about text layout and support debug draw.
2015-07-27 11:10:31 +08:00
jianglong0156
d51f0b1f05
add animate support new
2015-07-27 10:51:53 +08:00
fusijie
f2f425d19c
fix 13025 wild pointer.
2015-07-27 10:39:31 +08:00
jianglong0156
e25c4f88ae
add animation3d support new to create
2015-07-27 10:31:35 +08:00
pandamicro
c16cab7e53
Merge pull request #13015 from VisualSJ/v3.7.1-12940
...
[ci skip] Moveing ActionTimeline tests
2015-07-25 14:44:10 +08:00
VisualSj
a0bf2c782f
Moveing ActionTimeline tests
2015-07-25 14:37:56 +08:00
VisualSj
c49053fce4
Moveing ActionTimeline tests
2015-07-25 14:37:44 +08:00
pandamicro
9615545e11
Merge pull request #12890 from jianglong0156/FileUtilsJSB
...
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
2015-07-25 14:16:14 +08:00
jianglong0156
c14ca98203
set file name to label.change the file dir
2015-07-25 14:04:41 +08:00
pandamicro
7ae3dd12a1
Merge pull request #12995 from fusijie/fix_12505
...
fix blur shader compliant on win8 universal.
2015-07-25 12:42:35 +08:00
pandamicro
fa46a0abb4
Merge pull request #12992 from yangws/v3.7.1
...
Fixed #12962 : Scene can't have std::vector member.
2015-07-25 09:52:00 +08:00
pandamicro
a666658764
Merge pull request #12998 from pandamicro/v3.7.1
...
Add BoneNode/SkeletonNode/SkinNode JS bindings
2015-07-24 23:42:38 +08:00
WenhaiLin
a1e682ca65
Improves the test to reproduce issue 12996
2015-07-24 21:34:59 +08:00
fusijie
647848e843
fix blur sprite shader on win8 universal.
2015-07-24 21:04:44 +08:00
pandamicro
05bb775438
Sync timelineParser and fix issue
2015-07-24 20:16:56 +08:00
VisualSj
09550ff742
Issue #12997 : Add JS test case (ccs.BoneNode)
2015-07-24 15:57:36 +08:00
VisualSj
64d247d91b
Issue #12997 : Add JS test case (ccs.BoneNode)
2015-07-24 15:45:19 +08:00
fusijie
bd0a57242b
refine blur shader test case.
2015-07-24 13:52:40 +08:00
fusijie
d550dace35
fix blur shader compliant on win8 universal.
2015-07-24 12:47:38 +08:00
geron-cn
0b09fd5bcb
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
2015-07-24 11:38:09 +08:00
Vincent Yang
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
Dale Stammen
6669fec648
added missing bug test
2015-07-23 12:34:37 -07:00
pandamicro
5f57fa942f
Merge pull request #12802 from ZhangMenghe/pageTurnDown
...
Page turn down
2015-07-23 18:10:53 +08:00
Vincent Yang
35040e7bb1
Fixed #12249 : Button touch doesn't work with setScale9Enabled.
2015-07-23 17:27:04 +08:00
zhangcheng
012053e163
replace space to tab.
2015-07-23 17:04:08 +08:00
zhangcheng
4b8248c015
Optimization of Custom Data.
...
replace ComExtensionData to ObjectExtensionData.
2015-07-23 16:30:23 +08:00
geron-cn
7255b5308b
config for mac
2015-07-23 15:13:14 +08:00
geron-cn
d46c8c6802
add lack file
2015-07-23 15:12:09 +08:00
geron-cn
915cefa208
bone node
2015-07-23 11:51:49 +08:00
Ricardo Quesada
b2b9bad83d
improves the test to reproduce bug 12847
2015-07-22 15:08:36 -07:00
pandamicro
6029ca3edd
Merge pull request #12949 from yangws/issue_12906
...
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 16:17:14 +08:00
Liam
99c1c33c61
update resource
2015-07-22 15:56:35 +08:00
pandamicro
741163db40
Merge pull request #12938 from WenhaiLin/v3.8-deps70
...
Update deps for support FullType.
2015-07-22 15:42:13 +08:00
pandamicro
e0e5ae9d99
Merge pull request #12924 from liamcindy/SkyBox_3.7.1
...
update for Game3DNodeReader & UserCameraReader
2015-07-22 15:34:18 +08:00
子龙山人
bb9500769f
Merge pull request #12885 from zilongshanren/add-jumpToPage-api
...
Fix PageView scrollToPage bug and the curPageIndex bug
2015-07-22 15:01:57 +08:00
pandamicro
dbaf00bca6
Merge pull request #12950 from fusijie/add_texturecoord_bug_test
...
add sprite frame flash line bug test case.
2015-07-22 14:32:26 +08:00
fusijie
92e68cd9dc
add sprite frame flash line bug test case.
2015-07-22 13:42:10 +08:00
Vincent Yang
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
ZhangMenghe
b6c566d87e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into setClearColor
2015-07-22 11:40:30 +08:00
子龙山人
8a8a089ad6
Merge pull request #12947 from zilongshanren/updateCcs-res-submodule
...
[ci skip]update ccs-res submodule
2015-07-22 10:46:02 +08:00
pandamicro
f0962669a9
Merge pull request #12946 from pandamicro/v3
...
[ci skip] Gen bindings for v3.7.1 branch
2015-07-22 10:45:23 +08:00
andyque
fbfb3a9dac
update ccs-res submodule
2015-07-22 10:45:18 +08:00
pandamicro
c260783fd0
[JS] Revert const to var to avoid issues on web compilation
2015-07-21 18:23:57 +08:00
WenhaiLin
979a9be1f5
Add test case for test font supported by FullType.
2015-07-21 17:09:27 +08:00
ZhangMenghe
2e72179b91
Remove a space
2015-07-21 15:22:03 +08:00
ZhangMenghe
94aa382669
Add testCase for setClearColor
2015-07-21 15:18:19 +08:00
ZhangMenghe
61e36463cc
Modify a space
2015-07-21 14:00:59 +08:00
ZhangMenghe
3c2d68e25c
Modify the testcase with coding standards
2015-07-21 13:48:08 +08:00
pandamicro
d478c5f8a8
Merge pull request #12923 from ZhangMenghe/ModifytestCase
...
Modify testCase for UITextFieldTest
2015-07-21 12:53:26 +08:00
pandamicro
85d4ce0d5a
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
2015-07-21 11:39:24 +08:00
pandamicro
641ff2abf4
Merge pull request #12914 from WenhaiLin/v3.8-label-bmfont-opacity
...
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 18:02:49 +08:00
ZhangMenghe
14c1862f7e
Modify testCase for UITextFieldTest
2015-07-20 18:01:41 +08:00
WenhaiLin
63326c2826
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 11:10:17 +08:00
yangxiao
beda48124c
merge cocos
2015-07-17 17:54:00 +08:00
yangxiao
ef49e5a169
merge cocos
2015-07-17 17:43:32 +08:00
子龙山人
22ef262295
Merge pull request #12894 from zilongshanren/fixXcode5Warning
...
fix xcode 5.1.1 warnings
2015-07-17 17:33:13 +08:00
子龙山人
309b563c5b
Merge pull request #12896 from yangws/v3
...
[ci skip] Fix bug: the Back button in Node: UI->UIEditBoxTests click area has p…
2015-07-17 15:57:19 +08:00
Vincent Yang
f9e90f31f6
Fix bug: the Back button in Node: UI->UIEditBoxTests click area has positoin offset.
2015-07-17 15:52:58 +08:00
andyque
8c31d70211
fix xcode 5.1.1 warnings
2015-07-17 15:20:49 +08:00
jianglong0156
7f0167785d
add back label
2015-07-17 13:46:00 +08:00
jianglong0156
c844a77786
add fileUtils writeString,writeValueMap,writeValueVector
2015-07-17 12:04:47 +08:00
fusijie
d828c030cb
remove CCClippingRectangleNode transform error support.
2015-07-17 11:56:23 +08:00
子龙山人
89e5307f0c
Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
...
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
yangxiao
bf20145e35
animate3d callback and test
2015-07-17 11:08:27 +08:00
WenhaiLin
a6f8031af9
Label:support font that contains GB2312 char map.[except android]
2015-07-16 17:10:05 +08:00
andyque
96f6c44281
fix auto scrolling and curPageIdx issue
2015-07-16 16:50:47 +08:00
WenhaiLin
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
子龙山人
40f4e0b27b
Merge pull request #12864 from zilongshanren/add-jumpToPage-api
...
add setCurPageIndex API to PageView.
2015-07-16 13:56:05 +08:00
andyque
517221a0df
add jumpToPage API to PageView.
...
1. This commit also fix the default font size issue in ui::Button.
2015-07-16 11:33:57 +08:00
WenhaiLin
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
songchengjiang
282dc23bb2
modify interfaces of Animate3DCallback
2015-07-15 17:34:14 +08:00
pandamicro
bcd20b1bf0
Merge pull request #12861 from pandamicro/v3
...
Sync Cocos2d-x v3.7 RC1
2015-07-15 17:16:44 +08:00
pandamicro
99e504e668
Merge pull request #12854 from yangws/issue_11310
...
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 15:00:29 +08:00
pandamicro
436564f922
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
docs/RELEASE_NOTES.md
web
2015-07-15 14:39:40 +08:00
andyque
2f31f6baa6
fixed Scale9Sprite gray state issue.
...
When call `setCapInsets`, the Scale9Sprite's inner sprite will be
rebuild and it's state will be lose.
This commit reset the shader state.
2015-07-15 14:35:13 +08:00
Vincent Yang
7a105ce1e1
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 12:09:08 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
songchengjiang
6c83e8d81c
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
2015-07-15 11:13:27 +08:00
pandamicro
efffea5b91
Fixed #12834 Invoke cleanup function when override in JS
2015-07-14 15:35:29 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
andyque
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
Vincent Yang
0589c14302
Restructure CCFileUtils class, move platform related functions to CCFileUtilsXXX.
...
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-14 09:44:36 +08:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
Vincent Yang
74227eaf16
Add TestIsDirectoryExist and TestUnicodePath in cpp-tests FileUtil test.
2015-07-13 22:44:40 +08:00
子龙山人
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
子龙山人
c151ba89e5
Merge pull request #12774 from WenhaiLin/v3-label-createfail
...
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
子龙山人
db71e073dd
Merge pull request #12742 from WenhaiLin/v3-audioengine-preload
...
AudioEngine:support preload for audio
2015-07-13 17:06:17 +08:00
Vincent Yang
e65b01bdc0
Merge pr11866: FileUtilsWin32 correct use all unicode version winapi.
2015-07-13 17:06:01 +08:00
WenhaiLin
adfa6d4f0d
Add test case for issue 12775
2015-07-13 15:38:33 +08:00
ZhangMenghe
aca7914d86
Modify testcase for page Turndown
2015-07-13 13:44:58 +08:00
ZhangMenghe
3396da508f
pageTurnDown in WebGL testCase
2015-07-13 12:45:07 +08:00
songchengjiang
5a16748273
optimize Animate3DCallback
...
add Animate3DCallbackTest
2015-07-13 11:43:13 +08:00
WenhaiLin
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
pandamicro
c167e249cd
Merge pull request #12790 from pandamicro/shaderNormal
...
Use shader with normal while creating mesh with normals
2015-07-12 21:47:05 +08:00
pandamicro
600568fdba
Migrate test case from #10692 @babcca
2015-07-12 11:33:22 +08:00
WenhaiLin
5c9e8848bf
[ci skip]Add missing configuration for Nibiru.
2015-07-10 21:16:21 +08:00
WenhaiLin
205e77a4fb
Add missing configuration for Nibiru.
2015-07-10 21:09:15 +08:00
WenhaiLin
7f3e0b2a8c
[ci skip]Replace tab with spaces.
2015-07-10 20:56:21 +08:00
WenhaiLin
c68469a611
Update Nibiru SDK.
2015-07-10 20:42:05 +08:00
Liam
4a53afc798
update for error resource,just for build
2015-07-10 17:24:35 +08:00
songchengjiang
21a8a8d567
fix mirrored Effect3DOutline
2015-07-10 16:30:45 +08:00
pandamicro
c30ce38cb5
Merge pull request #12766 from super626/v3.7-release
...
Set default 3d animation quality to low
2015-07-10 15:35:22 +08:00
pandamicro
2d27091398
Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge
...
add write api in FileUtils
2015-07-10 15:13:21 +08:00
songchengjiang
a1956e2210
fix issue#9310 issue#10151 issue#12551
2015-07-09 18:05:47 +08:00
yangxiao
10fe728eee
animation quality default to low, do not interpolation
2015-07-09 17:54:21 +08:00
Liam
e50fc4f184
merge code
2015-07-09 17:12:48 +08:00
WenhaiLin
41bc3a1900
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
...
Conflicts:
AUTHORS
2015-07-09 11:11:34 +08:00
Liam
c6ebaa19ec
add scene 3d test
2015-07-09 10:19:07 +08:00
Jacky
02597eb369
Completed test case and comment.
2015-07-08 22:34:33 +08:00
Jacky
34d1cc0b1d
refactory Effects test case.
2015-07-08 21:56:14 +08:00
Jacky
4a9e9f3744
completed api.
2015-07-08 17:26:29 +08:00
子龙山人
155ac8c07e
Merge pull request #11583 from hannon235/v3-update-sio
...
Updates socket.io network extension to correctly detect and manage connection to socket.io server versions 0.9.x - 1.x
2015-07-08 16:11:05 +08:00
Jacky
260ce177d7
refine GridNode with rect.
2015-07-08 15:57:27 +08:00
WenhaiLin
b395ef06d8
AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1]
2015-07-08 10:48:20 +08:00
XiaoFeng
8429cc1d90
Update CCDrawNode bug test
2015-07-08 09:35:29 +08:00
XiaoFeng
707b4d8b90
Fix windows universal project file
2015-07-07 19:44:18 +08:00
WenhaiLin
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
jianglong0156
abee4a376a
add write api in FileUtils
...
bool writeStringToFile(std::string dataStr, const std::string& fullPath);
bool writeDataToFile(Data retData, const std::string& fullPath);
bool writeValueMapToFile(ValueMap& dict, const std::string& fullPath);
bool writeValueVectorToFile(ValueVector vecData, const std::string& fullPath);
and
formate the FileUtils code
2015-07-07 14:06:59 +08:00
子龙山人
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
肖峰
37674c3689
Add bug test to Mac & iOS cpp-test project
2015-07-07 11:17:08 +08:00
XiaoFeng
a9dfd8012c
Add new bug test to Android, Win 10, Win Universal, Linux project file
2015-07-07 11:02:00 +08:00
XiaoFeng
9a6ffd8904
Add bug test for PageView layout & CCNodeDraw::onDrawGLLine
2015-07-07 09:54:42 +08:00
jianglong0156
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
Neo Kim
3ab4285960
Refactor code
2015-07-04 16:06:05 +09:00
Neo Kim
ceeca575f3
Replace 'margin' of scroll bar with 'positionFromCorner'
2015-07-04 14:05:47 +09:00
Neo Kim
60c32f6fb5
Refactor some codes
2015-07-04 09:56:53 +09:00
Neo Kim
c093bb18e2
Add scroll bar manipulation methods into ScrollView
2015-07-04 09:56:52 +09:00
Neo Kim
2cae17b462
Add scroll bar feature into ScrollView
2015-07-04 09:56:52 +09:00
pandamicro
99bad19cff
Merge pull request #12660 from pandamicro/merge-v3.7
...
Merge v3.7-release
2015-07-03 11:08:50 +08:00
pandamicro
48c99d2ac4
Merge pull request #12635 from yangws/v3_scene3dtest
...
Fix bug: spine animition can't show in Scene3DTest.
2015-07-03 11:04:23 +08:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
子龙山人
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
pandamicro
d155d42c0e
Merge pull request #12617 from yangws/issue_8194
...
Fixbug :EventDispatcher wrong dispatch order
2015-07-02 14:42:30 +08:00
Neo Kim
6550a9ccc2
Replace all tabs to 4 spaces to comply with the convention
2015-07-02 11:30:14 +09:00
Neo Kim
4b2bff4674
Change RadioButtonGroup not to be a node-parent of radio buttons but just a grouping node. And add one more test case.
2015-07-02 11:28:14 +09:00
Vincent Yang
7794bc9d46
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
2015-07-02 10:27:55 +08:00
Vincent Yang
46d25a45a0
Merge branch 'v3_scene3d_fixspineani' into v3_scene3dtest
2015-07-02 10:27:25 +08:00
Neo Kim
a3cbd13402
Update the resource sub module reference
2015-07-01 18:44:59 +09:00
Vincent Yang
dc6e966501
[ci skip] remove a unnecessary CCLOG info.
2015-07-01 14:55:31 +08:00
yangxiao
d35bf2305f
add clipping test
2015-07-01 14:48:37 +08:00
Vincent Yang
276ed46c01
Fixbug : issue 8194.
2015-07-01 14:39:35 +08:00
Neo Kim
00e360f438
Add the missing file into CMake and Windows project configurations.
2015-07-01 15:36:53 +09:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
jianglong0156
9e9625feca
add bool parm in android
2015-07-01 10:57:43 +08:00
jianglong0156
2ef2016c39
add call reflection with bool test case
2015-07-01 10:41:24 +08:00
Neo Kim
3f05ad2b98
Replace all tabs to 4 spaces to comply with the convention
2015-06-30 20:31:31 +09:00
Neo Kim
f5e7184f0b
Add new cpp files into Android.mk
2015-06-30 18:50:13 +09:00
Neo Kim
bed90606d3
Add RadioButton feature and a test case for it.
2015-06-30 18:50:13 +09:00
yangxiao
538daf5bce
add empty line
2015-06-30 14:19:58 +08:00
yangxiao
2ed5ee123e
improve collider
2015-06-30 14:16:05 +08:00
Vincent Yang
1105111fab
Merge v3 branch.
2015-06-30 11:59:56 +08:00
子龙山人
29cccf631e
Merge pull request #12550 from kompjoefriek/v3-vibrate
...
Vibrate support in v3
2015-06-30 10:28:59 +08:00
子龙山人
265c9b55e0
Merge pull request #12586 from fusijie/add-autoculling-bug-testcase
...
add auto culling test case.
2015-06-30 09:33:36 +08:00
Jacky
0be9763a9c
add auto culling test case.
2015-06-29 17:25:13 +08:00
pandamicro
08bdf84183
Merge pull request #12584 from jianglong0156/tilemapTestCaseConflict
...
resolve the conflict that the 3d testcase show error after click the the titlemap testcase
2015-06-29 17:07:13 +08:00
子龙山人
c997284825
Merge pull request #12352 from andyque/add-two-events-to-ui-slider
...
Improve ui::Slider
2015-06-29 17:01:27 +08:00
jianglong0156
fd54b9941d
resolve the titlemap testcase conflict with the 3d testcase.
2015-06-29 16:34:54 +08:00
andyque
cc1e126a84
Merge branch 'v3.7-release' into v3
2015-06-29 10:35:23 +08:00
songchengjiang
7befab0f7b
add Physics3DCollider
2015-06-29 10:26:09 +08:00
pandamicro
b9a6e8c051
Merge pull request #12579 from jianglong0156/videoplayer
...
[ci skip]improve Videoplayer test
2015-06-29 10:19:08 +08:00
jianglong0156
b9cccc8a4d
Merge branch 'v3.7-release' into videoplayer
2015-06-29 10:07:19 +08:00
pandamicro
f1528b728c
Merge pull request #12565 from WenhaiLin/v3-37-tests-runFix
...
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
2015-06-26 18:43:14 +08:00
WenhaiLin
24eca337ca
[ci-skip][lua-tests/lua-empty-test]Fixed can't run successfully by console on WIN32.
2015-06-26 17:12:39 +08:00
pandamicro
88aeaa36f4
Merge pull request #12534 from super626/skybox
...
Skybox improvement
2015-06-26 17:05:17 +08:00
pandamicro
d29c5643bc
Merge pull request #12559 from WenhaiLin/v3-37-crashfix
...
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` again after a auto-tested.
2015-06-26 12:51:07 +08:00
Wenhai Lin
94c0c0c3fc
[Cpp-tests-->SpriteOffsetAnchorRotation]Fixed crash when enter `SpriteOffsetAnchorRotation` test case again after a auto-tested.
2015-06-26 12:02:15 +08:00
jianglong0156
ef51fc46ed
add videoplayer state, modify play label
2015-06-26 10:44:43 +08:00
pandamicro
ddb982246f
Merge pull request #12553 from VisualSJ/v3-aa
...
Encoded into AVC
2015-06-26 10:15:02 +08:00
pandamicro
d2764918b9
Merge pull request #12545 from WenhaiLin/v3-37-removeUInclude
...
Remove unneeded include files and fixed warns.
2015-06-26 09:31:51 +08:00
kompjoefriek
6eca03fdd2
Merged changes from "Vibrate support in v4" into v3 branch.
2015-06-26 01:02:44 +02:00
WenhaiLin
1494f09f06
Remove unneeded include files and fixed warns.
2015-06-25 23:15:39 +08:00
pandamicro
1ab369a70b
Merge pull request #12542 from andyque/fix-v3.7-stuio-percent-mode
...
Fix v3.7 cocosStudio percent position bug
2015-06-25 21:37:12 +08:00
pandamicro
a81d7aa8b4
Merge pull request #12541 from VisualSJ/v3-aa
...
[ci skip] Encoded into AVC
2015-06-25 20:32:53 +08:00
andyque
516d45db62
update submodule
2015-06-25 20:16:43 +08:00
VisualSJ
110e51d0bc
Encoded into AVC
2015-06-25 19:01:55 +08:00
andyque
8f7b439dfe
add cocostudio 1.6 tests
2015-06-25 18:06:45 +08:00
samuele3hu
7feaa18d82
Fix the compile error for cpp-tests based on android studio
2015-06-25 16:08:48 +08:00
samuele3hu
ad4f5b8ec0
Fix the some lua tests case bug
2015-06-25 15:13:01 +08:00
yangxiao
63f948c822
modify skybox to projection space
2015-06-25 15:01:39 +08:00
pandamicro
117a72fa07
Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix
...
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
2015-06-24 23:07:38 +08:00
pandamicro
f9db471026
Merge pull request #12495 from super626/v3
...
Fix terrain getIntersectionPoint
2015-06-24 18:36:52 +08:00
WenhaiLin
a7632a962f
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
2015-06-24 18:24:16 +08:00
pandamicro
6638a53d69
Merge pull request #12509 from xiaofeng11/v3_xiaofeng
...
Add a text label to Node3DReader Test, notice user there has no content to show
2015-06-24 17:10:08 +08:00
Bin Zhang
c9c212d0e1
Solve the error when run tests projects with `cocos run`.
2015-06-24 15:33:13 +08:00
XiaoFeng
0846dadbc3
Add a text label to Node3DReader Test, notice user there has no content to show
2015-06-24 14:58:14 +08:00
pandamicro
fb852046e1
Merge pull request #12508 from jianglong0156/AccelerometerCrash
...
reduce the accelerometer log num, avoid log too much in vs
2015-06-24 13:45:53 +08:00
jianglong0156
9b31e8ed16
reduce the accelerometer log num, avoid log too much in vs
2015-06-24 12:03:16 +08:00
pandamicro
7ddb6308e9
Merge pull request #12503 from jianglong0156/hidepluginx
...
hide facebook testcase
2015-06-23 22:19:10 +08:00
江龙
f3eb455669
hide facebook testcase
2015-06-23 22:14:27 +08:00
samuele3hu
5c5f3dcc79
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
2015-06-23 20:03:14 +08:00
samuele3hu
e2aa669b8d
Fix the LayerTest error about Lua
2015-06-23 20:02:26 +08:00
pandamicro
32accbf21b
Merge pull request #12488 from WenhaiLin/v3-37-androidApplicationFix
...
Fixed Application may be created more than once on Android.
2015-06-23 19:43:39 +08:00
pandamicro
0b26f966b5
Merge pull request #12497 from VisualSJ/v3-aa
...
[ci skip]add info into BlendFunc tests on canvas and tests data problem
2015-06-23 19:43:08 +08:00
VisualSJ
5472928aaa
add info into BlendFunc tests on canvas and tests data problem
2015-06-23 18:54:18 +08:00
yangxiao
c3593c9d64
merge cocos
2015-06-23 18:29:39 +08:00
yangxiao
251c81d7be
Merge branch 'newcode' into v3
2015-06-23 18:25:41 +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
ce508bab87
Merge pull request #12487 from pandamicro/v3
...
Fix TransitionTest issue that depth test haven't been disabled after transition
2015-06-23 16:59:08 +08:00
WenhaiLin
cbb073e905
Fixed Application may be created more than once on Android.
2015-06-23 16:58:38 +08:00
pandamicro
cd1233f801
Fix TransitionTest issue that depth test haven't been disabled after transition
2015-06-23 16:58:15 +08:00
Vincent Yang
27d011dd50
Fixbug: LabelTestNew New Label + CharMap's effect is wrong.
2015-06-23 16:02:38 +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
andyque
70b709f4a8
fix rapidjson assert error
2015-06-23 13:54:11 +08:00
pandamicro
4823cc3bc2
Merge pull request #12476 from super626/fps
...
show fps in scene3d demo
2015-06-23 13:42:26 +08:00
子龙山人
d8a2695620
Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix
...
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
2015-06-23 13:36:36 +08:00
pandamicro
b08325dd5b
Merge pull request #12475 from samuele3hu/v3_7_test
...
[ci skip]Fix the some test cases error about Lua
2015-06-23 13:15:21 +08:00
yangxiao
a433d57807
show fps
2015-06-23 11:56:50 +08:00
WenhaiLin
a68874d3cb
Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
2015-06-23 11:00:23 +08:00
andyque
931011809d
fixed unintended spaces in string
2015-06-23 10:38:43 +08:00
samuele3hu
3b766e5236
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_test
2015-06-23 10:20:05 +08:00
samuele3hu
683c5b4cb2
Fix the LabeLTestNew error.
2015-06-22 22:32:21 +08:00
pandamicro
0f5c343e1e
Merge pull request #12460 from MSOpenTech/v3-winrt-readme
...
Added Windows 10.0 UWP info to Readme
2015-06-22 13:05:51 +08:00
pandamicro
b1e24ee8f2
Merge pull request #12455 from natural-law/v3
...
Solve the error when build tests projects with cocos command on win32.
2015-06-22 13:04:17 +08:00
samuele3hu
bc964c96da
Fix the error about the Camera3D Test
2015-06-22 09:28:18 +08:00
samuele3hu
0181a84883
Fix the bugs about the particle3DTest
2015-06-22 09:27:34 +08:00
WenhaiLin
6bd46fcfcc
[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.
2015-06-20 17:07:11 +08:00
Dale Stammen
d438bd6f49
added app name to 150x150 windows tile
2015-06-19 09:23:50 -07:00
Bin Zhang
85fe9e8816
Solve the error when build tests projects with cocos command on win32.
2015-06-19 18:32:32 +08:00
子龙山人
8ca0f18575
Merge pull request #12446 from pandamicro/v3
...
Add auto bindings for navmesh
2015-06-19 17:21:00 +08:00
子龙山人
776dd1dd09
Merge pull request #12449 from WenhaiLin/v3-37-resoucesfix
...
[ci skip]Fixed resources.
2015-06-19 16:30:05 +08:00
WenhaiLin
45de0b650a
[ci skip]Fixed resources.
2015-06-19 16:26:03 +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
WenhaiLin
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
pandamicro
ca989e2aed
Fix physics3d js test issue
2015-06-19 10:35:45 +08:00
pandamicro
c6d4f283bb
Fix compilation issue in navmesh conversion
2015-06-19 08:11:45 +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
pandamicro
b757837239
Move NavMesh to jsb namespace
2015-06-18 22:57:41 +08: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
VisualSJ
3da67d3358
change the seek to time
2015-06-18 22:00:55 +08:00
samuele3hu
a98b493151
Update UIS9NinePatchTest for jsb
2015-06-18 22:00:55 +08:00
samuele3hu
cbfa92d3fd
Add a new line.
2015-06-18 22:00:55 +08:00
samuele3hu
496ce50ff5
issue #12414:Add UIS9NinePatchTest for js
2015-06-18 22:00:55 +08:00
samuele3hu
77c3e9bdde
issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 22:00:54 +08:00
VisualSJ
0a526875a8
Fixed a bug that xhr cross-domain error
2015-06-18 22:00:54 +08:00
VisualSJ
82c09e8d0c
Fixed a bug that xhr cross-domain error
2015-06-18 22:00:54 +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
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
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
pandamicro
aa566a3722
Merge pull request #12424 from pandamicro/physics3d
...
Fix Physics3D test and js bindings
2015-06-18 16:09:49 +08:00
jianglong0156
85c40b6580
Merge pull request #8 from pandamicro/physics3d
...
Physics3d
2015-06-18 14:54:32 +08:00
pandamicro
811173ea3b
Fix Physics3D test and js bindings
2015-06-18 14:33:16 +08:00
pandamicro
9dc52ba72f
Merge pull request #12403 from VisualSJ/v3-aa
...
[ci skip]Fixed some bug
2015-06-18 12:31:27 +08:00
pandamicro
000be8316b
Merge pull request #12415 from samuele3hu/v3_7_ui
...
[ci skip]issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 12:30:28 +08: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
VisualSJ
44c37c676e
change the seek to time
2015-06-18 11:54:25 +08:00
Vincent Yang
27bf636eab
Fix bug: spine animition can't show in Scene3DTest.
2015-06-18 11:45:17 +08:00
samuele3hu
6c749a77f2
Fix the bugs about the Physics3DTest for Lua.
2015-06-18 11:17:08 +08:00
tangziwen
4187ea2241
fix Scene3D test
2015-06-18 10:17:46 +08:00
samuele3hu
7f21731bb1
Update UIS9NinePatchTest for jsb
2015-06-18 10:08:13 +08:00
Vincent Yang
0e0c8cf72e
Modify Scene3DTest to composite 2D/3D scene by moving UI and camera far away.
2015-06-18 09:54:48 +08:00
samuele3hu
31ce264c6a
Add a new line.
2015-06-18 09:44:47 +08:00
samuele3hu
8c01d94945
issue #12414:Add UIS9NinePatchTest for js
2015-06-18 09:43:05 +08:00
samuele3hu
31aae38fac
issue #12414:Add UIS9NinePatchTest for Lua and js
2015-06-18 09:41:16 +08:00
VisualSJ
400b2d7663
Fixed a bug that xhr cross-domain error
2015-06-18 09:23:15 +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
pandamicro
3975d44d3b
Chain NavMeshTest
2015-06-18 00:58:03 +08:00
pandamicro
bcf9659408
Merge branch 'v3' into navmesh
2015-06-18 00:36:37 +08:00
pandamicro
5b23e8b381
Fix resource issue
2015-06-18 00:24:01 +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
VisualSJ
010cb23ead
Fixed a bug that xhr cross-domain error
2015-06-17 17:10:31 +08:00
pandamicro
4fa1cdc302
Update submodules
2015-06-17 15:43:35 +08:00
pandamicro
ddc820eb42
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-06-17 15:33:34 +08:00
子龙山人
fd508a0198
Merge pull request #12381 from VisualSJ/v3-aa
...
[ci skip]Fix some simple bug
2015-06-17 15:11:08 +08:00
VisualSJ
0a223adf7c
After exiting should restore settings
2015-06-17 14:43:41 +08:00
子龙山人
dc33a8d66e
Merge pull request #12243 from Wu-Hao/fix_spritepolygon2
...
Fix spritepolygon
2015-06-17 14:40:30 +08:00
VisualSJ
fba76b11cd
Fixed path bug
2015-06-17 14:07:07 +08:00
pandamicro
3a076b6508
Merge pull request #12387 from samuele3hu/v3_navigation
...
[ci skip]Update the Physics3DTest for js and Lua by synchronizing the API.
2015-06-17 14:01:21 +08:00
samuele3hu
9c550e0a11
Update the Physics3DTest for js and Lua by synchronizing the API.
2015-06-17 13:58:05 +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
VisualSJ
6669f1df5e
Fixed widgetFromJsonFile bug( #20035 )
2015-06-17 11:49:27 +08: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
VisualSJ
d855066472
Fixed a bug that control's default resource error #20037
2015-06-17 11:19:06 +08:00
VisualSJ
164fb3a058
If json have the back button, then use this button
2015-06-17 11:16:44 +08:00
samuele3hu
2da760b655
Update the NavMesh test case
2015-06-17 09:49:31 +08:00
VisualSJ
ab34c1de89
Change the path(UIVideoPlayerTest.js)
2015-06-16 17:30:48 +08:00
pandamicro
d51fd2397c
Fix js test ES6 usage issue
2015-06-16 15:01:52 +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
Dale Stammen
74f4d29fa9
added missing librecast
2015-06-15 20:06:54 -07:00
Dale Stammen
8d8e7d6cb9
Merge branch 'v3' into v3-winrt-librecast
2015-06-15 19:27:40 -07:00
Dale Stammen
0781978788
added librecast. Updated build properties
2015-06-15 18:44:14 -07:00
andyque
b8826d9de4
improve the enum naming
2015-06-16 09:42:06 +08:00
Dale Stammen
e14fdedf67
added missing NavMeshTest files
2015-06-15 18:19:51 -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
pandamicro
ccd15b3da7
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
2015-06-16 00:56:58 +08:00
pandamicro
4f8bd25a83
Add js test cases for sprite polygon
2015-06-16 00:56:08 +08:00
andyque
c1108db31e
Improve ui::Slider
...
1. Add two APIs to gain big precision
2. Add three type events in Slider's callback.
2015-06-15 18:31:21 +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
pandamicro
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
pandamicro
cd7f39d823
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon
2015-06-15 13:22:38 +08:00
pandamicro
34954c2600
Add PolygonSprite Test1
2015-06-15 13:21:49 +08:00
yangxiao
97ef7974bb
create agent in the onEnter
2015-06-15 11:57:05 +08:00
pandamicro
852b9b42b9
Remove jsb_cocos2dx_experimental_manual
2015-06-15 10:46:57 +08:00
jianglong0156
5ff0825468
modify android res copy
2015-06-15 09:55:10 +08:00
jianglong0156
393ad49481
add win32 project resource copy
2015-06-15 09:55:05 +08:00
jianglong0156
6310f74533
modify resource to res/resjs
2015-06-15 09:54:00 +08:00
jianglong0156
f9df298401
modify copy resource to res/resjs
2015-06-15 09:53:53 +08: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
d9b0b2ca38
more fixes
2015-06-12 15:28:29 -07: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
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
pandamicro
f3765a4c5f
Fix physics 3d macro include issue
2015-06-12 15:58:43 +08:00
pandamicro
e9d648f151
Fix physics 3d macro include issue
2015-06-12 15:41:46 +08:00
WenhaiLin
4d97d5075b
Add test case for issue12310.
2015-06-12 15:39:57 +08:00
pandamicro
c3aba0392d
Update auto conversion for sprite polygon
2015-06-12 13:00:49 +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
pandamicro
1a9056cf14
Merge pull request #12300 from jianglong0156/textFieldShowString
...
[ci skip]add textfield show textString
2015-06-11 19:33:21 +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
pandamicro
902f1696e8
Merge pull request #12290 from jianglong0156/issue#2928texture2d
...
[ci skip]add pr#2928 test case, load same remote img. can callback the function
2015-06-11 16:51:59 +08:00
子龙山人
43555272d5
Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
...
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
2015-06-11 16:34:45 +08:00
yangxiao
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
WenhaiLin
aff2f8c2c4
Fixed compile error.
2015-06-11 14:42:03 +08:00
samuele3hu
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
jianglong0156
f97955682a
add pr#2928 test case, load same remote img. can callback the function
2015-06-11 11:11:51 +08:00
jianglong0156
96ce3ec22c
add textfield show textString
2015-06-10 16:15:09 +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
Huabing.Xu
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
Huabing.Xu
97b387560b
revert some accidental changes
2015-06-09 14:06:11 +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
WuHao
a67e570ef7
deleted more leftover comments, placed polygon test further down the tests
2015-06-08 15:40:18 +08:00
WuHao
2650de030c
modified tests to show current epsilon
2015-06-08 15:08:16 +08:00
WuHao
0808b6aff9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
WenhaiLin
784f142f91
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
2015-06-08 11:06:02 +08:00
Jacky
3e62dd0473
remove unused file and code.
2015-06-06 13:31:25 +08:00
Dale Stammen
d4c9a81908
Merge branch 'v3' into v3-winrt-ogg
2015-06-05 16:03:54 -07:00
Ricardo Quesada
453a3d93bc
samplers are treated as uniforms
2015-06-05 14:55:33 -07:00
Dale Stammen
f1a067ee75
removed e option from xcopy of cpp template files
2015-06-05 09:21:52 -07:00
Dale Stammen
bc1ea87adf
updated app guid and disables auto version increment for App Cert tests
2015-06-05 06:21:03 -07:00
Dale Stammen
47b5085ade
Merge branch 'v3' into v3-winrt-ogg
2015-06-05 05:36:15 -07:00
andyque
56b7037c5f
optimize uislider memory usage
2015-06-05 17:16:10 +08:00
pandamicro
399ecfcb9f
Merge pull request #12176 from super626/fixphysics3d
...
rename syncToNode and syncToPhysics
2015-06-05 16:02:45 +08:00
andyque
6390f063fe
optimize UILoadingBar memory usage
2015-06-05 15:57:39 +08:00
yangxiao
d50c1823d4
merge cocos
2015-06-05 14:25:37 +08:00
andyque
a7141bab38
improve imageView memory usage
2015-06-05 14:19:05 +08:00
pandamicro
fa71a6e352
Merge pull request #12204 from jianglong0156/issue1756
...
default support curl gzip. and add the gzip test in xmlhttprequest Issue1756
2015-06-05 13:17:53 +08:00
jianglong0156
33beab2d81
add gzip test
2015-06-05 11:40:29 +08:00
andyque
91ddb802e1
optimize ui::CheckBox memory consumption
2015-06-05 10:32:22 +08:00
Dale Stammen
3f3ace05a7
added ogg support for Windows 10 UWP
2015-06-04 14:42:11 -07:00
pandamicro
2da754dcf2
Merge pull request #12157 from chengstory/v2_addOnEnterAndOnExitToCCNode
...
Add onEnter and onExit of components to CCNode's onEnter and onExit function
2015-06-04 18:39:52 +08:00
pandamicro
ba1191f98f
Merge pull request #12132 from pandamicro/v3_origin
...
cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread
2015-06-04 17:51:11 +08:00
WuHao
5b572ab803
Polyinfo is no longer a pointer
2015-06-04 16:20:00 +08:00
WuHao
0a51c9bd27
Finished AutoPolygon and Sprite
2015-06-04 15:43:31 +08:00
zhangcheng
8d3d3a0348
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
2015-06-04 14:06:31 +08:00
yangxiao
8b5333a5c9
Merge branch 'newcode' into navigation2
2015-06-04 12:44:39 +08:00
yangxiao
73d815b0ab
rename syncToNode and syncToPhysics
2015-06-04 12:04:41 +08:00
Huabing.Xu
ad1f7c472c
add render buffer render target for color attachment
2015-06-04 11:18:35 +08:00
samuele3hu
3bae5620d6
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
2015-06-04 09:40:54 +08:00
子龙山人
95934bf310
Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix
...
V3: Fixes for Windows 8.1 Universal App JavaScript
2015-06-04 09:22:21 +08:00
Ricardo Quesada
6a19661a80
Merge pull request #12150 from ricardoquesada/material_custom_uniforms
...
Material custom uniforms
2015-06-03 13:08:04 -07:00
Dale Stammen
808de7b475
removed e option from xcopy
2015-06-03 09:54:43 -07:00
Dale Stammen
21de1825ac
removed e option from xcopy
2015-06-03 09:47:55 -07:00
Dale Stammen
18ce48dc2a
/NODEFAULTLIB:MSVCRT to fix linker warning
2015-06-03 09:26:15 -07:00
samuele3hu
0cccd6e765
Fix compile error on the Linux and update the test cases
2015-06-03 18:12:21 +08:00
zhukaixy
76ad42bb0b
configure recast project for win8.1 project
2015-06-03 14:31:12 +08:00
Ricardo Quesada
ff81078062
fixes bug when calculating the dynamic values
2015-06-02 17:48:50 -07:00
Chris Hannon
6bcf325630
[v3-update-sio] updates usage of log function to CCLOG macros, ensures correct data type is passed to log function
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:34 -04:00
Chris Hannon
fb10217e2b
[v3-update-sio] updates SocketIO tests and examples for using the SocketIO extension
...
Signed-off-by: Chris Hannon <himynameschris@gmail.com>
2015-06-02 20:17:33 -04:00
Ricardo Quesada
5f6f38616a
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
2015-06-02 17:05:05 -07:00
Ricardo Quesada
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
samuele3hu
a20681aa21
Add Lua-bindings for NavMesh
2015-06-02 18:37:57 +08:00
pandamicro
613e0f73b7
Merge pull request #12095 from jianglong0156/videoplayer
...
add videoplayer jsb
2015-06-02 17:35:56 +08:00
jianglong0156
6eddf97416
fix the platform judge error
2015-06-02 17:29:36 +08:00
jianglong0156
0c821379f8
modify video mp4 formate
2015-06-02 17:07:11 +08:00
jianglong0156
4abaa51e12
webview and videoplayer only play in android, ios and web
2015-06-02 15:06:44 +08:00
yangxiao
3d4606921b
merge cocos
2015-06-02 14:27:31 +08:00
jianglong0156
c46fea1f7a
Merge branch 'v3' into videoplayer
2015-06-02 11:26:48 +08:00
jianglong0156
97d0265e32
gzip test
2015-06-02 10:23:30 +08:00
pandamicro
4c6f67fd7e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
tools/bindings-generator
web
2015-06-02 10:12:22 +08:00
WuHao
3c5326ba1f
removed spritePolygon, merge into sprite and draft of AutoPolygon
2015-06-02 10:10:09 +08:00
pandamicro
fdec552ed7
Fix cocos2d/cocos2d-js#1658 : Fix js_load_remote_image issue with multithread and improve Downloader
2015-06-02 10:08:13 +08:00
samuele3hu
be870bd42a
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
2015-06-01 11:26:08 +08:00
yangxiao
a0adf507c0
getTriangleList instead of load obj
2015-06-01 10:56:17 +08:00
Dale Stammen
494a7079d3
fixed test for Windows 10 CC_PLATFORM_WINRT
2015-05-29 09:35:53 -07:00
Dale Stammen
a16d51cad9
keyboard events now available in Windows Universal Apps
2015-05-29 08:15:04 -07:00
Dale Stammen
e0c65c203a
Merge branch 'v3' into v3-uwp
2015-05-29 08:09:05 -07:00
samuele3hu
c3ea65e66b
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into v3_navigation
2015-05-29 18:25:15 +08:00
WuHao
3d62805d04
Merge branch 'v3' into fix_spritepolygon
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +08:00
yangxiao
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
Huabing.Xu
b5e76c7521
Merge branch 'v3_origin' into v3FrameBufferObject
2015-05-29 15:59:38 +08:00
Jacky
8df4920f6e
fixed file name.
2015-05-29 15:03:36 +08:00
子龙山人
b39006432f
Merge pull request #12091 from joshuastray/properties
...
[ci skip]fix material test
2015-05-29 14:22:36 +08:00
Jialong Zhai
9cf5c1b636
fix material test
2015-05-29 13:54:29 +08:00
子龙山人
a968bc2d15
Merge pull request #12062 from jianglong0156/jsWebviewTest
...
Js webview test
2015-05-29 11:35:30 +08:00
jianglong0156
8b52563a8a
add videoplayer config ini and fix the url bug
2015-05-29 11:10:39 +08:00
Huabing.Xu
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
Huabing.Xu
df09bef567
use a different size to create fbo
2015-05-29 10:00:48 +08:00
Dale Stammen
2f943aa7b1
updated properties
2015-05-28 15:30:17 -07:00
Dale Stammen
d702012972
don't auto update version number for each windows app certification test
2015-05-28 15:04:09 -07:00
Dale Stammen
2a71407501
fixed double to float conversion compiler warning
2015-05-28 15:00:49 -07:00
Dale Stammen
dadbbc18d6
added Windows 10 UWP project files
2015-05-28 13:51:25 -07:00
Dale Stammen
736de4e37c
fixed compiler warning for double to float conversion
2015-05-28 13:32:40 -07:00
Dale Stammen
7623ee390b
disable CURL and AssetsManager for Windows 10 UWP
2015-05-28 13:32:08 -07:00
jianglong0156
9a62d06091
add video player test and auto bindings
2015-05-28 18:10:07 +08:00
Huabing.Xu
727231a888
change test cases
2015-05-28 17:04:49 +08:00
MAUSMAUSgames
847cba026c
added _flags to Action, change API to stopActionsByFlags
2015-05-28 09:52:49 +02:00
jianglong0156
379f536330
improve test case, remove the invalid testcase
2015-05-28 14:02:07 +08:00
samuele3hu
a89e000f80
Synchronize the modification of filenames about shaders to fix the bug of MateriaSystemTest .
2015-05-28 10:46:44 +08:00
jianglong0156
c0b42fdfec
modify addEventListener to setEventListener
2015-05-28 10:12:58 +08:00
Dale Stammen
9ee4b4af1e
Merge branch 'v3' into v3-winrt-audio
2015-05-27 11:54:21 -07:00
jianglong0156
e105c47cb0
improve testcase
2015-05-27 18:23:56 +08:00
andyque
74f0b3b436
add bmfont test
2015-05-27 16:58:52 +08:00
子龙山人
62832586d0
Merge pull request #12049 from samuele3hu/v3_material
...
issue #12046 : Add Lua bindings for material systems and related test cases
2015-05-27 16:26:26 +08:00
samuele3hu
9934d73548
issue #12046 : Add Lua bindings for material systems and related test cases.
2015-05-27 15:37:59 +08:00
子龙山人
c8d8a9cfd2
Merge pull request #12022 from jianglong0156/modifyTestResource
...
Modify test resource
2015-05-27 15:05:32 +08:00
子龙山人
4cd5d479c0
Merge pull request #12028 from samuele3hu/v3_issue10302
...
issue #10302 : Remove duplicated test cases
2015-05-27 15:05:10 +08:00
子龙山人
4a1c5954a3
Merge pull request #12045 from andyque/v3
...
fix iOS 64bit implicit conversion error.
2015-05-27 15:04:41 +08:00
andyque
452248c0dd
fix iOS 64bit implicit conversion error.
2015-05-27 13:45:07 +08:00
子龙山人
fc8f556f98
Merge pull request #12027 from jianglong0156/modifyShaderSample
...
rename shader file name
2015-05-27 13:33:02 +08:00
jianglong0156
e898a680e2
Merge branch 'modifyTestResource' into jsWebviewTest
2015-05-27 11:49:23 +08:00
jianglong0156
521ce15cb6
add webview autobindings. modify webtest. adapt the web interface
2015-05-27 11:46:26 +08:00
Huabing.Xu
471547e0b0
refactor FrameBufferObject to FrameBufferObject and RenderTarget
2015-05-27 11:40:12 +08:00
jianglong0156
c3aae69fc0
modify proj.android-studio copy resource path
2015-05-27 10:08:03 +08:00
jianglong0156
9cd2b16ad0
modify js resource name
2015-05-27 09:52:44 +08:00
Vincent Yang
8105e9c714
Fix bug: terrain can't move to other position except origin point.
2015-05-26 17:51:26 +08:00
jianglong0156
7820610f13
Merge branch 'modifyTestResource' into jsWebviewTest
...
Conflicts:
cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
tests/js-tests/project.json
tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
tools/tojs/genbindings.py
2015-05-26 17:49:17 +08:00
jianglong0156
4d6b763eb6
rename shader file name
2015-05-26 17:21:35 +08:00
jianglong0156
5b7cf14384
rename shader file name
2015-05-26 17:20:48 +08:00
samuele3hu
ea75e222ba
issue #10302 : Remove duplicated test cases
2015-05-26 17:20:46 +08:00
jianglong0156
fb4d638231
copy resources in linux
2015-05-26 16:34:04 +08:00
jianglong0156
60e3b5390d
copy resources in android
2015-05-26 16:33:47 +08:00
jianglong0156
6f67ec1e6c
Merge branch '2d-xv3' into modifyTestResource
2015-05-26 16:23:25 +08:00
jianglong0156
e117d62b13
add js-test resource copy command
2015-05-26 14:47:49 +08:00
jianglong0156
fe677f32dd
delete js resource
2015-05-26 14:28:53 +08:00
jianglong0156
ae4c8d9798
fix opengl resource error
2015-05-26 14:26:45 +08:00
jianglong0156
95e8212727
add js cocosbuilder resource
2015-05-26 14:08:51 +08:00
jianglong0156
fd05998b5f
fix the bug: shader in jsb can not run correctly.
2015-05-25 17:48:34 +08:00
jianglong0156
f1145139ac
fix js resource path in code
2015-05-25 17:02:26 +08:00
Bin Zhang
c491b6a5c1
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-05-25 17:01:29 +08:00
Huabing.Xu
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
Bin Zhang
3298145eb5
Support build & run Android Studio project in console.
2015-05-25 16:53:36 +08:00
jianglong0156
6e27825dec
add web shader resource
2015-05-25 16:51:58 +08:00
jianglong0156
82c5fbbc76
add js resource for web tests
2015-05-25 16:50:27 +08:00
minggo
bcc1bf8d32
Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
...
use trianglescommand for sprite
2015-05-25 16:48:22 +08:00
samuele3hu
074216bef9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d
...
Conflicts:
templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
tests/lua-tests/src/mainMenu.lua
2015-05-24 22:46:05 +08:00
anniruddh.koppal
b2eb946c14
Added MP3 support
2015-05-23 19:13:12 -07:00
andyque
07eb116fb6
fix lua tests release mode linker issue
2015-05-23 08:48:53 +08:00
andyque
73902a4063
fix simulator vs2015 support
2015-05-22 17:47:48 +08:00
Huabing.Xu
6d9f850e2c
use trianglescommand for sprite
2015-05-22 15:54:56 +08:00
Bin Zhang
3d0c716ee9
Add script in build.gradle for sign the release apk.
2015-05-22 15:52:41 +08:00