leeda
18a6d8241d
update Copyright. might need manual fix later ( #18659 )
...
* Copyright use python script updated. might be fix by manual later
* Revert "Copyright use python script updated. might be fix by manual later"
This reverts commit 49e99418e4da1fd02afda448ddeb16210f5e8c71.
* re modify copyright, consider utf-8-sig encoding
* another situation, add Copyright before "Permission is hereby granted"
* Revert "another situation, add Copyright before "Permission is hereby granted""
This reverts commit ee82591d32353c7ce2e146fe51ef447433b47571.
* another situation, add Copyright before Permission is hereby granted
* change "Copyright (c) 2016-2016 Chukong Technologies Inc." to " Copyright (c) 2016 Chukong Technologies Inc."
* script modify copyright, consider is cocos copyright or not
* change "Copyright (c) 2017 Chukong Technologies Inc." to "Copyright (c) 2016 Chukong Technologies Inc."
* manual fix, not fix audio related
* change "2016-2016" to "2016"
2018-01-29 16:25:32 +08:00
minggo
e88a05e49a
Fix RenderTexture DepthAndStencil issue on Android ( #18648 )
...
* Fixing issue where Stencil and Depths buffers would not function for a render texture if you backgrounded an application, and then resumed.
* Fixing typo: bufffer -> buffer
2018-01-21 19:07:49 +08:00
minggo
38864456bf
fix issue that render texture will have wrong effect if using with global z order ( #18629 )
2018-01-18 14:28:40 +08:00
Shura L
ce5f37c7f5
set texture anti-alias by deault in RenderTexture ( #18442 )
...
fix issue #12459
2017-11-06 10:28:36 +08:00
CocosRobot
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
mogemimi
2b1d5768f0
Fix typo in RenderTexture: "Bufffer" -> "Buffer" ( #17235 )
2017-01-20 09:59:02 +08:00
mogemimi
87c29759f8
Fix typos in local variables ( #17236 )
2017-01-20 09:58:29 +08:00
James Chen
b397c93b01
fixed #16894 : RenderTexture does not support Sprite3D ( #16908 )
2016-11-28 09:50:45 +08:00
yahont
e9b39a99e2
cocos2dInternal cleaned of some warnings ( #16818 )
...
* cocos2dInternal cleaned of some warnings: unused parameters and signed-unsigned comparisons
* -Werror removed
* tab fixed
* indent fixed
* more warnings fixed
2016-11-09 10:34:50 +08:00
James Chen
b135d512d2
Update copyright to 2016. ( #16311 )
2016-08-05 09:42:15 +08:00
Mikhail Shulepov
7d6d677983
RenderTexture - set opacity modify RGB
2016-06-13 23:07:17 +03:00
Zhe Wang
1fbef195a3
Fix typos in CCRenderTexture.cpp commnets
...
Qualcomm Andreno GPU -> Adreno GPU
2016-02-29 16:22:56 +08:00
pandamicro
1030151047
Fix C++ crash caused by CC_ENABLE_GC_FOR_NATIVE_OBJECTS macro
2016-02-16 13:43:11 +08:00
pandamicro
cb4d24e1ee
Merge pull request #14759 from pandamicro/hbmemory
...
Implement Full GC Relied memory model
2016-02-14 14:48:01 +08:00
Wenhai Lin
4992037c5c
Avoid creating temporary string objects
2016-02-03 23:12:37 +08:00
pandamicro
fc19435123
Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory
...
Conflicts:
cocos/base/ccConfig.h
cocos/scripting/js-bindings/manual/ScriptingCore.cpp
cocos/scripting/js-bindings/manual/ScriptingCore.h
cocos/scripting/js-bindings/script/jsb_prepare.js
2016-01-18 16:40:00 +08:00
pandamicro
6a6407f711
Pass native references to script scope
2015-12-21 00:16:16 +08:00
kci
d3898991af
fix some logical error
2015-12-18 11:03:23 +09:00
kci
8a39c1a06a
Windows/osx/linux build fail bug fixed
2015-12-17 15:40:16 +09:00
kci
afc50be1ed
Fix #14428 CCRenderTexture does not work properly on some devices which does not support "GL_OES_packed_depth_stencil".
2015-12-17 10:34:51 +09:00
mogemimi
f280a31323
Fix typo in documentation and comments
2015-12-09 01:48:24 +09:00
mogemimi
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
Martin Taylor
62e36e8006
fix typos and syntax error. A thorough check by tool VSSpellChecker.
2015-09-22 16:08:23 +08:00
Jacky
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
Vincent Yang
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
Huabing.Xu
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
Jun Hiroe
e4d560b658
Replace tabs with spaces in cocos/2d dir
2015-01-08 20:17:45 +09:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Vladimir Timofeev
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
andyque
67ad24e7c1
remove orderOfArrival = 0
2014-09-11 15:44:31 +08:00
Ricardo Quesada
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
Ricardo Quesada
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
minggo
7baf873bf6
remove unneeded includes
2014-08-28 17:03:29 +08:00
Ricardo Quesada
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
yangxiao
1942a27a5c
Merge branch 'newcode' into v3_merge
2014-08-14 13:55:57 +08:00
yangxiao
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
yangxiao
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
yangxiao
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
Huabing.Xu
3a7b673164
add callback for RenderTexture::saveToFile
2014-08-12 10:50:57 +08:00
huangshiwu
9c87522199
little more modefy
2014-08-04 17:34:50 +08:00
huangshiwu
9a3f231771
merge v3 into v3_wp8glviewhookpr
2014-08-04 16:49:42 +08:00
huangshiwu
efcb8b9962
wp8 glview hook solution 1
2014-08-04 14:17:14 +08:00
visiblelight
7e7c3aeb1c
The orientation of render texture should be rotated when _keepMatrix is true
2014-07-17 19:53:35 +08:00
vision
a2413a6538
no need to save/restore for render texture when entering background
2014-07-17 17:03:10 +08:00
vision
33fb1dd050
Make the API more extendable
2014-06-13 15:27:59 +08:00
vision
7e99121af7
Change the default pixel format from RGB to RGBA for render texture when saving as PNG.
2014-06-13 13:35:18 +08:00
Ricardo Quesada
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
Ricardo Quesada
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
2014-05-16 14:36:00 -07:00