9218329968
Merge pull request #15569 from minggo/issue-15522
...
Fix compile error isnan -> std::isnan
2016-05-05 11:36:24 +08:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
cdb148d29a
Merge pull request #15550 from pandamicro/v3.11
...
Fix assets manager issue for not updating download count variables in updateAsset
2016-05-03 19:28:25 +08:00
6d1517747f
Fix assets manager issue for not updating download count variables in updateAsset
2016-05-03 18:01:15 +08:00
3d6bddd2c7
Merge pull request #15465 from cezheng/fix/several_network_bugs
...
[BugFixes]Several serious bug fixes related to network/asset_manager
2016-05-03 17:37:32 +08:00
482788c933
Add tizen support ( #15518 )
...
* add Tizen Support
* fix linter error
* fix tizen audio engine lua bindings config
2016-04-28 09:49:55 +08:00
0f19bec99d
Fix compile error isnan -> std::isnan #15111
...
Issue: https://github.com/cocos2d/cocos2d-x/issues/15111
2016-04-27 13:15:08 +02:00
401f3a84ac
Renamed ignoreAnchorPointForPosition()
2016-04-22 21:36:02 +09:00
6459c92ee7
Merge pull request #13950 from Almax27/patch-4
...
Added CC_PROPERTY const qualifier
2016-04-21 14:56:01 +08:00
f3cd1298af
improve asset manifest diff performance
...
By reducing copies of large manifest files using const references
2016-04-20 13:17:57 +09:00
5858687161
fix AssetManagerEx bug when the last task fails
...
This fixes #15463
2016-04-20 12:53:38 +09:00
33a0f65b58
Merge pull request #14868 from takaken1994/feature/improve-perfomance-manifest
...
Improve perfomance of manifest
2016-04-19 11:47:53 +08:00
dc0f7bf903
Fixes format warnings.
2016-04-18 17:52:58 +08:00
f450405d4e
Fix AssetsManagerEx issue with failed asset
2016-04-11 11:11:00 +08:00
e6d4beef8a
Merge pull request #15388 from pandamicro/v3
...
Issue fixes and update engine version
2016-04-07 23:15:39 +08:00
15d6a6a472
Fix AssetsManagerEx issue with failed asset
2016-04-07 22:30:52 +08:00
328331df4f
Merge pull request #15179 from mogemimi/remove-const-from-return
...
Remove unnecessary const from return types in PU and Lua
2016-04-07 15:41:00 +08:00
c4d43e7a29
Merge pull request #15197 from perminovVS/v3-dev-manifest-prepend-search-paths-check
...
Update SearchPaths if real need
2016-04-07 15:15:54 +08:00
985155749b
Remove unnecessary const from return types in PU and Lua
2016-04-06 12:36:20 +09:00
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
c4658b0e50
fix: use correct call to get the B constraint in physics
...
Thanks @ivysnow
Github pull request #15138
2016-03-17 07:07:17 -07:00
ab259603b8
Update SearchPaths if real need
2016-03-07 15:32:19 +03:00
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 8bf3d339af2f4e
2016-02-29 13:53:00 -08:00
d28acbf2fe
Merge pull request #13906 from perminovVS/unzopen-use-getsuitablefopen
...
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
2016-02-19 15:36:06 +08:00
9a65b0c7a1
Merge pull request #15065 from mogemimi/add-missing-reference-types
...
Add missing reference-return types
2016-02-19 10:14:07 +08:00
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
8280f06c1f
Add missing reference-return types
2016-02-18 05:10:42 +09:00
07051a0357
Let ScrollView swallow touch events by default.
2016-02-12 21:21:57 +08:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
8be86577ff
Add stopAnimatedContentOffset() to extension::ScrollView
...
Immediately stops the animated scroll initiated by setContentOffsetInDuration()
2016-01-21 10:33:47 -07:00
8aaac876ca
Update : avoid create object each time
2016-01-10 21:58:15 +09:00
d4b556ee1e
Update : Used a reference instead of the copy
2016-01-10 21:57:36 +09:00
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
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
fb312a761c
update for 3D object render, revert old changes
2015-12-18 11:23:33 +08:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
6318634887
Merge pull request #14641 from liamcindy/v3_ui_controlButton
...
fix controlButton test error
2015-12-14 19:47:41 +08:00
4d89508377
update for controlButton size
2015-12-14 17:38:52 +08:00
a80ca25d63
Merge pull request #14576 from mogemimi/fix-deprecation-warns-particle3d
...
Fix deprecation warnings in PU
2015-12-13 11:09:47 +08:00
8df13ad6f9
Replace non-ASCII characters in comments
2015-12-12 21:04:23 +09:00
d27f50aaf2
Fix typos in documentation and comments
2015-12-12 21:04:22 +09:00
3bb9a37393
Fix deprecation warnings in PU
2015-12-12 17:50:32 +09:00
f877f26bd2
update for controlButton
2015-12-11 11:56:58 +08:00
f6c2758801
Merge pull request #14409 from xiaofeng11/v3_combine_opengl
...
Combine Studio change for openGL related operation
2015-12-03 23:03:40 -08:00
18666a9b41
Merge pull request #14393 from xiaofeng11/v3_combine_3d
...
Combine Studio change for 3d components
2015-12-02 09:47:12 +08:00
150d907636
Add missing changes to Particle 3d
2015-11-27 19:01:30 +08:00
2d28b78e41
Add 3 missing class export
...
Change clearShader logic.
2015-11-27 14:58:18 +08:00
b8f43f334d
Merge pull request #14420 from xiaofeng11/v3_combine_particle3d
...
Combine Studio change for particle 3d
2015-11-25 09:20:47 -08:00
eccde9fe11
Fix PhysicsSprite not working with moveTo action issue
2015-11-19 17:17:59 +08:00
fb7b92915c
Combine Studio change for particle 3d
2015-11-18 14:34:14 +08:00
18940d06ba
fix the bug of keeplocal of PUParticleSystem3D
2015-11-11 11:40:50 +08:00
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
1c40f7b61b
CCScrollView should override removeChild
...
Fixed issue: https://github.com/cocos2d/cocos2d-x/issues/8396
2015-09-21 11:35:11 +08:00
1b875cb353
Fixed compile error
2015-09-19 01:57:45 +01:00
cb1a574b56
AssetsManagerEx unzipping freeze app
...
Unzipping in main thread bad idea.
Need good solution. My code fix freezing, but need similar batch
Download.
2015-09-17 23:43:56 +03:00
06b74695c2
unzOpen use getSuitableFOpen for correct open utf8 file name on Windows.
...
Fix bags, can't open file on windows platforms, if this contains utf8
chars
2015-09-17 23:30:32 +03:00
ded9a9e6d4
Merge pull request #13893 from yangws/downloader
...
Remove AssetsManager dependence with CRUL.
2015-09-17 22:18:56 +08:00
5eafc93d86
Remove AssetsManager dependence with CRUL.
2015-09-17 16:52:31 +08:00
d95edeee17
Merge pull request #13882 from pandamicro/v3
...
Fix performance issue in AssetsManagerEx due to object copy
2015-09-17 11:40:16 +08:00
20d9442167
Fix performance issue in AssetsManagerEx due to object copy
...
Reported in #13513
2015-09-17 10:00:02 +08:00
848fa2c0d0
Merge cocos2d.
2015-09-15 18:30:45 +08:00
bf477c6bfb
Restructure AssetsManagerEx.
2015-09-15 11:23:46 +08:00
d6934cfc4b
rename var resumeDownloaded to resumeDownloaded.
2015-09-08 16:38:02 +08:00
8daf026c6c
fix the AssetsManagerEx can not continuous transmission for large zip file.
...
the testcase is extension/assetsmanager
2015-09-08 16:34:02 +08:00
cf664800ac
refine #22483 : Restructure CCDownload Interface and implements on iOS.
2015-08-28 16:40:11 +08:00
fb55c2cd63
Merge pull request #13398 from perminovVS/v3-dev-use-more-get-file-extension
...
More FileUtils::getFileExtension
2015-08-18 17:27:11 +08:00
b16dc7b425
Merge pull request #13427 from songchengjiang/v3_backup
...
performance optimization and bug fixing
2015-08-18 09:59:24 +08:00
6008c8352b
performance optimization and bug fixing
2015-08-18 09:51:26 +08:00
9c729e1953
More FileUtils::getFileExtension
...
check .material in CCPU
check .zip in AssetsManager
2015-08-16 15:01:15 +03:00
d2cf4bfc79
Squashed commit of the following:
...
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf5e21580#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#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#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 0cbd71f7f215e90d778386831e24a06421b8d836daf744383253d9c4642ccac
2015-08-13 00:14:10 -07:00
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
8b2747c53b
fix particle3D file error
2015-08-06 18:03:50 +08:00
37030a427c
Fix AssetsManager crash by protect Downloader with shared_ptr
2015-08-04 12:45:49 +08:00
5f9469ac7b
Merge pull request #12239 from pandamicro/PhysicsSpriteFix
...
Fix transform issue of PhysicsSprite itself and its children
2015-08-01 18:08:57 +08:00
81f77b0010
Improve sync transform logic using custom listener
2015-08-01 16:50:16 +08:00
2deb492d36
compiles and runs on Xcode 7
2015-07-23 14:28:23 -07:00
7a36a57aff
Fixed inertial scrolling for `CCScrollView`
...
The inertial scrolling in `CCScrollView` usually works only if you're using the `Direction::BOTH` direction, and if there's enough scrolling space *both* on the X and the Y axis. But when you use the `Direction::HORIZONTAL` or `Direction::VERTICAL` directions you usually have 0px of available space on the Y or X axis respectively, so it won't work.
This change enables you to scroll the view just on the X or on the Y axis using `Direction::HORIZONTAL` or `Direction::VERTICAL` and to use the inertial scroll accordingly.
2015-07-08 10:03:03 +02:00
8179fe04f0
And more warnings.
2015-07-07 23:10:04 +08:00
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
3a654b4615
Fix the compile error of js-template by using android-studio compile param.
2015-06-25 17:44:51 +08:00
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
080e2debe8
Fix transform issue of PhysicsSprite itself and its children
2015-06-08 13:43:51 +08:00
ed6d6521ac
Add CURLOPT_NOSIGNAL to avoid multithread issue on timeout
2015-06-04 17:59:56 +08:00
83f7f30c1c
Fix issue that __JSDownloaderDelegator::onError get called twice
2015-06-04 15:03:20 +08:00
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
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
2aec149316
check for existance of KEY_DOWNLOAD_STATE entry before trying to read its value
2015-05-28 13:33:38 -07:00
7623ee390b
disable CURL and AssetsManager for Windows 10 UWP
2015-05-28 13:32:08 -07:00
81d562803b
upgrade rapidjson to 1.0.2
2015-05-25 11:43:03 +08:00
944b0ef5e7
adds `virtual` to destructor
2015-05-20 17:43:48 -07:00
f2d3ecad48
Removes state from MeshCommand.
...
MeshCommand can be reused from other objects either by passing a
`Material` or a `RenderState::StateBlock`
2015-05-20 15:57:26 -07:00
8212b1398f
Update AssetsManager.cpp
...
fix: crash when default constructor params packageUrl, versionFileUrl,.. is NULL
fix: percent
2015-05-16 11:48:34 +08:00
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
88c6eb6887
Merge pull request #326 from songchengjiang/v3
...
fix the bug of particle3d material reading
2015-05-12 12:23:32 +08:00
minggo