a51a32fa9d
1, add onEnter and onExit of components to CCNode's onEnter and onExit function.
2015-06-03 15:10:48 +08:00
76ad42bb0b
configure recast project for win8.1 project
2015-06-03 14:31:12 +08:00
5f6f38616a
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
2015-06-02 17:05:05 -07:00
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
3d4606921b
merge cocos
2015-06-02 14:27:31 +08:00
3c5326ba1f
removed spritePolygon, merge into sprite and draft of AutoPolygon
2015-06-02 10:10:09 +08:00
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
739923a4a3
Merge branch 'v3' into v3Viewport
2015-06-01 09:41:45 +08:00
e0c65c203a
Merge branch 'v3' into v3-uwp
2015-05-29 08:09:05 -07:00
3d62805d04
Merge branch 'v3' into fix_spritepolygon
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +08:00
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
e69a6116fa
make SpritePolygonInfo extend from Ref.
2015-05-29 16:44:06 +08:00
9bf15877e5
add applyViewport in camera.
2015-05-29 15:52:06 +08:00
8df4920f6e
fixed file name.
2015-05-29 15:03:36 +08:00
2f32fcabba
Merge branch 'v3FrameBufferObject' into v3Viewport
2015-05-29 14:10:49 +08:00
b2579a754a
refactor, use Camera::apply() to apply Rendertarget and Viewport
2015-05-29 14:08:20 +08:00
1fb0ba112b
init code for viewport
2015-05-29 13:47:29 +08:00
b714dde0ea
Add opengl version project/unproject function in camera.
2015-05-29 10:44:48 +08:00
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
8584f5f399
removed old WP8 files
2015-05-28 15:03:36 -07:00
2a71407501
fixed double to float conversion compiler warning
2015-05-28 15:00:49 -07:00
dadbbc18d6
added Windows 10 UWP project files
2015-05-28 13:51:25 -07:00
962393233f
removed old winrt property sheets
2015-05-28 13:12:37 -07:00
a76018041e
Merge pull request #12077 from WenhaiLin/v3-label-mlinefix
...
Text:Fixed the scale factor may be incorrect with multiline text.
2015-05-28 17:20:33 +08:00
2d6d1b7a8c
add android background and foreground switch support for framebufferobject
2015-05-28 17:08:36 +08:00
c60112a634
Text:Fixed the scale factor may be incorrect with multiline text.
2015-05-28 11:56:43 +08:00
9a4a545025
Issue #10570 : Make getItemForTouch of Menu virtual.
2015-05-28 11:41:49 +08:00
b8fdb152fd
Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue
...
fix assert failure of NinePatchImageParser and rapidjson
2015-05-27 11:17:31 +08:00
06a5f7ed7a
moved CCNinePath files to base folder in solution
2015-05-26 09:48:25 -07:00
d146f26144
define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds
2015-05-26 09:46:15 -07:00
d7ad7221e4
ciskip add doc for camera::getnear/farplane().
2015-05-26 18:14:37 +08:00
c668001e73
fix assert failure of NinePatchImageParser and rapidjson
2015-05-26 17:20:10 +08:00
246913c092
Fix bug: skybox can't move to other position except origin point in world space.
2015-05-26 17:14:26 +08:00
83bae15caf
Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-05-26 12:06:05 +08:00
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
bcc1bf8d32
Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
...
use trianglescommand for sprite
2015-05-25 16:48:22 +08:00
311f453ea0
Merge pull request #11973 from dabingnn/v3_fixCameraVisitError
...
Fix visiting scene error with multiple camera
2015-05-22 17:16:30 +08:00
6d9f850e2c
use trianglescommand for sprite
2015-05-22 15:54:56 +08:00
27b7f2dd19
Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash
...
TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 14:37:23 +08:00
0644efc55e
isVisitableByVisitingCamera should not affect the calculation of transform
2015-05-22 13:59:45 +08:00
fdde58386f
experimental::TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 11:14:34 +08:00
2f558b5793
Merge branch 'tmx-crash-fix' of https://github.com/dumganhar/cocos2d-x into v3-support-android-studio
2015-05-22 11:01:13 +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
382d681250
added winrt version of CCUserDefault
2015-05-21 11:23:36 -07: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
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
9ac23a5436
Merge pull request #11933 from kobake/fix-typo-angel
...
Fix typo: "angel" to "angle"
2015-05-21 09:37:53 +08:00
d6f7a0a8a1
Fix typo. angel -> angle
2015-05-21 09:22:59 +09:00
209e7c62f4
added libbullet to Windows 8.1 Universal App projects
2015-05-20 08:01:01 -07:00
07f6774cee
Crash fix for referring a non-existent layer in tmx.
2015-05-20 11:29:52 +08:00
bbaa60bbbb
change to autopolygon.
2015-05-20 06:07:50 +08:00
ea345717c7
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
2015-05-18 23:40:28 -07:00
628619a694
Add CCFrameBufferObject files to win32 and win8 vcproj.
2015-05-19 11:53:08 +08:00
bb3ad7d249
Merge pull request #11677 from tankorsmash/patch-1
...
Fix setSprite never updating progress on ProgressTimer
2015-05-19 11:42:20 +08:00
514c8ae965
move sprite polygon logic to sprite polygon cache.
2015-05-19 11:25:53 +08:00
e0b3091dcf
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
...
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-05-18 19:21:48 -07:00
bcfa29a7d7
fixed memory leakage.
2015-05-18 15:52:46 +08:00
d21f85787e
fixed memory leakage, remove unused header, fixed reference args.
2015-05-18 15:10:41 +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
384041a950
improve the perfermance of clear background for camera
2015-05-18 10:31:17 +08:00
2db5a89b87
Added new audio engine with wav support
2015-05-15 18:17:52 -07:00
19c5d2dc84
fixed some memory leakage and pixel cutting.
2015-05-15 17:18:19 +08:00
84540c1ff4
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-14 11:55:10 +08:00
42514ee62f
FrameBufferObject works
2015-05-13 14:24:53 +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
5c227f4c92
Merge pull request #11528 from hobogenized/my_fix_branch
...
Minor changes in variable names to fix Xcode warnings
2015-05-13 10:03:33 +08:00
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
f0acf7ee7b
original version of frame buffer object
2015-05-12 16:43:17 +08:00
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
398d36b58a
Merge pull request #11788 from joshuastray/spritepolygon
...
SpritePolygon binding and tests for js
2015-05-12 13:46:22 +08:00
1937431596
Material uses new file format
...
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
2015-05-11 21:31:33 -07:00
7a4ca3fe6a
add new files to project
2015-05-12 10:40:51 +08:00
cc0b3ffd2e
Merge branch 'v3' into v3_addClearforCamera
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-12 09:49:15 +08:00
7e0dc7482b
Label:Fixed the characters with outline not on the same base line.
2015-05-11 18:05:03 +08:00
bcd57c3d90
Merge pull request #11776 from samuele3hu/v3_physics3d
...
Add macro limitation for Physic3D related
2015-05-11 16:09:19 +08:00
9e9494ded0
Add limited macro for related Physic3D
2015-05-11 15:34:37 +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
713831ca76
fix rendering of camera clear quad
2015-05-08 14:21:23 +08:00
f064587ae5
refactor camera clear to immediate rendering
2015-05-07 18:32:32 +08:00
23e4e0d4e3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-07 16:21:03 +08:00
67ec758d15
add clear feature when before draw scene with a camera
2015-05-07 15:09:06 +08:00
65ec7f9545
Merge pull request #11728 from WenhaiLin/v3-label-pos
...
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 13:42:28 +08:00
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
03a1167902
Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7
2015-05-07 11:31:59 +08:00
d09bd21da4
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 11:20:22 +08:00
87db3aba78
Add $(EngineRoot)external for cocos2d_headers.props
2015-05-07 11:11:33 +08:00
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
fb112995d8
Merge pull request #11491 from milos1290/tween
...
Adding FloatAction to animate any property over time.
2015-05-07 09:34:44 +08:00
ba1e77d656
Merge pull request #11720 from WenhaiLin/v3-label-outline
...
Label:Fixed outline doesn't match with the characters exactly.
2015-05-07 09:30:37 +08:00
b1803d40db
Label:Fixed outline doesn't match with the characters exactly.
2015-05-06 17:17:30 +08:00
6351863b3c
Merge pull request #11696 from WenhaiLin/v3-label-shadow-glerror
...
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-06 09:53:39 +08:00
37302d6d8f
Merge pull request #11704 from MSOpenTech/v3-winrt-fix
...
V3: WinRT updated output name to libcocos2d_v3.7
2015-05-06 09:41:11 +08:00
26bca75e0e
Merge pull request #11708 from ricardoquesada/no_exceptions
...
No throws in cocos2d-x code
2015-05-05 17:57:28 -07:00
10b71464a7
No throws in cocos2d-x code
2015-05-05 17:17:41 -07:00
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
22951e8a6a
updated output name to libcocos2d_v3.7
2015-05-05 14:54:33 -07: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
8f6277c540
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-05 18:30:33 +08:00
902c033838
Merge pull request #11683 from WenhaiLin/v3-label-i10576
...
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-05 18:19:33 +08:00
f1b5729183
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-05 16:14:57 +08:00
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
701d5fa827
Merge pull request #11673 from vovkasm/dev/v3-cleanup
...
Fix warnings in v3.
2015-05-05 11:26:10 +08:00
22c46b5c14
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-04 10:07:37 +08:00
88833213ca
Fix setSprite never updating progress on ProgressTimer
...
Basically whenever you set a new sprite on a ProgressTimer, the new sprite is hidden.
Calling setPercentage once with the same value doesn't work because the new percentage is the same as the old one. I've got a workaround setting the percentage to 0 and then back to the old value, but this change seems to solve that issue entirely.
2015-05-03 14:35:50 -04:00
004cb5464e
Fixed crash
2015-05-03 22:15:58 +08:00
fd3e44b72b
Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms.
2015-05-01 12:36:19 +03:00
7472bafee3
Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program.
2015-04-30 15:13:41 +08:00
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
904abeab87
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 09:48:14 -07:00
ce7e36f76e
Fixed warns and crash on Win32.
2015-04-28 20:10:56 +08:00
0343fd4061
Changing the name of the Action, adding more comments
2015-04-28 11:48:19 +02:00
1af9ce8483
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
2015-04-28 13:36:34 +08:00
854fcdf2bf
fix spritepolygon
2015-04-28 11:26:21 +08:00
a6a2dddfe9
fix spritepolygon
2015-04-28 10:51:26 +08:00
41e2d84116
Fixed compile error on VS 2012.
2015-04-28 10:35:21 +08:00
a046f74c4d
fix anchor point bug
2015-04-27 17:30:38 +08:00
dcf8f674bc
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
...
Conflicts:
cocos/2d/SpritePolygon.cpp
cocos/2d/SpritePolygonCache.cpp
2015-04-27 17:18:26 +08:00
815c6a9b74
merge the start and end points
2015-04-27 16:33:54 +08:00
3de665b9cd
Update SpritePolygon
2015-04-27 15:19:26 +08:00
c7e990dcae
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
...
Conflicts:
cocos/2d/SpritePolygon.cpp
2015-04-27 13:39:41 +08:00
9f2ea5fbb9
fixed some SpritePolygon create, added more tests
2015-04-27 13:34:47 +08:00
d7dbb910d0
Update SpritePolygonCache
2015-04-27 11:57:36 +08:00
cf53d13f6f
Update SpritePolygon.cpp
2015-04-27 11:07:08 +08:00
6f17dcecf2
Update config.json for 3rd-party-libs and SpritePolygonCache
2015-04-27 11:01:47 +08:00
c2cefadb6f
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
2015-04-27 10:44:56 +08:00
cd0ebc1801
fix the info struct
2015-04-27 10:44:23 +08:00
bd5ca083e9
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
2015-04-26 23:08:14 +08:00
633c1aed75
Add EaseRateAction::create() method.
2015-04-24 18:31:44 +08:00
9496a48800
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-24 18:29:23 +08:00
c1d10ffa1c
fixed poly2tri creation method, added testCase
2015-04-24 18:28:28 +08:00
5620da1adf
fixed anchor point issue, removed rect rotated property
2015-04-24 18:17:12 +08:00
0e318dd8dc
fixed UV issue, also taking account of contentScaleFactor, made test case better
2015-04-24 17:39:43 +08:00
0198c8707b
Merge pull request #11572 from super626/v3
...
Fix memory leak
2015-04-24 16:42:33 +08:00
07725ce84d
fix
2015-04-24 11:40:15 +08:00
07349ff588
initial cpp test
2015-04-23 18:03:03 +08:00
faddbd8e71
Add function to texture cache for studio to check if texture have been already loaded
2015-04-23 16:50:28 +08:00
ada7ced0a8
change getVecCount to ssize_t
2015-04-23 16:40:11 +08:00
1ee87140b1
renamed PolySprite to SpritePolygon
2015-04-23 14:34:56 +08:00
7c77bc9587
Add the PolySprite support and adjust the project setting on the different platform
2015-04-23 00:51:47 +08:00
0f3ff6f762
Merge branch 'v3' into v3-winrt-typo-fix
2015-04-21 18:18:00 -07:00
84a47000b5
rename -win to -winrt
2015-04-21 18:17:18 -07:00
a2ed8e7234
disable INCREMENTAL for ARM builds. Fixes lnk2013 error
2015-04-21 08:38:19 -07:00
4f96037e15
1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3
...
2. fix bug: memory leak!
2015-04-21 19:38:38 +08:00
22df7df76a
Renamed shadowed variables to reduce confusion when reading source code
2015-04-20 22:57:55 -04:00
7a1a021974
Merge pull request #11517 from andyque/fix-widget-gray-shader-issue
...
Fix widget gray shader issue
2015-04-21 09:34:18 +08:00
484153aff7
remove ui shaders in windows platform
2015-04-20 17:54:49 +08:00
1e514f0a2b
fix freetype include path on win-8.1
2015-04-20 15:54:31 +08: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
zhangcheng