andyque
56e333dc9b
fix crash on mac
2015-01-05 16:02:46 +08:00
andyque
2a266efc1a
fix CurlTest error code 23 on Windows
2015-01-05 15:55:40 +08:00
raydelto
e20c347767
Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID
2014-12-31 20:51:45 -04:00
Dale Stammen
5c79bf996d
delete first pass of allocations before starting second pass
2014-12-30 21:24:49 -08:00
minggo
d517831e01
Merge pull request #9699 from super626/fixandroid
...
fix background/foreground switch
2014-12-30 17:07:38 +08:00
yangxiao
3377c3ee53
fix #9689
2014-12-30 11:54:53 +08:00
yangxiao
bfb577e385
fix ##9689
2014-12-30 11:48:39 +08:00
minggo
3c1978fcc3
Merge pull request #9611 from super626/quaternion
...
Rotation With Quaternion
2014-12-30 10:09:08 +08:00
Thomas Hou
1502d32aac
use std math library M_PI instead of pi.
2014-12-29 16:24:31 +08:00
yangxiao
060c6ee0b7
add quaternion test
2014-12-29 14:36:25 +08:00
lvlong
f592671df6
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
lvlong
fdb498a8d2
camera test
2014-12-26 13:37:02 +08:00
minggo
491d36c62b
Merge pull request #9626 from liamcindy/CocoReader
...
update for cocos reader
2014-12-26 09:29:37 +08:00
andyque
29e9ef7edf
Merge branch 'v3' into modifyWidgetDefaultBehavior
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
Liam
fa85faec68
update for cocos reader
2014-12-25 15:02:22 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
youyou
db6ffd7962
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x ; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-24 15:59:50 +08:00
yusheng.lu
c64792959c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-24 15:32:02 +08:00
minggo
bb9fb9f0d6
Merge pull request #9591 from liamcindy/Layout
...
update for lay out
2014-12-24 14:27:08 +08:00
yusheng.lu
fa5b4f8df7
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
2014-12-24 13:06:38 +08:00
Liam
83fcf74882
update for code format
2014-12-24 10:56:01 +08:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
huangshiwu
01eeb15a8d
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
yusheng.lu
d543f8f6a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-23 16:12:50 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
Liam
e4360b7616
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
2014-12-23 14:15:55 +08:00
yusheng.lu
7eedef71e6
armature node test completed
2014-12-23 11:13:05 +08:00
yangxiao
3d77c7535d
merge cocos
2014-12-23 10:35:35 +08:00
Liam
2991b57ec6
update lay out reader and samples
2014-12-22 18:24:06 +08:00
lvlong
db9f4a23fe
feedback commit.
2014-12-22 18:13:07 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +08:00
lvlong
abd9a35504
CameraClippingDemo: change the sprite number.
2014-12-22 17:48:34 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
minggo
feacf75f12
Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
...
#9555 MoveTo and MoveBy support Vec3
2014-12-22 15:57:12 +08:00
minggo
6195d260c1
Merge pull request #9574 from super626/v3
...
Add new test
2014-12-22 15:25:14 +08:00
Liam
8b32193e04
reset unused format changed
2014-12-22 15:15:40 +08:00
Liam
7c4d31feab
update for lay out samples
2014-12-22 14:51:50 +08:00
minggo
1268f73a7c
MoveTo and MoveBy support Vec3
2014-12-22 14:34:35 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
tangziwen
68177e41e9
update
2014-12-19 17:39:26 +08:00
tangziwen
395cf929a8
update
2014-12-19 17:22:17 +08:00
XiaoYang
9102c77840
Merge pull request #182 from lvlonggame/v3
...
camera frustum update
2014-12-19 16:14:01 +07:00
tangziwen
95bcfaaa3e
update test 15:29
2014-12-19 15:31:06 +08:00
tangziwen
1bbe9e249d
fix coding style
2014-12-19 11:22:59 +08:00
yangxiao
7137e49cd4
modify async load test fix crash
2014-12-19 10:22:42 +08:00
tangziwen
591edd8bad
update test
2014-12-19 09:05:53 +08:00
lvlong
a5746dd2a0
1. modify Android.mk
...
2. modify DrawNode3D include path
2014-12-18 18:14:16 +08:00
lvlong
f6bea9b6bb
1.add camera culling.
...
2.add camera culling sample.
3.fix bug: load .obj file material.
2014-12-18 17:18:22 +08:00
tangziwen
086bca399f
add three samples -- toonshader fakeshadow lightmap
2014-12-18 16:09:29 +08:00
tangziwen
73014e8be3
asdasd
2014-12-17 13:31:35 +08:00
lvlong
73a2a6385a
add frustum culling.
2014-12-16 16:34:35 +08:00
mannewalis
9be9c09a9f
fixes to cpp-tests for android allocator tests
2014-12-15 16:21:39 -08:00
yangxiao
5ad408530c
merge cocos
2014-12-15 17:47:05 +08:00
mannewalis
bc7757a366
adding allocator system
2014-12-12 08:57:06 -08:00
minggo
cf8b6120a0
Merge pull request #9481 from super626/v3
...
CullFace state change bug and fix #9465
2014-12-12 15:48:31 +08:00
yangxiao
34b21dad6d
invalid texture parameter on release mode fix #9465
2014-12-12 15:05:55 +08:00
pipu
70b9767c56
1. Fixes #4957 that click test TestChangePlaySection, then it will crash.
...
2. Modify default value of selectedState to serialize check box data.
2014-12-11 11:34:31 +08:00
minggo
eef6d08813
Merge pull request #9402 from doomsdayer/v3_listview
...
V3 listview
2014-12-10 11:13:42 +08:00
yusheng.lu
7426a32d9f
1. ListView demo compeleted.
...
2. Optimized ListViewReader format.
2014-12-08 19:00:12 +08:00
yangxiao
2a445ef1d9
correct unsuitable word
2014-12-05 16:44:49 +08:00
yangxiao
5e86d71fcc
modify async load sample
2014-12-05 15:44:09 +08:00
yangxiao
c99185b755
add async load test
2014-12-05 15:01:30 +08:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
minggo
95302e18cc
Merge pull request #9354 from huangshiwu/v3_clippingnode
...
modify Clipping to RenderTexture Test to get correct behavior
2014-12-05 09:28:36 +08:00
youyou
2b7ead06de
update timeline test
2014-12-04 16:49:43 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
pipu
6d764bc2c8
Merge branch 'v3' into v3_flatbuffers
...
Conflicts:
tools/cocos2d-console
2014-12-03 15:47:03 +08:00
kaile.yin
fd69a5efc3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-03 15:22:46 +08:00
huangshiwu
ca10211b25
modify Clipping to RenderTexture Test to get correct behavior
2014-12-03 14:17:42 +08:00
minggo
2e45d7d0d6
Merge pull request #9302 from samuele3hu/v3_test
...
Fix some errors about cpp-tests and lua-tests
2014-12-03 14:05:50 +08:00
pipu
06a0026632
Update ActionTimelineTestScene
2014-12-02 16:00:30 +08:00
minggo
4d2ea40db0
Merge pull request #9265 from shrimpz/fix_label_crashed_on_android
...
Fix label crashed on android #9255
2014-12-02 15:48:10 +08:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
pipu
22b044805c
Add callback parse
2014-12-01 21:50:05 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
yangxiao
b476e65c6a
Merge branch 'newcode' into fixsprite
2014-11-28 14:33:04 +08:00
yangxiao
437ee04d5d
fix linux
2014-11-28 14:12:38 +08:00
samuele3hu
c1f718c3fd
Fix cpp-test compile error and a bug of Confined
2014-11-28 10:40:41 +08:00
Ricardo Quesada
fe4b34fcc3
Merge pull request #9260 from ricardoquesada/sprite_perf_test_automated
...
Sprite Performance Test automation works OK
2014-11-27 10:06:10 -08:00
Ricardo Quesada
7c89e9e94d
Compiles on VS2012
...
...hopefully. Using _MSC_VER < 1800 for CC_ROUND
2014-11-27 08:58:07 -08:00
Ricardo Quesada
1a2acb9039
including <math.h> to make VS2012 Express happy
2014-11-27 07:28:07 -08:00
Ricardo Quesada
4f3621b85c
Compiles on VS2012...
...
hopefully
2014-11-26 20:23:16 -08:00
Ricardo Quesada
bfb79b6a9e
CCRANDOM_() uses std::rand() because it can be seeded with std::srand()
...
plus other minor fixes in perf tests
2014-11-26 20:07:42 -08:00
Shrimpz
c15f353382
* added a testcase for issue #9255
2014-11-27 11:03:11 +08:00
Ricardo Quesada
db71d562e9
Compiles on VS2013
2014-11-26 18:35:14 -08:00
Ricardo Quesada
74a5bbf280
some fixes for perf tests
2014-11-26 18:11:53 -08:00
minggo
e8cff91bd7
Merge pull request #9248 from andyque/fixTextIgnoreContentSizeIssue
...
Fix text ignore content size issue
2014-11-27 09:57:33 +08:00
Ricardo Quesada
96e089be76
Sprite Performance Test automation works OK
2014-11-26 16:55:39 -08:00
Ricardo Quesada
1361f2c619
Director users a low-pass filter to display the FPS
...
FPS is more stable. Uses a 5% low-pass filter
2014-11-26 13:31:44 -08:00
andyque
e118b085b8
add UIText bug fix tests
2014-11-26 15:05:20 +08:00
minggo
dbb473fdcb
Merge pull request #9203 from dumganhar/arm64-juno
...
Some updates for neon64 instruction
2014-11-26 11:46:19 +08:00
minggo
3d7c3257b0
Merge pull request #9238 from ricardoquesada/guideline_fixes
...
Code conforms with the cocos2d-x c++ guidelines
2014-11-26 10:49:58 +08:00
Ricardo Quesada
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
Ricardo Quesada
4cc59a9a0f
Merge pull request #9201 from MSOpenTech/v3-win8.1-appstate
...
V3 win8.1 universal app pause and resume support
2014-11-25 14:43:42 -08:00
Ricardo Quesada
9b5f147224
Fixes in async test
...
code is cleaner
2014-11-25 10:43:58 -08:00
Dale Stammen
8da06fb9cc
Merge branch 'v3' into v3-win8.1-appstate
2014-11-25 08:07:29 -08:00
James Chen
6998d91781
MathUtilTest is only available for optimized instructions.
2014-11-25 16:36:07 +08:00
James Chen
e31a3fce83
Typo fix for the name of MultiTouchTest
2014-11-25 10:33:16 +08:00
James Chen
9248b56bde
Adds UnitTest for MathUtil
2014-11-25 10:33:16 +08:00
James Chen
9760dce4c0
Updates loop count and step count for Math performance test.
2014-11-25 10:33:16 +08:00
James Chen
54cd36d2d1
Adds Math Performance test.
2014-11-25 10:33:15 +08:00
minggo
b8bb61c7c6
Merge pull request #9028 from andyque/fixWidgetFlipIssue
...
Fix widget flip issue
2014-11-24 15:19:50 +08:00
Dale Stammen
316b68f783
added winrt and wp8 support for EVENT_RENDERER_RECREATED
2014-11-21 10:30:49 -08:00
Dale Stammen
7aaad84022
added winrt and wp8 support for EVENT_RENDERER_RECREATED
2014-11-21 10:30:14 -08:00
Dale Stammen
34df482893
disabled mandlebrot, julia and blur shader tests for winrt and wp8
2014-11-21 10:29:36 -08:00
Vladimir Timofeev
a689fc4c7e
sync with upstream
...
Conflicts:
CMakeLists.txt
2014-11-20 12:19:00 +03:00
yangxiao
3c0779885d
refact reskin test code
2014-11-19 16:50:09 +08:00
kaile.yin
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +08:00
Ricardo Quesada
dcc4c46d5b
Using std::swap instead of CC_SWAP
...
CC_SWAP is deprecated. Use `std::swap` instead.
2014-11-16 09:29:05 -08:00
Vladimir Timofeev
210d8ec985
Compile Box2D tests only if library used in cocos.
2014-11-15 21:16:01 +03:00
Ricardo Quesada
ac5ffea643
Merge pull request #9101 from super626/v3
...
Add uv animation test
2014-11-14 14:18:37 -08:00
yangxiao
e8fbf4d071
remove space line
2014-11-13 14:21:19 +08:00
yangxiao
ba51065f3a
remove space line
2014-11-13 14:19:51 +08:00
yangxiao
7395fb70f6
refact code style
2014-11-13 14:16:38 +08:00
tangziwen
c33777a45a
remove dummy log
2014-11-13 11:57:18 +08:00
tangziwen
8101b6a94e
add UV Animation Test & it's resource
2014-11-12 17:42:45 +08:00
Dhilan007
e071e5c896
Fix Label may display incomplete for multiline text with outline feature enabled.
2014-11-12 17:24:35 +08:00
andyque
16d0419136
fix compile error
2014-11-10 16:02:06 +08:00
andyque
8433127b45
finish tests
2014-11-07 11:11:51 +08:00
andyque
4bfa94b8c2
add button flip test
2014-11-07 11:11:51 +08:00
andyque
5483bc834d
fix scale9sprite flip issue
2014-11-07 11:09:22 +08:00
minggo
25053b80bc
Merge pull request #8930 from super626/fixsprite
...
add Sprite3D::getMeshArrayByName and refactor re-skin test
2014-11-05 18:11:51 +08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
Ricardo Quesada
2ec1170943
treat warnings as errors in samples
2014-11-04 15:42:29 -08:00
Dale Stammen
fa70e066a1
enabled FastTileMap test for WP8
2014-10-29 09:17:31 -07:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
yangxiao
20decd5a39
refact reskin code
2014-10-25 14:11:32 +08:00
James Chen
13b51f7c73
Small fixes in Sprite3DTest
2014-10-24 12:03:42 +08:00
James Chen
603700179e
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-24 12:03:11 +08:00
Dale Stammen
f2d9fd2746
enabled tests for winrt
2014-10-23 07:23:13 -07:00
Dale Stammen
75d37a9cc4
no mp3 for winrt
2014-10-23 07:22:05 -07:00
minggo
b3288f7c27
Merge pull request #8893 from dabingnn/v3_fixTypo
...
[ci skip] fix typo
2014-10-22 14:16:07 +08:00
Huabing.Xu
ff27c3539d
[ci skip] fix typo
2014-10-21 17:37:00 +08:00
Dhilan007
4e7d03f0e5
Replace CCLOG with log in ConfigurationTest
2014-10-21 15:56:52 +08:00
minggo
f3e4c705eb
more warnings fixed
2014-10-21 11:47:28 +08:00
minggo
b2d1549686
Merge pull request #8869 from Dhilan007/v3-movefile
...
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 18:10:52 +08:00
minggo
0dd8e89bb2
Merge pull request #8863 from Dhilan007/v3-labelfix
...
Fix wrong text color for system font on Linux/Window
2014-10-20 16:38:32 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
minggo
f224f275ec
Merge pull request #8851 from pipu/#8838
...
Fixed #8838
2014-10-20 15:14:07 +08:00
Dhilan007
ae997f52ee
update test case of LabelTTF
2014-10-20 14:58:15 +08:00
pipu
8072328ca6
Modify that record path of .csb file
2014-10-20 11:56:48 +08:00
Huabing.Xu
86fedffd56
change asset manager to use a new resource, which will not affect other test cases
2014-10-20 11:03:13 +08:00
andyque
0dc7bbe861
fix long file path on WP8
2014-10-18 14:48:27 +08:00
Dhilan007
b5f91d17da
Fix [Node:clipping -> Clipping to RenderTexture] crash
2014-10-17 18:48:18 +08:00
minggo
6367727e18
Merge pull request #8784 from pipu/v3_Modify_Bug_#8770
...
Fixed #8770
2014-10-17 15:47:30 +08:00
pipu
778701595c
Fixed #8770
2014-10-17 14:11:15 +08:00
andyque
952e52365b
fix scrollView rotate issue
2014-10-17 14:02:49 +08:00
andyque
8161d2ad34
fix scrollView rotate issue
2014-10-17 11:31:00 +08:00
andyque
812c2ecd0c
fix winRT macro
2014-10-17 10:09:05 +08:00
Dale Stammen
7ccc380e3f
enabled networking tests for winrt
2014-10-16 11:14:18 -07:00
Dale Stammen
a931f8c192
enabled console for winrt
2014-10-16 11:13:32 -07:00
Dale Stammen
ae7008fdd9
enabled console for winrt
2014-10-16 11:13:08 -07:00
Dale Stammen
3ab8292b5a
enabled console for WinRT
2014-10-16 11:12:37 -07:00
minggo
07253cfb60
Merge pull request #8743 from andyque/removeWebView
...
remove UIWebView.cpp in win32
2014-10-16 21:06:53 +08:00
minggo
883230d9d8
Merge pull request #8758 from dabingnn/v3_fixVBOFullTest
...
change vbo full test
2014-10-16 19:36:01 +08:00
minggo
34cfcb0b54
Merge pull request #8690 from dabingnn/v3_spriteLamp
...
sprite lamp
2014-10-16 19:33:57 +08:00
minggo
8bf00bd4e6
Merge pull request #8748 from super626/cameraoperation
...
Modify camera operation
2014-10-16 19:29:55 +08:00
Huabing.Xu
a655a883f1
change vbo full test
2014-10-16 18:30:01 +08:00
yangxiao
1ed38334d9
remove unused variables
2014-10-16 17:44:04 +08:00
yangxiao
f13fdb5162
adjust
2014-10-16 17:40:41 +08:00
yangxiao
f5400b74a5
adjust
2014-10-16 17:38:42 +08:00
yangxiao
e5dedf062a
adjust
2014-10-16 17:37:05 +08:00
yangxiao
8e6728d8c0
change camera operation
2014-10-16 17:31:18 +08:00
Huabing.Xu
644aa19b2d
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-16 16:48:16 +08:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
minggo
fef079aee6
Merge pull request #8682 from super626/fixbillboard
...
Fixbillboard
2014-10-16 12:04:50 +08:00
samuele3hu
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
Huabing.Xu
8135b09c98
Merge branch 'v3' into v3_updateSpine
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-10-15 15:55:17 +08:00
SunLightJuly
f1ce16b463
added ClippingRectangleNode Test
2014-10-15 13:41:47 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00
Huabing.Xu
93158a1cfb
update spine runtime and test case
2014-10-15 11:23:02 +08:00
Huabing.Xu
a20b8d671c
sprite lamp (works on iOS mac and android)
2014-10-14 16:54:52 +08:00
songchengjiang
081196c933
fixed BillBoard
...
Added New Test case
2014-10-14 15:08:36 +08:00
minggo
0ab3017094
Merge pull request #8658 from pipu/v3_pipu
...
V3 pipu
2014-10-14 14:25:46 +08:00
songchengjiang
ecd63db80b
Fixing bug
2014-10-13 19:10:42 +08:00
minggo
0351000c97
Merge pull request #8650 from dabingnn/v3_addStaggeredTileMap
...
V3 add staggered tile map
2014-10-13 13:50:50 +08:00
pipu
9503253a17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu
2014-10-12 17:44:28 +08:00
minggo
c01d1b1166
Merge pull request #8646 from huangshiwu/v3_languagecode
...
fix bug that Application::getCurrentLanguageCode on ios and mac always r...
2014-10-11 16:23:49 +08:00
minggo
2db8217b09
Merge pull request #8543 from Dhilan007/v3-fixwarns
...
fix warns and memory leak
2014-10-11 16:07:54 +08:00
huangshiwu
4dd9120e67
fix bug that Application::getCurrentLanguageCode on ios and mac always return empty string
2014-10-11 15:19:20 +08:00
Huabing.Xu
7747e2ecf5
Merge branch 'v3' into v3_addStaggeredTileMap
2014-10-11 15:15:12 +08:00
Huabing.Xu
55431d6a83
add tile map staggered test
2014-10-11 15:09:58 +08:00
pipu
b732ce378e
Merge branch 'v3_pipu_protocol_buffers' into merge_test
...
Conflicts:
cocos/ui/UIScale9Sprite.cpp
2014-10-11 11:08:46 +08:00
andyque
59ff2fbf72
remove dead code
2014-10-10 18:08:25 +08:00
andyque
0f0c3878e5
add more indicator
2014-10-10 17:36:33 +08:00
andyque
fb1adb5b90
add issue tests skeleton
2014-10-10 17:07:08 +08:00
Dhilan007
89db9ecd3b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn
...
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
2014-10-10 17:02:45 +08:00
andyque
da48649370
fix button title only content size issue
2014-10-10 11:01:51 +08:00
pipu
ee624e47cc
1. Modifying UIScale9Sprite
...
2. Updating UI Test
3. Updatding resource of ActionTimeline
2014-10-10 10:44:16 +08:00
pandamicro
a26e91f839
no message
2014-10-09 18:30:39 +08:00
pipu
752eb839c7
Add protocolbuf.a
2014-10-09 18:28:09 +08:00
Dhilan007
83150aa4d1
fix warns and memory leak
2014-10-09 17:19:43 +08:00
minggo
f928046f50
Merge pull request #8580 from Dhilan007/v3-labelfix
...
issue #8492:fix endless loop when dimensions that are not enough to fit one character
2014-10-09 17:05:39 +08:00
Ricardo Quesada
27cb6afb5e
fixes warnings on Android
2014-10-08 18:55:33 -07:00
Dhilan007
8ea473de7b
fix endless loop when dimensions that are not enough to fit one character
2014-10-08 18:22:35 +08:00
Ricardo Quesada
84da993677
more samples using node::schedule(labmda)
2014-10-03 17:11:39 -07:00
Ricardo Quesada
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
Ricardo Quesada
42ace3e59c
Adds lambda support in node
...
It is now possible to schedule lambda functions in Node::schedule()
No need to subclass
2014-10-02 21:25:55 -07:00
minggo
44aba5b2af
Merge pull request #8185 from newnon/v3_Scale9Sprite_improvements
...
Scale9Sprite improvements
2014-09-30 17:09:02 +08:00
Dhilan007
90769ef242
fix compile error on win32
2014-09-30 14:40:24 +08:00