4f973044ac
fix: FPS appears on iOS
...
`glViewport()` has a default value so that it has a valid value
after `Scene::render()` exits
github issue #15934
2016-06-24 11:40:13 -07:00
b29fbf0fc8
Merge pull request #15885 from Sumxx/v3
...
fix restart game crash in FT_Get_Char_Index
2016-06-24 10:08:32 +08:00
1042b18999
Merge pull request #15936 from mogemimi/use-nullptr-instead
...
Use nullptr instead of 0 or NULL whenever possible
2016-06-24 09:54:15 +08:00
ee7ceee007
Merge pull request #15874 from mogemimi/fix-unused-variable
...
Fix unused variable warnings when compiling release mode
2016-06-23 15:55:11 +08:00
08898db883
Merge pull request #15831 from j-jorge/premultiplied-alpha-config
...
Add a config option to enable or disable the premultiplied alpha code.
2016-06-23 13:57:41 +08:00
cbc0612306
Use nullptr instead of 0 or NULL
2016-06-23 12:39:23 +09:00
597fb61a78
Merge pull request #15922 from dumganhar/fix/lua-binding
...
Some lua bindings fixes:
2016-06-23 10:00:45 +08:00
a31279f8cb
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow setAdditionalTransform() breaks
setNodeToParentTransform(). And since setAdditionalTransform is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:28:58 -07:00
edafe726cc
fix: reverse iterator on events + doesn't use additionalTransform
...
use reverse Camera iterator when traversing events (of course).
but somehow `setAdditionalTransform()` breaks
`setNodeToParentTransform()`. And since `setAdditionalTransform` is not
needed, we just don't use it.
Github issue #15909
2016-06-22 11:22:47 -07:00
710ab777dd
Some lua bindings fixes:
...
1) Reverts changes in #15443 , the behavor of LuaEngine::handleCommonEvent should not be changed. empty eventName should be supported, otherwise it will break compatiblity.
2) Null pointer check in CommonScriptData initialization
3) No error callback in lua (fixed #15904 )
2016-06-22 17:48:17 +08:00
a3bc979452
Fix typos in documentation and comments
2016-06-22 11:22:05 +09:00
6fb3946c51
Add a config option to enable or disable the premultiplied alpha code.
2016-06-20 18:05:11 +02:00
f0028e5459
Fix unused variable warnings when compiling release mode
2016-06-20 09:23:42 +09:00
4700bbce43
fix restart game crash in FT_Get_Char_Index
2016-06-19 03:22:57 +08:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
9b210e00d7
Merge pull request #15837 from geemedia/cmake-improvements
...
Various CMake improvements
2016-06-16 14:53:10 +08:00
01aaff66c8
Fix -Wsometimes-uninitialized warning in release build
2016-06-16 14:27:52 +09: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
51f4deee01
Add system label overflow ( #15827 )
...
* Add system font overflow
1. currently only iOS, Mac and Android platform are supported
add mac label overflow shrink
modify system font overflow test
fix warning and possible memory leaks
add ios system label overflow support
add iOS system font overflow support
fix iOS system font overflow
fix Mac System font overflow
add android system font clamp
add Android system font shrink
cleanup iOS shrink related code
fix Android system font clamp
add core text to project template
fix iOS tests project
fix mac and iOS shrink
improve iOS and Mac clamp feature
fix header file include path
* modify the comments, make it more clearer
2016-06-15 10:43:15 +08:00
dac9be5016
Various CMake improvements
...
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
7885f55ce5
Cache bas64 images
2016-06-06 16:32:50 +02:00
69974ab06f
Fix warnings caused by comparison between RefPtr and C++11's nullptr
2016-05-28 22:15:56 +09:00
1e04cb5950
Use nullptr instead of 0 or NULL
2016-05-25 03:09:11 +09:00
2c9716d714
Merge pull request #6927 from TimothyZhang/fix-cc-utf8-to-utf16
...
fixed bug of cc_utf8_to_utf16() when length!=-1
2016-05-20 14:59:06 +08:00
948f64631f
Use const references whenever possible
2016-05-17 13:17:56 +09:00
abe020e808
Merge pull request #15654 from minggo/ipv6-compatibility
...
Ipv6 compatibility
2016-05-17 09:25:14 +08:00
2b480a75bf
use AF_UNSPEC to support ipv6
2016-05-16 14:45:09 +08:00
bbbb7e498d
Prevent variable shadowing warnings
2016-05-08 12:32:36 +09:00
fc9880ab49
Add captureNode for cocos2d::utils ( #15558 )
...
* Add captureNode for cocos2d::utils
Add captureNode for cocos2d::utils and fix CC_DLL syntax.
* Add test case for utils::captureNode
Add test case for utils::captureNode.
* Store captured image to disk with RGB.
* Trigger jenkins check
2016-05-07 22:10:53 +08:00
2df9afbe71
Fix typos in documentation and comments
2016-05-05 08:05:20 +09:00
a5602cc732
merge v3.11 back to v3
2016-05-04 16:02:23 +08:00
9ff61f915c
Add findChild for cocos2d::utils ( #15548 )
...
* Add searchNode for cocos2d::utils
Add searchNode for cocos2d::utils
* fix compile error on win32_bak
* convert line terminates to unix sytle.
* Rename searchNode to findChild, and etc.
* fix compile error.
2016-05-04 09:46:00 +08:00
4766e0dd9b
Merge pull request #15545 from minggo/isse-15540
...
avoid remove event listener multiple times
2016-05-04 09:39:38 +08:00
1a76c9ea3b
Add OBB (zip) support ( #15515 )
...
* Add OBB support.
OBB must be a zip file with audio and video files stored uncompressed.
* Use introspection to be able to build with Android API level 10.
Using the new audio engine to play sounds from the OBB will only work with API level 12 (Android 3.1) or above.
2016-05-04 09:21:35 +08:00
d41207e99a
avoid remove event listener multiple times
2016-05-03 10:56:03 +08:00
f111583214
Refactor FileUtils::getFileData() and CCFreeTypeFont::loadFont().
...
* Remove unnecessary memory copy in FileUtils::getFileData()
* Add Data::takeBuffer() to simplify FileUtils::getFileData() and CCFreeTypeFont::loadFont().
2016-04-29 09:31:09 +08:00
c432b23ef6
fix: removes `friend class Game`
...
fixes Github issue #15221
2016-04-27 18:57:41 -07: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
94944082c4
Fixes warning about deprecated cc_wcslen.
2016-04-26 14:21:25 +08:00
71677ee286
Fix unused variable warning when building with Xcode
2016-04-22 20:25:32 +09:00
0f0c9b627b
Add support for Unsigned with CCValue ( #13785 )
...
Add support for Unsigned with CCValue
2016-04-22 13:49:20 +08:00
488ceb485d
Merge pull request #14547 from colajam93/fix-linux-clang-build
...
Add missing header
2016-04-21 15:38:53 +08:00
9514b51057
Console refactor ( #15013 )
2016-04-21 11:31:20 +08:00
08b000bacf
Merge pull request #14426 from pyrosphere/fix-controller-ios6
...
Fix crash when using cocos2d::Controller on iOS6
2016-04-20 11:45:13 +08:00
f49f69dac8
Merge pull request #14525 from elvman/key_none
...
Add enum value for no key
2016-04-20 11:21:43 +08:00
5bd592ca34
Merge pull request #15231 from SteveKChiu/v3
...
Fix calculation of base64Encode outLength
2016-04-18 17:54:14 +08:00
001a0ee812
remove useless warning log of stencil buffer. ( #15396 )
...
1. disable GC for Native object
2. improve js tests of label
2016-04-18 15:43:54 +08:00
3780064a82
Allow inherit form platform fileutils ( #15304 )
...
* Allow inherit form FileUtilsLinux, FileUtilsWin32 and FileUtilsWinRT.
* Removed objc from CCFileUtils-apple.h
define FILEUTILS_APPLE_ENABLE_OBJC to enable FileUtilsApple:setBundle() for compatibility.
* Smart pointers heal us all.
* Add config macro in ccConfig.h and prefix with CC_.
* enabled by default.
* use #if rather than #ifndef.
* Do not deprecate setBundle.
2016-04-14 11:59:24 +08:00
f3e6e8331a
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-11 11:54:15 +08:00
dfc12c8351
Bug fix: CCValue operator overloading of Comparison "==" in case Type::VECTOR
2016-04-08 14:11:39 +08:00
d023a3ad1a
Add missing header
2016-04-08 02:16:22 +09:00
6ac9a42e6c
Merge pull request #15383 from mogemimi/fix-implicit-conversion
...
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:58:30 +08:00
c0e4780e77
Fix implicit conversion issues with Xcode 7.3
2016-04-07 17:01:17 +09:00
514ac58bf3
Fixes wrong usage of std::vector's constructor in EventDispatcher::removeAllEventListener.
2016-04-07 15:50:59 +08:00
7f2b0edc04
Vector iterator declaration & initializer list constructor
...
* Vector iterator typedef -> alias declaration
* Vector constructor with initializer list
* fix indent
2016-04-07 13:47:01 +08:00
107cef0667
getRandomObject() in Vector, Map is changed
...
* getRandomObject is changed
https://github.com/cocos2d/cocos2d-x/issues/15270
getRandomObject issue in Vector
* Update CCMap.h
* Update CCVector.h
2016-04-07 11:46:54 +08:00
944307a5f8
Merge pull request #15260 from mxenabled/dennacerise/color_constructor
...
Add optional alpha parameter to Color4B and Color4F constructors
2016-04-06 11:50:02 +08:00
44080a04d8
Fix typos in comments and strings
2016-03-29 10:52:17 +09:00
400e77808c
Revert "UIEditBox attachWithIME, detachWithIME make working"
2016-03-22 14:18:39 +08:00
32e408487f
Fixes import path for m and mm files.
2016-03-21 20:12:58 +08:00
931d56bc10
Fixes includes in .m and .mm files.
2016-03-21 11:02:00 +08:00
90456d29ba
Fixes 1605 include path in 541 files
...
using the tools/coding-style/include-linter.py with -f options.
2016-03-20 21:53:44 +08:00
56878bd441
Merge pull request #14532 from xpol/refactor-utf-module
...
Overhaul UTF modules and add full set of UTFs conversion functions.
2016-03-18 14:00:47 +08:00
7eeccbc771
UIEditBox attachWithIME, detachWithIME make working
...
(android, iOS tested)
2016-03-17 10:26:53 +09:00
737455fda6
Add optional alpha parameter to Color4B and Color4F constructors
2016-03-16 16:08:49 -06:00
4769890d4e
Fix calculation of outLength
...
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
2016-03-12 15:42:52 +08:00
5a3a4c356f
Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2
...
Textfiled support cursor v1.2
2016-03-11 22:32:55 +08:00
fa7d9c7163
Remarks zilongshanren
...
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
2016-03-11 15:09:50 +03:00
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
6bc36912ae
TextFieldTTF support cursor
...
If TextField active(focused input text) show text cursor( default '|',
change TextFieldTTF::setCursorChar ).
Show/Hide interval CURSOR_TIME_SHOW_HIDE
Change position text cursor control key: KEY_HOME, KEY_END,
KEY_LEFT_ARROW, KEY_RIGHT_ARROW
CC_PLATFORM_MAC, CC_PLATFORM_WIN32, CC_PLATFORM_LINUX default use
cursor( For change state TextFieldTTF::setCursorUse )
Text cursor worked only on LabelType::TTF
2016-03-07 14:22:03 +03:00
f2a5a5ef6b
StringUTF8 - Utf8 sequence
...
Store each utf8 chars as std::string, for easily manipulated
2016-03-07 13:59:53 +03:00
462f4f4c0a
Merge pull request #15156 from ricardoquesada/cmake_android_squash_2
...
cmake for android
2016-03-02 17:24:35 -08:00
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
2016-03-02 16:51:54 -08:00
48e7d70d9d
Removes unused include in CCDirector.cpp
2016-02-29 18:58:17 +08:00
037051d9c4
Closes websocket connection by dispatching a 'resetDirector' event.
2016-02-29 18:55:51 +08:00
2a8d84e7f9
Remove unnecessary const from return types
2016-02-29 16:48:07 +09:00
5de611b4b5
Fix typo of function name in AsyncTaskPool
2016-02-26 00:22:46 +09:00
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
7607382440
Merge pull request #15094 from pandamicro/v3
...
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2016-02-21 20:58:21 +08:00
6e8c46d0be
Fix lua engine crashes caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2016-02-21 20:20:32 +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
1d9e688707
Fix typos in documentation
2016-02-18 16:16:36 +09:00
7d43e35741
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into refactor-websocket
2016-02-17 14:56:32 +08:00
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
bbf89cf016
Fix director restart issue
2016-02-15 16:30:32 +08:00
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
39e7759e77
Fix LuaEngine compilation issue
2016-02-14 10:18:27 +08:00
6bbfc846da
Update bindings generator and Activate new memory model by default
2016-02-14 09:48:29 +08:00
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
2016-02-08 11:25:37 -08:00
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
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
37b0d7c217
Mark equals() functions as const
2016-01-22 06:09:27 +09:00
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
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
763559cd1e
Invoking WebSocket::closeAllConnection while reseting Director.
2016-01-13 21:15:48 +08:00
0babe85947
add PlayableFrame
2016-01-12 17:21:01 +08:00
161be986af
Merge pull request #14340 from fnz/easyjni
...
easy jni
2016-01-12 11:50:16 +08:00
cf6fc000e7
Merge pull request #14709 from kcisoul/v3
...
Fix #14428 CCRenderTexture does not work properly on some devices wh…
2016-01-12 11:35:00 +08:00
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
ddb142e211
ouch... doesn't crash on pure C++ projects
2016-01-06 11:16:55 -08:00
b92b67edad
moves macro definition to `ccConfig.h`
2015-12-29 17:36:02 -08:00
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
2015-12-29 17:36:02 -08:00
a91a669972
Fix VS crash issue caused by unsupported macro syntax
...
piece of shit...
2015-12-21 22:44:59 +08:00
8d712a4c45
Expose CC_ENABLE_GC_FOR_NATIVE_OBJECTS
2015-12-21 00:16:17 +08:00
6a6407f711
Pass native references to script scope
2015-12-21 00:16:16 +08:00
e1bc6640f4
Implement full GC relied memory model
2015-12-21 00:14:51 +08: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
9e77fb0834
fix build fail error
2015-12-17 16:24:29 +09:00
8a39c1a06a
Windows/osx/linux build fail bug fixed
2015-12-17 15:40:16 +09:00
4fa58602a8
Adds `std::nothrow` to the `new` statements
2015-12-16 14:02:55 +08:00
43a573f4fd
ccvector_to / ccmap_to converted to new API
...
and more fixes
2015-12-15 17:37:48 -08:00
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
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
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
be213bf306
Fix typos in documentation
2015-12-03 21:03:00 +09:00
c321d35a9a
Squashed commit of the following:
...
commit 000a025fb4027c26bf05f7296e2d1fbbf21abe6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Dec 2 10:38:27 2015 -0800
updated submodule
commit b5f45a62b48493f05d75aea865158c371241973d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 19:21:34 2015 -0800
ooops... thanks Panda
commit 85f0b9c01d5281970f748b6460107bc0ca82cdf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 18:19:16 2015 -0800
better macro name for GC. Thanks panda
commit e42ad74a664dd2b85cbf4463a6fef8f6abc06664
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 17:10:32 2015 -0800
RepeatForever, Repeat and Speed converted
commit 3a8130ffc06301c91c836539736bbae456f05b4d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 14:31:32 2015 -0800
cherry-picking changes to disable retain/release from GC
commit 3ed6e00dc2d9d46248d9374a1f9874cd0b2ba67d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:31:04 2015 -0800
fixes autorelease issues on rebind
commit b65f5f6b16c1542c28b04d66377a27233c6cf214
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 1 12:23:33 2015 -0800
my JS changes... again
2015-12-02 14:45:13 -08:00
5dfc8f6a26
Remove default arguments
2015-12-02 11:02:27 +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
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
a89976dead
Add enum value for no key
2015-12-01 03:01:42 +02:00
cbbfc69ad4
Add missing studio change for Director::drawScene
2015-11-30 11:19:02 +08:00
8c691430c1
conflicts resolved
2015-11-27 13:19:10 +03:00
c4b995fe59
updates to JniHelper, refactoring of existing JNI calls
2015-11-27 12:00:33 +03:00
03046d6fbd
change the default alphaThreshold
2015-11-25 14:31:32 +08:00
759c0bbf31
rename CCStencilBitsManager to StencilStateManager
2015-11-25 14:24:27 +08:00
5fef088695
refactor stencil state management code
2015-11-25 14:14:17 +08:00
866c992f41
add cocos2d namespace
2015-11-24 21:41:45 +08:00
9c2130e88a
fix Layout and ClippingNode nested rendering issue
2015-11-24 18:01:50 +08:00
e145255479
Overhaul UTF modules and add full set of UTFs conversion functions.
2015-11-21 11:26:24 +08:00
7803669e7a
Reverted curly braces change for consistency.
2015-11-19 16:17:54 +00:00
aa4c4a9e6c
Fix crash when using cocos2d::Controller on iOS6
2015-11-18 20:48:51 +00:00
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
b99b3d1112
Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform
2015-11-15 23:02:43 +09:00
a31cce9a80
Fix minor grammar and typo in documentation
2015-11-04 17:14:00 +09:00
76acb91861
Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places.
2015-10-28 16:56:35 +09:00
616eae2b6d
Add cc.Director.EVENT_BEFORE_UPDATE
2015-10-27 17:32:57 +08:00
558ac3cfa0
Made CC_CONSTRUCTOR_ACCESS public only when script binding is enabled
2015-10-21 16:05:31 +08:00
762e25ad33
Remove unused parameter
2015-10-19 16:06:39 +08:00
ffb2cfa9e0
Fix EventListenerCustom registered by UILabel never has been released bug
2015-10-19 14:07:50 +08:00
32eeb560c3
clean up include files for WINRT platforms
2015-10-02 18:49:41 -07:00
95379c5dc2
Merge pull request #13995 from xiaofeng11/v3
...
Fix issue http://punchbox.info:3000/issues/23146
2015-09-24 13:03:59 +08:00
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
573f5868ca
Fix issue http://punchbox.info:3000/issues/23146
2015-09-22 14:52:16 +08:00
5511d42cd4
Merge pull request #13716 from fusijie/particle_performance
...
Refactory particle system update.
2015-09-21 14:19:55 +08:00
d871b1aa8a
Refactory particle system.
2015-09-20 16:46:09 +08:00
724011f19b
Merge pull request #12071 from waiter/v3
...
Fix a bug in Scheduler which may case Force Close
2015-09-18 21:39:36 +08: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
36337ad694
Fixed #13551 : MenuItemImage Camera Issue.
2015-09-16 11:24:55 +08:00
02eca21b78
Merge pull request #13701 from seivan/patch-3
...
Don't call release() before retain() #13656
2015-09-15 11:28:56 +08:00
ea12b601d9
Don't call release() before retain()
2015-09-10 11:09:17 +02:00
9814851355
Merge pull request #13659 from seivan/patch-2
...
EventListenerMouse will dispatch EventMouse events
2015-09-09 10:34:12 +08:00
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
8326ed6535
add physics component
2015-09-08 09:54:01 +08:00
2f02690394
EventListenerMouse will dispatch EventMouse events
2015-09-07 20:05:51 +02:00
d4c60144f0
Updated spelling and grammar mistakes
2015-09-06 15:29:36 +05:30
5fdb041856
Use string::empty() to check whether string is empty.
2015-09-01 11:26:09 +08:00
a3b5becb45
Sync v3.8 to v3
2015-08-31 22:05:37 +08:00
9d72d6a924
Merge pull request #13496 from ZhangMenghe/v3-notification
...
[ci rebuild] Notification effect enhancement
2015-08-28 14:10:42 +08:00
30d6c82da6
Merge pull request #13585 from WenhaiLin/v3.8-scheduleOnce-hotfix
...
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay parameter equal zero.
2015-08-27 10:54:04 +08:00
fcae139857
removed old WP8_SHADER_COMPILER defines
2015-08-26 08:50:11 -07:00
393af19237
[Node::scheduleOnce]Fixed the callback will be executed multiple times if the value of delay equal zero.
2015-08-26 23:41:48 +08:00
7f73415189
fix Scale9Sprite draw extra pixels in spritesheet
...
Fixed https://github.com/cocos2d/cocos2d-x/issues/13564
2015-08-26 16:15:00 +08:00
1bcc2dec37
Notification effect enhancement
2015-08-21 10:20:59 +08:00
1e415a0b5b
Merge pull request #13364 from WenhaiLin/v3-Scheduler-eloopfix
...
Fixed `Scheduler::update(float dt)` can lead to an infinite loop when the value of `dt` is zero.
2015-08-14 15:11:09 +08:00
d855722c20
Fixed `Scheduler::update` can lead to an infinite loop when the value of `dt` is zero.
2015-08-14 15:05:25 +08:00
7047e0fbdb
Merge branch 'v3' into downloader_decouple_squash
2015-08-13 11:07:49 -07: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
d333d24177
Fix bug: timer dt time error when interval = 0.
2015-08-13 12:55:07 +08:00
bb0a7a8533
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-11 14:28:52 +08:00
d0a5c02399
fix bug: #21906 Pause/Resume 's result not correct.
2015-08-10 17:58:49 +08:00
42ed314463
fix textfield and editbox can not input emoticon
...
fix textfield and editbox can not input emoticon and improve the api comments
2015-08-05 17:03:06 +08:00
fac7a78fc8
improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI
...
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
2015-08-05 16:10:14 +08:00
3230ca154d
improve the code. fix network error
2015-08-04 16:42:16 +08:00
00b7e98c89
improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak.
2015-08-04 16:24:08 +08:00
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
00a3d572d1
Merge pull request #12899 from super626/v3
...
Animate3D Callback and Bug fix
2015-08-01 18:24:05 +08:00
cd4d8b7880
Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
...
Improve coding style
2015-07-30 13:44:53 +08:00
a011fa4c8a
Merge pull request #12852 from super626/issue10242
...
fix #10242 , reload shader when light number changed
2015-07-30 12:57:32 +08:00
964e7103b5
Improve coding style
2015-07-30 11:33:18 +08:00
b1bd8338aa
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
2015-07-24 21:30:28 +08:00
37a174ee4a
Label:refine the implementation about text layout and support debug draw
2015-07-24 18:38:45 +08:00
20fe1fb1a8
Fix bug: app will crash if move mouse over window when launching.
2015-07-24 16:41:03 +08:00
92ec9ab5f2
add config loaded event
2015-07-24 16:38:30 +08:00
e4a8aeee45
Fixed #12962 : Scene can't have std::vector member.
2015-07-24 11:16:45 +08:00
3addf38134
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
2015-07-22 12:01:34 +08:00
ef49e5a169
merge cocos
2015-07-17 17:43:32 +08:00
bf20145e35
animate3d callback and test
2015-07-17 11:08:27 +08:00
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
7a105ce1e1
fixed #11310 : multiple camera case utils::captureScreen bug.
2015-07-15 12:09:08 +08:00
69e79ed164
fix #10242 , reload shader when light number changed
2015-07-15 11:36:53 +08:00
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
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
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
d1bef4db8d
Merge pull request #12369 from Dimon4eg/Fix_crash_cocos2d_log
...
Fix crash on Windows if pass string more than 16kb to cocos2d::log
2015-07-13 22:16:04 +08:00
3adecedcee
Merge pull request #12776 from fusijie/refine_capture
...
CaptureScreen save in thread.
2015-07-10 17:03:18 +08:00
9eb5a1833b
fix malloc failed need to call afterCaptured callback.
2015-07-10 11:21:03 +08:00
10fe728eee
animation quality default to low, do not interpolation
2015-07-09 17:54:21 +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
6f3b977c1e
add UserDefault api deleteValueForKey
2015-07-06 17:01:17 +08:00
17207f14e5
Merge pull request #12689 from fusijie/refine_setAnimationInterval
...
Refine setAnimationInterval from double to float.
2015-07-06 16:18:45 +08:00
4499b60446
Refine setAnimationInterval from double to float.
2015-07-06 14:57:42 +08:00
a01f31c75c
Change NULL to nullptr
2015-07-06 15:54:28 +09:00
d155d42c0e
Merge pull request #12617 from yangws/issue_8194
...
Fixbug :EventDispatcher wrong dispatch order
2015-07-02 14:42:30 +08:00
276ed46c01
Fixbug : issue 8194.
2015-07-01 14:39:35 +08:00
2ba6f266ad
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-30 14:32:14 +08:00
60834e6f0c
Merge branch 'v3' into v3-finish-android-9-patch-image-format
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-29 12:05:52 +08:00
30d2129f0c
improve indent and getTime function
2015-06-29 11:52:53 +08:00
19c57daf92
Merge pull request #12511 from samuele3hu/v3_7_test
...
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
2015-06-24 21:46:38 +08:00
63eb0d34f3
Fix crash of the some Texture2D test case about s3tc on the nexus9(android 5.0.1)
2015-06-24 16:11:36 +08:00
ecfe35489c
fix clearcolor bug which has no effect
2015-06-24 11:40:23 +08:00
90f9bf37cd
fix redmine issue #20277 RestartGameTest only used in native will crash
2015-06-23 14:41:41 +08:00
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
5d4e8aa275
Fix crash on Windows if pass string more than 16kb to cocos2d::log
2015-06-16 16:56:06 +03:00
271e3295eb
Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix
...
Fixed NotificationNode might crash program when the program exits.
2015-06-16 09:53:39 +08:00
b167ab3e78
StateBlock() is public
2015-06-15 17:43:37 -07:00
3c8d15f6f8
Fixed NotificationNode might crash program when the program exits.
2015-06-15 17:55:00 +08:00
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
e433ad305b
decopule physics and navmesh from Director
2015-06-09 13:49:07 +08:00
9acab65e4f
rename FrameBufferObject->FrameBuffer
...
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
d50c1823d4
merge cocos
2015-06-05 14:25:37 +08:00
d35a8a3a9e
add default FBO
2015-06-04 15:53:13 +08:00
fbd5a09cfd
issue #10323 : Fix the compile error when COCOS2D_DEBUG>=2.
2015-06-04 11:58:22 +08:00
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
67a323e14a
Fix a bug in Scheduler which may case Force Close
...
Fix a bug in Scheduler which may case Force Close
2015-05-28 10:53:46 +08:00
8d78fd31b7
add assert to make program more robust
2015-05-26 17:25:42 +08:00
c668001e73
fix assert failure of NinePatchImageParser and rapidjson
2015-05-26 17:20:10 +08:00
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
bf25a0429d
Merge pull request #11964 from WenhaiLin/v3-console-crash
...
[ci skip]Add comment.
2015-05-22 11:05:54 +08:00
a94a6baf87
[ci skip]Add comment.
2015-05-22 10:35:34 +08:00
d5d329b74f
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
...
add Android 9-patch image format support
2015-05-22 09:52:12 +08:00
678b279754
Merge pull request #11953 from MSOpenTech/v3-winrt-settings
...
V3: Windows 8.1 Universal App CCUserDefault implementation
2015-05-22 09:44:41 +08:00
2e5b604d2f
added CC_PLATFORM_WINRT to comments
2015-05-21 11:23:20 -07:00
992e292338
added winrt version of CCUserDefault
2015-05-21 11:21:46 -07:00
158181d4eb
Console:Fixed crash
2015-05-21 18:14:21 +08:00
0352a7a3ea
add Android 9-patch image format support
...
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
2015-05-21 16:04:37 +08:00
f1eae8f724
Merge pull request #11929 from namezero111111/patch-1
...
Fixed missing const-correctness
2015-05-21 09:38:24 +08:00
89152ef514
Fixed missing const-correctness
2015-05-20 17:19:42 +02:00
14e812c7d4
enable CC_USE_3D_PHYSICS for CC_PLATFORM_WINRT
2015-05-20 07:53:49 -07:00
1b9a36f041
removed CC_PLATFORM_WP8 code
2015-05-20 07:52:59 -07:00
dbf1b415a5
Merge pull request #11898 from WenhaiLin/v3-console-crash
...
Console:Fixed crash
2015-05-20 11:19:38 +08:00
aa027fbe0f
Properties fixes
...
`createNonRefCounted` instead of `CrateWithoutAutorelease`
`readlines()` code is easier to read. Same performance
2015-05-19 13:51:52 -07:00
80367e978d
Console:Fixed crash
2015-05-19 18:33:06 +08:00
f96e704f7d
Merge branch 'v3' into v3FrameBufferObject
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
2015-05-18 13:48:50 +08:00
Ricardo Quesada