yangxiao
|
7a332aef04
|
ios work
|
2014-12-22 14:17:48 +08:00 |
kaile.yin
|
9ef5d8213e
|
update submodule
|
2014-12-22 14:07:00 +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 |
WenhaiLin
|
4366fb7230
|
Fix compile error on WIN32.
|
2014-12-19 11:49:40 +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 |
mannewalis
|
c05a6c877d
|
adding files to cmake files
|
2014-12-18 18:10:13 -05: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
|
640695c21c
|
reverting android properties change
|
2014-12-15 16:31:22 -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
|
c6ba594c72
|
listview resources added
|
2014-12-10 09:59:28 +08:00 |
yusheng.lu
|
7426a32d9f
|
1. ListView demo compeleted.
2. Optimized ListViewReader format.
|
2014-12-08 19:00:12 +08:00 |
kaile.yin
|
17bd5bf31e
|
update submodule
|
2014-12-05 20:27:10 +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 |
pipu
|
4d0950d828
|
Update submodule that are plugin, ccd-res bindings-generator, cocos2d-console
|
2014-12-02 15:56:32 +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
|
26a6c9a724
|
Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters
|
2014-12-02 12:30:34 +08:00 |
pipu
|
1cbc0120be
|
Merge branch 'v3' into v3_flatbuffers
|
2014-12-01 22:56:18 +08:00 |
pipu
|
417fc3ca26
|
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
|
2014-12-01 22:35:08 +08:00 |
pipu
|
8041d9927d
|
Add CustomWidgetCallbackBindTest into CMakeLists.txt of cpp-tests
|
2014-12-01 22:33:47 +08:00 |
zhounan
|
1fcf6b5007
|
Update cpp-tests/proj.win32/cpp-tests.vcxproj, cpp-tests/proj.win32/cpp-tests.vcxproj.filters
|
2014-12-01 22:31:01 +08:00 |
pipu
|
09f0722f3a
|
1, Update cpp-testsComponent.vcxproj.
|
2014-12-01 22:23:54 +08:00 |
pipu
|
c2fc246ce9
|
Add CustomWidgetCallbackBindTest into Android.mk of cpp-tests
|
2014-12-01 22:07:16 +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 |
Dhilan007
|
4cda033a04
|
Fixed compiling and linking error of lua tests when using NDK r10 above.
|
2014-11-27 13:56:15 +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
|
15333ca517
|
Merge branch 'arm64-juno' of https://github.com/dumganhar/cocos2d-x into arm64-juno
|
2014-11-25 17:03:28 +08:00 |
James Chen
|
6998d91781
|
MathUtilTest is only available for optimized instructions.
|
2014-11-25 16:36:07 +08:00 |
huanghsiwu
|
8db214a778
|
Adds PerformanceMathTest for wp8 and winRT
|
2014-11-25 11:30:00 +08:00 |
James Chen
|
dab99eeb8b
|
Adds PerformanceMathTest for win32.
|
2014-11-25 10:33:17 +08:00 |
James Chen
|
e31a3fce83
|
Typo fix for the name of MultiTouchTest
|
2014-11-25 10:33:16 +08:00 |
James Chen
|
19de8a0935
|
Adds PerformanceMathTest.cpp
|
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
|
eb9646ee3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-11-19 10:58:19 +08:00 |
zhangbin
|
5aff5640b5
|
Solve the error when building android for sample projects of engine.
1. Update the project config.
2. Update the submodule cocos2d-console.
|
2014-11-18 18:39:53 +08:00 |
kaile.yin
|
bbd971d910
|
create ActionTimelineNode
|
2014-11-17 21:05:20 +08:00 |
zhangbin
|
365e09e5db
|
Merge branch 'v3' into support-wp8
|
2014-11-17 16:01:12 +08:00 |
Vladimir Timofeev
|
b5266e95bf
|
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
|
2014-11-17 01:42:04 +03: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 |
zhangbin
|
4ef7c9f948
|
Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console.
|
2014-11-14 16:48:14 +08:00 |
Ricardo Quesada
|
2e3b2d9f28
|
Merge pull request #9080 from vovkasm/cmake-refactoring
Cmake refactorings and fixes
|
2014-11-13 15:42:47 -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 |