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

25811 Commits

Author SHA1 Message Date
minggo aca3706c65 Merge pull request #9275 from andyque/fixLoadingBarGetSprite 
add null pointer check, make code more robust
 2014-11-27 19:59:36 +08:00
pipu ff473f1537 Modify CMake Error at CMakeLists.txt:284 (add_subdirectory) 2014-11-27 19:59:16 +08:00
samuele3hu ed573149dd Resolve the project setting error on the platforms 2014-11-27 19:42:32 +08:00
zhangcheng 12a5443834 Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers 2014-11-27 18:34:18 +08:00
zhangcheng 0c89db7675 Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp 2014-11-27 18:32:35 +08:00
huangshiwu b866a58fc4 DrawNode::drawPolygon refactor 2014-11-27 18:31:04 +08:00
pipu 48f280b478 Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1 2014-11-27 18:27:22 +08:00
andyque 1bb60ab4bb add null pointer check, make code more robust 2014-11-27 18:25:13 +08:00
minggo f3e9af8100 Merge pull request #9266 from Dhilan007/v3-lua-fix 
Fixed compiling and linking error of lua tests when using NDK r10 above.
 2014-11-27 17:55:17 +08:00
lvlong 82241a74dd fix bug: if the material's content that version 0.1 is empty. 2014-11-27 17:31:22 +08:00
pipu 5d3d839886 Update Android.mk for cocostudio 2014-11-27 17:28:20 +08:00
pipu ce3ca169d7 Modify that calls createNodeFromProtocolBuffers() for CSLoader 2014-11-27 17:23:22 +08:00
minggo d722ccaefd Merge pull request #9270 from samuele3hu/v3_test 
Update plugin-x submodule
 2014-11-27 16:59:20 +08:00
pipu e38da9f9b6 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
samuele3hu c05375c4a5 Update plugin-x submodule 2014-11-27 16:11:16 +08:00
Dhilan007 a92b1733f0 Fix generate apk fail 2014-11-27 16:10:52 +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
minggo 527b086774 [ci skip]update config.json 2014-11-27 12:44:27 +08:00
Ricardo Quesada 4f3621b85c Compiles on VS2012... 
hopefully
 2014-11-26 20:23:16 -08:00
pipu e1c287d500 Modify that parse "actionTag" for WidgetReader 2014-11-27 12:12:29 +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
minggo 6167fbadf4 Merge pull request #9264 from CocosRobot/update_lua_bindings_1417056813 
[AUTO]: updating luabinding automatically
 2014-11-27 11:58:05 +08:00
samuele3hu 6398f99ed2 Update the CMakeLists.txt for lua-tests 2014-11-27 11:17:48 +08:00
samuele3hu 0e51d11f50 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip 2014-11-27 11:10:53 +08:00
Shrimpz c15f353382 * added a testcase for issue #9255 2014-11-27 11:03:11 +08:00
Shrimpz 38a6aa30a2 * fixed android crash that a Label instance add to an invisibility parent node. 2014-11-27 10:59:47 +08:00
CocosRobot 36a5a170d2 [AUTO]: updating luabinding automatically 2014-11-27 02:55:33 +00:00
minggo dd053d55bb Merge pull request #9252 from samuele3hu/v3_strip 
Update the bindings-generator submodule
 2014-11-27 10:50:12 +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
minggo 1dcab911f5 Merge pull request #9253 from pyrosphere/fix-cpu-num-check 
Fix CPU check on android template
 2014-11-27 10:22:43 +08:00
samuele3hu 6cf092b855 Add cocos2dx_csloader.ini to generate the related lua bindings 2014-11-27 10:22:39 +08:00
minggo 42e1ad4294 Merge pull request #9250 from vovkasm/cmake-fix-modules-include-path-2 
Fix modules include path to be relative project directory.
 2014-11-27 10:21:51 +08:00
minggo eed98dadbe Merge pull request #9261 from CocosRobot/update_lua_bindings_1417053636 
[AUTO]: updating luabinding automatically
 2014-11-27 10:21:10 +08:00
minggo b7abbb0de3 [ci skip] Update CHANGELOG 2014-11-27 10:20:18 +08:00
Ricardo Quesada 74a5bbf280 some fixes for perf tests 2014-11-26 18:11:53 -08:00
CocosRobot 3ed78b820e [AUTO]: updating luabinding automatically 2014-11-27 02:02:29 +00: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 4e7a73243e Merge pull request #9258 from ricardoquesada/fps_low_pass_filter 
Director users a low-pass filter to display the FPS
 2014-11-26 14:18:43 -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 9fbf87c6db Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_strip 2014-11-26 21:59:57 +08:00
samuele3hu 222f2cbd51 Decrease the package size of lua_empty_test 2014-11-26 21:54:18 +08:00
minggo 45f57aa63c Merge pull request #9246 from vovkasm/cmake-fix-glfw3-include-dirs 
Fix finding glfw3 on ubuntu 14.10
 2014-11-26 20:28:59 +08:00
minggo cf8b88a19b [ci skip] Update CHANGELOG 2014-11-26 20:07:42 +08:00
minggo 51b4736740 Merge pull request #9149 from samuele3hu/v3_compile_binary 
Resolve the bugs that XmlHttpRequest would truncate binary data
 2014-11-26 20:05:21 +08:00
Filipe Lemos b722df671b Fix CPU check on android template 2014-11-26 11:02:22 +00:00
samuele3hu aa4277ed72 Update the bindings-generator submodule 2014-11-26 18:20:22 +08:00
minggo 12bfaee605 Merge pull request #9249 from samuele3hu/v3_facebook_patch 
Update plugin submodule
 2014-11-26 16:21:56 +08:00
Vladimir Timofeev 552080cb69 Fix modules include path to be relative project directory. 
This change allow to include cocos project directory from another CMakeFiles.txt (with add_subdirectory). And will allow anyone to connect cocos as submodule to their project easily.
 2014-11-26 11:03:22 +03:00