pandamicro
|
117a72fa07
|
Merge pull request #12514 from WenhaiLin/v3-37-autotest-timeoutfix
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
|
2015-06-24 23:07:38 +08:00 |
pandamicro
|
f9db471026
|
Merge pull request #12495 from super626/v3
Fix terrain getIntersectionPoint
|
2015-06-24 18:36:52 +08:00 |
WenhaiLin
|
a7632a962f
|
[Cpp-tests]Fixed cannot start auto test again if the timeout has occurred.
|
2015-06-24 18:24:16 +08:00 |
XiaoFeng
|
0846dadbc3
|
Add a text label to Node3DReader Test, notice user there has no content to show
|
2015-06-24 14:58:14 +08:00 |
yangxiao
|
c3593c9d64
|
merge cocos
|
2015-06-23 18:29:39 +08:00 |
yangxiao
|
251c81d7be
|
Merge branch 'newcode' into v3
|
2015-06-23 18:25:41 +08:00 |
子龙山人
|
fca9b89a4c
|
Merge pull request #12480 from andyque/fix-rapidjson-assert-error
fix rapidjson assert error
|
2015-06-23 15:34:47 +08:00 |
andyque
|
70b709f4a8
|
fix rapidjson assert error
|
2015-06-23 13:54:11 +08:00 |
pandamicro
|
4823cc3bc2
|
Merge pull request #12476 from super626/fps
show fps in scene3d demo
|
2015-06-23 13:42:26 +08:00 |
子龙山人
|
d8a2695620
|
Merge pull request #12473 from WenhaiLin/v3-37-ParticleDemo-crashfix
[cpp-tests] ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
|
2015-06-23 13:36:36 +08:00 |
yangxiao
|
a433d57807
|
show fps
|
2015-06-23 11:56:50 +08:00 |
WenhaiLin
|
a68874d3cb
|
Node: Particles --> ParticleIssue12310:Fixed crash when tap left/right arrow to move to another test case.
|
2015-06-23 11:00:23 +08:00 |
andyque
|
931011809d
|
fixed unintended spaces in string
|
2015-06-23 10:38:43 +08:00 |
WenhaiLin
|
6bd46fcfcc
|
[ci skip]UIRichTextTest:Fixed text don't render properly in the Windows 8.1 Store App.
|
2015-06-20 17:07:11 +08:00 |
WenhaiLin
|
d32a317ea0
|
Label:Fixed line wrap error without space.
|
2015-06-19 13:39:19 +08:00 |
tangziwen
|
1989de7a04
|
fix terraintest and Terrain::getInstersectionPoint()
|
2015-06-18 12:20:44 +08:00 |
tangziwen
|
4187ea2241
|
fix Scene3D test
|
2015-06-18 10:17:46 +08:00 |
WuHao
|
aeeed0f4ab
|
Merge remote-tracking branch 'origin' into fix_spritepolygon
# Conflicts:
# external/config.json
|
2015-06-16 11:19:20 +08:00 |
Ricardo Quesada
|
b167ab3e78
|
StateBlock() is public
|
2015-06-15 17:43:37 -07:00 |
Ricardo Quesada
|
ca3da86da7
|
StateBlock::restore() is public
It is possible to restore to default state
|
2015-06-15 14:12:44 -07:00 |
WuHao
|
27d0f51e9b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
|
2015-06-15 16:13:36 +08:00 |
pandamicro
|
0216d05eee
|
Merge pull request #12102 from super626/navigation2
3D Navigation
|
2015-06-15 13:39:05 +08:00 |
yangxiao
|
97ef7974bb
|
create agent in the onEnter
|
2015-06-15 11:57:05 +08:00 |
Ricardo Quesada
|
a8cf72dc43
|
pass bits to invalidate
|
2015-06-12 17:14:09 -07:00 |
Ricardo Quesada
|
4278bf51b1
|
Adds RenderState::StateBlock::invalidate();
handy function to restore the GL state to the default one.
Only use it if calling GL calls directly
|
2015-06-12 16:47:08 -07:00 |
Ricardo Quesada
|
d9b0b2ca38
|
more fixes
|
2015-06-12 15:28:29 -07:00 |
pandamicro
|
9806c09b0e
|
Merge pull request #12299 from WenhaiLin/v3-label-cropped
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
|
2015-06-12 21:33:09 +08:00 |
子龙山人
|
c01d1fe00a
|
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
|
2015-06-12 16:44:12 +08:00 |
Jacky
|
29c108bdef
|
Merge remote-tracking branch 'origin' into fix_spritepolygon2
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
|
2015-06-12 16:28:41 +08:00 |
WenhaiLin
|
4d97d5075b
|
Add test case for issue12310.
|
2015-06-12 15:39:57 +08:00 |
子龙山人
|
7a9b48bd83
|
Merge pull request #12214 from andyque/optimize-ui-memory-usage
Optimize ui memory usage
|
2015-06-12 10:11:21 +08:00 |
WenhaiLin
|
5aa31ea83a
|
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
|
2015-06-11 17:16:44 +08:00 |
子龙山人
|
43555272d5
|
Merge pull request #12236 from WenhaiLin/v3-box2d-compilefix
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-11 16:34:45 +08:00 |
yangxiao
|
44c2b0d5ad
|
merge cocos
|
2015-06-11 15:54:42 +08:00 |
WenhaiLin
|
aff2f8c2c4
|
Fixed compile error.
|
2015-06-11 14:42:03 +08:00 |
samuele3hu
|
1b20e463d8
|
Update the Lua binding about the Polygon and update the test case.
|
2015-06-11 14:38:38 +08:00 |
Huabing.Xu
|
10352c40b2
|
Merge branch 'v3' into v3FrameBufferObject
# Conflicts:
# cocos/2d/CCCamera.h
|
2015-06-10 10:16:42 +08:00 |
Huabing.Xu
|
3e331128c6
|
file rename CCFrameBufferObject->CCFrameBuffer
|
2015-06-09 15:32:12 +08:00 |
Jacky
|
562d4b9a78
|
fix on the windows.
|
2015-06-09 11:23:37 +08:00 |
Huabing.Xu
|
9acab65e4f
|
rename FrameBufferObject->FrameBuffer
Move FrameBufferObject related class to experimental namespace
|
2015-06-09 10:59:43 +08:00 |
WuHao
|
a67e570ef7
|
deleted more leftover comments, placed polygon test further down the tests
|
2015-06-08 15:40:18 +08:00 |
WuHao
|
2650de030c
|
modified tests to show current epsilon
|
2015-06-08 15:08:16 +08:00 |
WuHao
|
0808b6aff9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
cocos/2d/MarchingSquare.cpp
|
2015-06-08 13:59:26 +08:00 |
WenhaiLin
|
784f142f91
|
Fixed compile error cause by enable CC_ENABLE_BOX2D_INTEGRATION.
|
2015-06-08 11:06:02 +08:00 |
Jacky
|
3e62dd0473
|
remove unused file and code.
|
2015-06-06 13:31:25 +08:00 |
andyque
|
56b7037c5f
|
optimize uislider memory usage
|
2015-06-05 17:16:10 +08:00 |
pandamicro
|
399ecfcb9f
|
Merge pull request #12176 from super626/fixphysics3d
rename syncToNode and syncToPhysics
|
2015-06-05 16:02:45 +08:00 |
andyque
|
6390f063fe
|
optimize UILoadingBar memory usage
|
2015-06-05 15:57:39 +08:00 |
yangxiao
|
d50c1823d4
|
merge cocos
|
2015-06-05 14:25:37 +08:00 |
andyque
|
a7141bab38
|
improve imageView memory usage
|
2015-06-05 14:19:05 +08:00 |