Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
25,816 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

2776 Commits

Author SHA1 Message Date
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
yangxiao 34b21dad6d invalid texture parameter on release mode fix #9465 2014-12-12 15:05:55 +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
samuele3hu 781afbec3f Update CocoStudioActionTimelineTest 2014-12-04 15:14:19 +08:00
pipu 6d764bc2c8 Merge branch 'v3' into v3_flatbuffers 
Conflicts:
	tools/cocos2d-console
 2014-12-03 15:47:03 +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 802ba311d6 Fix the error that SpritePerformanceTest lua does’t work 2014-11-28 11:54: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
minggo dcc517e8d4 Merge pull request #9267 from samuele3hu/v3_strip 
Adjust binding structure to decrease the package size of lua_empty_test
 2014-11-27 20:21:06 +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
samuele3hu 6398f99ed2 Update the CMakeLists.txt for lua-tests 2014-11-27 11:17:48 +08:00
Shrimpz c15f353382 * added a testcase for issue #9255 2014-11-27 11:03:11 +08:00
samuele3hu dc00158d72 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip 2014-11-27 10:44:56 +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
samuele3hu 222f2cbd51 Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +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