Commit Graph

25570 Commits

Author SHA1 Message Date
Vladimir Timofeev 63d11d1a89 Merge branch 'v3' into cmake-unify-usage-of-prebuilt-libraries
* v3:
  Use version 22 for external dependencies
2014-11-20 22:17:07 +03:00
Ricardo Quesada 720dddbee3 Merge pull request #9178 from ricardoquesada/use_version_22
Use version 22 for external dependencies
2014-11-20 11:11:49 -08:00
Ricardo Quesada 76f718a90d Use version 22 for external dependencies 2014-11-20 11:11:12 -08:00
Dale Stammen ff172e0057 fixed accelerometer for windows store apps device orientation 2014-11-20 09:00:22 -08:00
Vladimir Timofeev 8c331649dc fix finding prebuilt fmod on linux 2014-11-20 13:50:55 +03:00
Vladimir Timofeev 012a152406 Fix build of luasocket on linux 2014-11-20 13:49:59 +03:00
Vladimir Timofeev a689fc4c7e sync with upstream
Conflicts:
	CMakeLists.txt
2014-11-20 12:19:00 +03:00
Vladimir Timofeev 499c670a9b Move prebuilt libraries config to distinct file.
Now build system looks more maintanable.
I test with mac, going to test with other platforms.

* All prebuilt libs config moved to
   cmake/Modules/CocosUsePrebuiltLibs.cmake
* Wrap plain find_package to our cocos_find_package. It will not try to
   call find_package if USE_PREBUILT_LIBS and <pkg>_FOUND set to true.
* Other small fixes.
2014-11-20 12:05:15 +03:00
James Chen 634fb98a5d Merge pull request #9174 from CocosRobot/update_lua_bindings_1416454764
[AUTO]: updating luabinding automatically
2014-11-20 12:49:45 +08:00
CocosRobot e52ee603ac [AUTO]: updating luabinding automatically 2014-11-20 03:41:28 +00:00
samael f60b6bbd91 Update CCGLProgram.cpp
add shader linking log
2014-11-20 11:41:16 +08:00
minggo 02ba67e17f Merge pull request #9082 from Teivaz/v3
- Optimization in CCClippingNode.
2014-11-20 11:35:42 +08:00
minggo 48c67899bb [ci skip] Update CHANGELOG 2014-11-20 11:15:25 +08:00
minggo 9fdd85a1be Merge pull request #9133 from pyrosphere/fix-wp8-back-key
Fix Back Key behaviour and Director::getInstance()->end() on WP8
2014-11-20 11:11:31 +08:00
minggo 2b107be24c Merge pull request #9158 from zhongfq/v3
set default priority to avoid warning
2014-11-20 11:07:01 +08:00
minggo 340e21d57e Merge pull request #9050 from joewan/fix-armature-spriteframe
fix sprite frame cache, and remove unnecessary headers dependencies.
2014-11-20 10:54:30 +08:00
minggo 97a3e912a3 [ci skip] Update CHANGELOG 2014-11-20 10:49:07 +08:00
minggo f703be5f4e Merge pull request #9171 from MSOpenTech/v3-angle-update
Updated angle to commit 4a980d2612
2014-11-20 10:46:40 +08:00
Dale Stammen 5d2857b3c4 updated angle to commit 4a980d2612 2014-11-19 15:55:18 -08:00
Ricardo Quesada 04510c39fa Uses new version of cocos2d-console 2014-11-19 12:25:50 -08:00
minggo fc86716ff9 Merge pull request #9166 from andyque/fixLinuxLinkError
fix linux linker error
2014-11-19 17:40:49 +08:00
Vladimir Timofeev 98db27e929 cmake linux fixes: FindFontconfig, find appropriate threads libs 2014-11-19 10:57:18 +03:00
joewanchen 7c4355c60d rename functions. 2014-11-19 15:27:55 +08:00
andyque caf9107a72 fix linux linker error 2014-11-19 15:18:15 +08:00
minggo 1923524422 Merge pull request #9154 from natural-law/v3
Solve the error when building android for sample projects of engine.
2014-11-19 10:12:18 +08:00
zhangbin 3715aeb0f6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2014-11-19 10:00:51 +08:00
minggo 6da161a3a8 Merge pull request #9160 from MSOpenTech/v3-win8.1-template-fix
Updated universal app template file copy build script to use App.Shared directory
2014-11-19 09:34:39 +08:00
Vladimir Timofeev 2bf77c10e8 Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code. 2014-11-19 03:28:41 +03:00
Dale Stammen b75af6bedc updated template file copy build script to use App.Shared dir 2014-11-18 13:45:37 -08:00
Vladimir Timofeev fe25c860cb Fixes for freetype, protobuf and more unifications. Also it case of static library in some find* modules we try to use pkg-config first, it is chance to get dependency info 2014-11-19 00:27:25 +03:00
Vladimir Timofeev b0a6cf1182 Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS 2014-11-18 17:48:54 +03:00
Vladimir Timofeev ba2f74e76c Fix OpenAL include paths, cmake search include paths for case, when openal includes as "#include <al.h>" 2014-11-18 17:27:43 +03:00
Eric Zhong 36e44dbaf9 set default priority to avoid warning
when call 'scheduleUpdate' and 'unscheuleUpdate' several times in one frame, it will get warning "warning: you CANNOT change update priority in scheduled function"
2014-11-18 22:05:56 +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
samuele3hu 78ef234e8f Resolve the bugs that XmlHttpRequest would truncate binary data 2014-11-18 16:02:38 +08:00
Vladimir Timofeev d200bdcca0 fix Winmm linking 2014-11-18 10:07:11 +03:00
Vladimir Timofeev 28d7279cb0 remove unnneded includes and declarations 2014-11-18 10:06:45 +03:00
samuele3hu 02f46b46e3 Merge branch 'v3' of https://github.com/dantezhu/cocos2d-x into v3_compile_binary 2014-11-18 13:58:14 +08:00
Ricardo Quesada a1afa62000 Merge pull request #9148 from ricardoquesada/new_console_version
updates to latest version of console
2014-11-17 21:04:38 -08:00
Ricardo Quesada 960935fce5 updates to latest version of console 2014-11-17 21:04:11 -08:00
Ricardo Quesada 8c84b834a0 Merge pull request #9147 from ricardoquesada/new_cocos_console_version
new console version
2014-11-17 20:21:01 -08:00
Ricardo Quesada f5b9bbe976 new console version
supports multiple paths for templates
2014-11-17 20:20:18 -08:00
Ricardo Quesada d044d9da07 Merge pull request #9146 from ricardoquesada/templates_root
setup adds COCOS_TEMPLATES_ROOT
2014-11-17 20:05:50 -08:00
Ricardo Quesada a55fb2a1f5 setup adds COCOS_TEMPLATES_ROOT 2014-11-17 20:05:15 -08:00
minggo b4f7c9c673 Merge pull request #9141 from MSOpenTech/v3-wp8-devenv
Fixed WP8 solution folder names to enable building test projects using devenv
2014-11-18 11:09:27 +08:00
Ricardo Quesada ddec619532 Merge pull request #9143 from ricardoquesada/updated_cocos_console
Using new cocos-console
2014-11-17 18:27:52 -08:00
Ricardo Quesada 0da34ffa80 Using new cocos-console 2014-11-17 18:26:37 -08:00
Ricardo Quesada 19ea011dfc Merge pull request #9142 from ricardoquesada/setup_py_fixes
Setup py fixes
2014-11-17 18:15:13 -08:00
Ricardo Quesada 71fec06a11 fixes indentation 2014-11-17 18:11:17 -08:00
Ricardo Quesada 99966755e5 sets COCOS_X_ROOT
sets COCOS_X_ROOT environment variable and also uses PEP8 coding style
2014-11-17 18:11:08 -08:00