fe52c5fa0a
Fix typos in comments and strings ( #16708 )
2016-10-17 10:12:54 +08:00
59dea5a487
Removed unnecessary comments ( #16649 )
2016-10-07 11:47:48 -07:00
d68eacd10a
Remove unused functions ( #16640 )
2016-10-04 22:10:52 -07:00
63b3043dc0
Remove extra semicolon after member function definition ( #16595 )
2016-09-20 14:43:48 +08:00
2b9ac2c950
Remove redundant semicolons ( #16558 )
2016-09-12 09:45:34 +08:00
eca7b2392d
Remove unnecessary inline keywords ( #16562 )
2016-09-12 09:44:21 +08:00
04fd2b16b2
merge v3.13 back to v3
2016-08-29 11:57:13 +08:00
f0be4f3069
Merge part of Cocos2d-x-lite ( #16380 )
...
* Update js auto binding settings with new ndk version
* Remove unnecessary property from Ref
* Merge part of Cocos2d-x-lite :
1. Improve network bindings
2. Use nullptr instead of NULL
3. Remove usage of some deprecated APIs
4. Add some defensive code and cleanup
* Fix spine track entry circle referencing issue
* cocos2d/cocos2d-x#16327 : Fix global object leak issue in JSB
* Improve ScriptingCore::evalString, old implementation have been deprecated in Spidermonkey
* Update JS versions
* Add docs for web v3.13
* Improve ScriptingCore
* Manual merge cocos2d/cocos2d-x#16383 by DavidDeSimone
* Fix auto bindings configurations
* Update web ref
2016-08-19 16:28:47 +08:00
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
093ef3a14f
Fix typos in variable names
2016-07-26 04:06:01 +09:00
26dd7b2698
remove curl link for Android
2016-07-21 11:56:56 +08:00
4e125d84a4
fix compiling and linking error with ndk r12b
2016-07-08 15:29:35 +08:00
2650fd1afd
Add missing float suffix to avoid -Wdouble-promotion
2016-07-04 23:12:45 +09:00
2443e09d29
Fix typos and other mistakes in docs
2016-07-04 00:42:10 +09:00
bbd837aefa
merge v3.12 back to v3
2016-06-28 17:53:50 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
8e19db7d26
fix AssetsManager could not work after Pull Request #13893 was merged.
2016-06-22 14:31:26 +08:00
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
a348cbda8b
Move StringUtils functions from deprecated header file to ccUTF8.h ( #15835 )
...
* Move StringUtils functions outside of deprecated header
* Replace deprecated headers with 'base/ccUTF8.h'
2016-06-15 15:01:26 +08:00
376d21d253
Avoid shadow warning when building with Xcode 7.3 ( #15795 )
2016-06-08 10:25:34 +08:00
ce807225f8
use manifestUrl from remote version
...
In case if local version file is very old, and remote version has
changed the manifest url ever since, this fix will make sure that
AssetsManagerEx will download the correct manifest file
2016-05-23 20:03:04 +09:00
320ec027f7
Replace CCAssert macros with CCASSERT
2016-05-18 01:49:35 +09:00
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
24d1b23816
fix the bug of particle3d material reading
2015-05-12 10:42:33 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
0f30ad4f16
Fix crash in AssetsManager
2015-05-07 18:59:51 +03:00
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466254a4b05671818b9a994fbd5f4e02199bf1cf177bbca1a95f0287b42fd3e38b425b2b65d5fa3dd54ddbdbc345548a160d7b409f20967f35a09c50c464c45fab648d1f0779d05
2015-05-05 13:07:32 -07:00
701d5fa827
Merge pull request #11673 from vovkasm/dev/v3-cleanup
...
Fix warnings in v3.
2015-05-05 11:26:10 +08:00
1839564fbb
Merge branch 'v3-dev-get-suitable-f-open' of https://github.com/perminovVS/cocos2d-x into v3.7
2015-05-04 10:16:47 +08:00
557f3e86b9
Fix warning in CCPURender.cpp: Comment out unused function 'compareParticle3D' because code that use it was commented.
2015-05-01 12:46:53 +03:00
0aecc15a25
Correct field initialization order in various places (Xcode warnings)
2015-05-01 12:19:30 +03:00
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
98fcd83d50
Merge pull request #10870 from daiki1003/fix/scroll_view_container
...
Fix container view's anchor point problem.
2015-04-27 11:44:19 +08:00
0198c8707b
Merge pull request #11572 from super626/v3
...
Fix memory leak
2015-04-24 16:42:33 +08:00
2aee4abd66
fix https://github.com/cocos2d/cocos2d-x/issues/11203
...
fix the error of CCBundle3D
2015-04-24 15:31:50 +08:00
ec41965add
Add get header and callback for Downloader
2015-04-23 19:07:07 +08:00
6ef1e7e3d0
Optimize Vec3 use constructor default.
...
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
2015-04-20 12:56:43 +03:00
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
694b9adc1e
Add FileUtils::getSuitableFOpen
...
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.
Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename
all fopen use FileUtils::getSuitableFOpen
2015-04-19 14:00:27 +03:00
f8f18cc026
enable users to clone PUParticleSystem3D
2015-04-15 12:44:03 +08:00
ed407e7889
fix the bug of makeParticleLocal function
2015-04-10 17:32:13 +08:00
783b159abc
naming error
2015-04-10 16:09:39 +08:00
6b8d8a4774
fix the bug of PUParticle3DQuadRender
2015-04-10 15:58:16 +08:00
a6e83ca35b
fix the bug of makeParticleLocal function
2015-04-10 11:31:39 +08:00
98211a8c3f
fix the bug of PURibbonTrail
2015-04-09 16:49:03 +08:00
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +08:00
a782eb022d
fixes warnings on Xcode 6.3
...
instead of using `abs()` it uses `std::abs()`
2015-04-06 12:08:30 -07:00
105bac2d55
Optimize Vec3
...
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
2015-04-05 13:09:50 +03:00
b9d294f542
Fix container view's anchor point problem.
2015-04-03 16:37:48 +09:00
e4a58d5c35
fix the bug of Particle3DModelRender
2015-04-03 12:43:14 +08:00
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
42cd63fe01
fix group error
2015-03-26 15:47:14 +08:00
1e271a9d96
Merge pull request #10899 from super626/v3
...
Bug fix
2015-03-17 19:29:21 +08:00
a9e5f8cc4a
replace static_cast with dynamic_cast
2015-03-17 17:47:58 +08:00
2c80b6ae3a
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-15 00:10:08 +01:00
cd12d08a52
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
2015-03-14 19:33:15 +01:00
350b81501d
Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder]
...
Initialization follows the order of declaration, not the order of the initialization list.
2015-03-12 23:47:58 +01:00
1e240e92f9
empty mesh check
2015-03-10 13:31:04 +08:00
e30c473f85
fix the bug of material reading on linux
2015-03-09 17:30:28 +08:00
578053d351
add macro on other platform
2015-03-06 18:03:11 +08:00
27ae60e626
Merge pull request #249 from songchengjiang/particle_merge
...
support win8.1
2015-03-06 17:57:34 +08:00
4ca90341b9
support win8.1
2015-03-06 15:35:02 +08:00
bac5377e8c
format
2015-03-06 10:44:56 +08:00
bec346bf73
add comments
2015-03-06 10:35:42 +08:00
444dbfdf9e
replace .mesh with .c3b
...
modify ParticleUniverse file structure
2015-03-05 14:54:32 +08:00
70c25ecded
modify project using short path
2015-03-05 13:40:52 +08:00
4de96cf1e6
modify pu path
2015-03-05 13:28:42 +08:00
faf299c5a1
make path shorter
2015-03-05 13:24:06 +08:00
590912ba49
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
2015-03-04 15:29:05 +08:00
4783ac4f86
remove setParticleSystemScaleVelocity
2015-03-04 15:18:03 +08:00
9665bb6dd8
add to linux project
2015-03-04 15:17:37 +08:00
d861220993
restore model search path
2015-03-04 14:56:04 +08:00
7c1e8e1a08
Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge
...
Conflicts:
tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
2015-03-04 14:12:34 +08:00
1b0fc162b0
fix bugs
2015-03-04 13:19:42 +08:00
e466b5d231
fix warning
2015-03-04 10:24:07 +08:00
a92a8ac924
particle to transparent queue
2015-03-04 10:10:33 +08:00
68eaadaffb
merge cocos
2015-03-04 09:57:42 +08:00
8092437463
Merge pull request #245 from songchengjiang/particle_merge
...
add test demo
2015-03-03 17:46:47 +08:00
18a3a23a2e
adjust code style
2015-03-03 15:57:03 +08:00
db5c098ca8
adjust
2015-03-03 15:13:47 +08:00
9bdcdec60a
add test demo
...
use particleSystemScaleVelocity
2015-03-03 15:10:42 +08:00
6023777133
reset modify
2015-03-03 14:12:12 +08:00
e650ef2b4d
check sprite == nullptr
...
remove unneeded namespace
2015-03-03 11:52:55 +08:00
6b046c5236
add log to Render
2015-03-03 11:42:15 +08:00
874f7c7f99
fix transparent render bug
2015-03-03 10:42:47 +08:00
def8da1612
remove unneeded code
2015-03-03 10:33:28 +08:00
6a3e810bc2
code optimization
2015-03-03 10:15:49 +08:00
a3ae37ac7a
optimization
2015-03-02 17:47:26 +08:00
a9eb4dc7f9
support read material files on linux
...
modify the name of getAliveParticleCnt function
2015-03-02 16:28:38 +08:00
79d892bffc
add std::nothrow
...
modify Copyright
2015-03-02 16:05:26 +08:00
5c460ebb2d
add/update particle files
2015-03-02 13:07:32 +08:00
c216984b6f
clear the particle pool when start
2015-02-26 13:57:18 +08:00
22d8917100
add Particle Universe copy right
2015-02-25 18:05:41 +08:00
a50efe998f
fix compile
2015-02-16 11:57:07 +08:00
bdd7da89a1
add header
2015-02-16 11:26:06 +08:00
6c73e22a32
variable name error
2015-02-16 11:18:54 +08:00
5c8fbcedab
load all materials linux routine
2015-02-16 10:03:58 +08:00
f71b432d1d
fix render release bug
2015-02-15 16:52:20 +08:00
d34a9f68f2
check ParticleModelRender to avoid crash
2015-02-15 16:39:58 +08:00
5547d85add
missing file
2015-02-15 11:41:14 +08:00
f9f532ef65
missing file
2015-02-15 11:16:46 +08:00
33a0cc310a
wrong filename
2015-02-15 11:01:11 +08:00
6172302a9b
ref path add extensions
2015-02-13 16:57:00 +08:00
0f27e0c31a
add to ext.h
2015-02-13 16:16:30 +08:00
954fd52493
rename folder and fix warning
2015-02-12 17:54:27 +08:00
2bae6b5351
check created vertex and index buffer
2015-02-12 17:15:48 +08:00
026ce1a288
modify according to minggo
2015-02-12 16:51:02 +08:00
8f290b2d24
modify according to minggo
2015-02-12 16:09:08 +08:00
c114d5d496
add particle to linux project
2015-02-12 11:00:48 +08:00
79a0c0152a
add 3d particle (Particle Universe)
2015-02-11 18:14:22 +08:00
897416eb4e
cocos2d/cocos2d-js#1313 : Remove dangerous code in AssetsManagerEx::setStoragePath
2015-01-30 11:12:35 +08:00
5e8baa4f39
Fix AssetsManagerEx small issues
2015-01-23 12:10:32 +08:00
ca48c5e5dd
Fixed lots of compiler warnings
...
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
2015-01-23 02:02:33 +01:00
0bddeb88c8
Disable 3D rendering support for commands that needs to execute in order
2015-01-15 14:57:51 -08:00
4a440e66c9
Refactor draw command
2015-01-15 14:00:49 -08:00
412e76a626
add fixme
2015-01-04 15:16:22 +08:00
7328c2eea0
fix linux compile error
2015-01-04 15:16:22 +08:00
60ec08eef4
upgrade libcurl for iOS
2014-12-31 10:18:44 +08:00
5755cc69e9
Fix a small compilation issue
2014-12-30 10:11:30 +08:00
ffd7c30c87
Polish restart implementation
2014-12-30 10:09:56 +08:00
1e32d0fb80
Added getSearchPaths API in Manifest
2014-12-28 11:55:31 +08:00
6db7cfb68b
Merge pull request #9039 from pandamicro/v3_origin
...
#9061 : Polish AssetsManagerEx, bug fixes and feature added
2014-11-27 22:01:03 +08:00
ef76724f19
#9061 : Add check for instantiation
2014-11-26 14:39:56 +08:00
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
1e8aeb7fd2
Minizip
...
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
2014-11-16 22:41:37 +03:00
eb0159b2b7
Unify usage of chipmunk library
...
* cmake/Modules/FindChipmunk.cmake now can find prebuilt chipmunk libs
* follow USE_CHIPMUNK variable (although at the moment cocos can't build without chipmunk)
* come cleanups and formatting
2014-11-15 13:17:23 +03:00
f4e61f5620
Issue #9061 : Add std::nothrow
2014-11-14 10:44:18 +08:00
d8be5a8af4
fix includes so that minizip builds correctly on Mingw-w64
2014-11-13 23:27:04 +00:00
bf45accf8e
Revert "Issue #9061 : Made Manifest::getAssets public for assets process after update finished"
...
This reverts commit 8652864242
2014-11-13 10:53:38 +08:00
68e5132107
Issue #9061 : Fix issue about compare logic
2014-11-10 19:23:41 +08:00
8652864242
Issue #9061 : Made Manifest::getAssets public for assets process after update finished
2014-11-10 16:52:20 +08:00
e167f0889b
Issue #9061 : Fix no success notification for empty download queue issue
2014-11-10 16:51:41 +08:00
ead867559c
Issue #9061 : Fix local manifest more recent than cached manifest issue
2014-11-10 16:51:08 +08:00
aca5930711
Fixed #9038 : parseVersion shouldn't set Manifest loaded flag
2014-11-06 23:08:34 +08:00
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
ccbc668427
Improve Android.mk
2014-10-17 10:13:33 +08:00
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
3f667fac85
Update the related AssetsManagerEx files and related project configure
2014-10-16 10:28:52 +08:00
d8d94d214b
added missing file methods for winrt/wp8
2014-10-14 17:49:25 -07:00
a91ae61071
added check for WinRT and WP8
2014-10-14 16:46:23 -07:00
cca5d90cbe
added winrt and wp8 platforms. Cleaned up platform checks
2014-10-14 16:45:43 -07:00
fd638f00b7
removed old WP8 project files
2014-10-14 14:09:52 -07:00
4e9e40363f
Feature #4977 : Fix an issue about checkUpdate function
2014-10-09 19:55:11 +08:00
a26e91f839
no message
2014-10-09 18:30:39 +08:00
73980195c0
wp8: use CC_STATIC because libs are static
2014-10-09 06:33:46 +01:00
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
b911c240c9
added support for static and shared builds with extensions
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:19 +01:00
342d934a0e
scheduler and macro fixes
...
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)
Updates all smaples
2014-10-03 09:38:36 -07:00
efa1c86fc5
Merge pull request #8103 from cpascal/fix_no_physics
...
Fixed compile error when I turned off physics definitions.
2014-09-25 09:56:45 +08:00
53d28168fe
remove duplicated Win32InputBox.cpp/.h and add WebViewTest to win32
2014-09-24 16:39:32 +08:00
fe07589141
Fixed my mistakes - preprocessor.
2014-09-22 14:25:47 +09:00
07f5568ae8
Using CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION instead of CC_USE_PHYSICS
2014-09-22 14:19:08 +09:00
c527d7476b
Fixed compile error when I turned off physics definitions.
...
Fixed the following compile error.
cocos2d\extensions\physics-nodes\ccphysicssprite.cpp(305): error C4716:
'cocos2d::extension::PhysicsSprite::getRotation' : must return a value
and more..
Conditions:
CC_USE_PHYSICS = 0
CC_ENABLE_CHIPMUNK_INTEGRATION = 0
CC_ENABLE_BOX2D_INTEGRATION = 0
2014-09-19 01:35:01 +09:00
0cfb8c6469
fix ScrollView bug
...
I Fixed a bug that scroll view hidden picks up the touch events.
2014-09-05 20:49:15 +09:00
7372604f7f
fix wp8 compile error and modify default resource path
2014-09-05 11:21:08 +08:00
7493c7bf3e
fxi compile warning
2014-09-03 14:47:04 +08:00
b37ef4e1c3
remove unneeded files
2014-09-03 11:52:19 +08:00
a0c28e49ac
remove exteion edtibox
2014-09-02 16:14:07 +08:00
ffee7b27d4
fix linux and android compile error
2014-09-01 17:43:40 +08:00
85ce801fdd
remove ccscale9sprite , cceditBox
2014-09-01 17:06:22 +08:00
aef0f5e729
Merge branch 'v3' into mergeExtensionEditBox
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/Android.mk
cocos/ui/CMakeLists.txt
cocos/ui/proj.win32/libui.vcxproj
cocos/ui/proj.win32/libui.vcxproj.filters
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
tests/cpp-tests/proj.wp8-xaml/cpp-testsComponent/cpp-testsComponent.vcxproj.filters
2014-09-01 15:26:25 +08:00
2c068cd1f5
Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme
...
Adds MARK: TODO: FIXME: in code
2014-08-29 12:55:14 -07:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
3679d66c8e
remove unneeded includes
2014-08-29 15:39:52 +08:00
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
d3ce2acff6
Merge pull request #7892 from Dhilan007/v3-androidmk
...
Adjust android.mk for cocos2d and related module
2014-08-28 10:16:39 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
bef774a14a
Adjust android.mk for cocos2d and related module
2014-08-27 22:54:28 +08:00
9135236bb0
Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk
2014-08-27 21:15:57 +08:00
3d5f8de346
Adjust android.mk for cocos2d and related module
2014-08-27 20:58:32 +08:00
04bfbdd5a1
fix conflict
2014-08-27 13:50:01 +08:00
3759648d3a
Remove the useless aneroid.mk files
2014-08-27 10:21:47 +08:00
a5a706aa05
Remove the useless win32 project
2014-08-27 10:20:15 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
2f60e610a2
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
2014-08-22 13:49:21 +08:00
2d8bec2ba9
remove Extension EditBox
2014-08-20 16:20:57 +08:00
38fb58cf29
Merge pull request #7792 from minggo/fix-warning
...
fix warnings
2014-08-15 13:33:08 +08:00
db17084b6d
fix warnings
2014-08-15 12:06:16 +08:00
3f2fccb999
Merge pull request #7771 from samuele3hu/v3_3_module
...
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 18:33:53 +08:00
d8eb1b26ef
format code
2014-08-14 14:15:16 +08:00
561945d6cd
format code
2014-08-14 14:14:25 +08:00
42e7e3bbe8
format code
2014-08-14 14:11:00 +08:00
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
032f5ea781
Adjust lua_debugger.h/c to lua runtime template and adjust related project configure
2014-08-14 00:06:28 +08:00
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
c673955d5d
uncompress false means zip wrong, download again
2014-08-12 20:13:52 +08:00
0b93cc40d7
when http code 301,302, can follow rediect
2014-08-12 20:12:23 +08:00
8ee4340db3
fix winrt complie error
2014-08-07 18:38:11 +08:00
1bad9ddbc2
Merge pull request #7657 from huangshiwu/v3_wp8glviewhookpr
...
V3 wp8glviewhookpr
2014-08-05 13:51:15 +08:00
38e4ad0fbd
Merge pull request #7653 from takaken1994/feature/improve-extensions-scrollview
...
Update : added function for setting min/max scale
2014-08-05 11:52:22 +08:00
1b74bc279a
Fix : remove unused params from header file
2014-08-04 23:20:47 +09:00
6f26a7b983
Fix : remove verbose function
2014-08-04 23:20:13 +09:00
7c0919042f
Fix : small bug
2014-08-04 23:17:09 +09:00
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
mogemimi