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 |
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 |