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

25881 Commits

Author SHA1 Message Date
CocosRobot 2398712b9d [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-21 01:57:39 +00:00
Ricardo Quesada ee94d89c20 Merge pull request #9187 from ricardoquesada/updates_console 
Updates console
 2014-11-20 17:56:23 -08:00
Ricardo Quesada 59461439ad Updates console 2014-11-20 17:55:59 -08:00
James Chen 34550422c0 Update AUTHORS 2014-11-21 09:37:07 +08:00
James Chen d6ee9525bd Merge pull request #9139 from nilium/v3-plugin-libjars-unignore 
Unignore libs dir and fix Travis script to descend into included directories. (follows #9108)
 2014-11-21 09:35:01 +08:00
Bartosz Duszel 80b9924866 Updated link to information about contribution. 2014-11-20 22:13:30 +01:00
Ricardo Quesada 78175042c2 Merge pull request #9181 from ricardoquesada/linux_deps 
Adds gnutls-dev to linux deps
 2014-11-20 12:29:08 -08:00
Ricardo Quesada 15c0b18301 Adds gnutls-dev to linux deps 2014-11-20 12:28:38 -08:00
Ricardo Quesada 8fac79c951 Merge pull request #9180 from vovkasm/cmake-mac-quick-fix 
Quick and dirty fix after my error. This defines fix build on linux with...
 2014-11-20 12:27:55 -08:00
Vladimir Timofeev 9dfa26e0ec Quick and dirty fix after my error. This defines fix build on linux with fresh gcc, but broke on mac 2014-11-20 23:20:02 +03:00
Ricardo Quesada 2e64e24d71 Merge pull request #9177 from vovkasm/cmake-unify-usage-of-prebuilt-libraries 
Cmake unify usage of prebuilt libraries
 2014-11-20 11:32:11 -08:00
Vladimir Timofeev e91140b409 Oops, restore tools/cocos2d-console to f1a8f35036b9cc85061d91447bce8e35439b43a1 (while merging with upstream v3 I fetched some strange commit for that module) 2014-11-20 22:22:56 +03:00
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
honghui 941c8281cd revert commit a7f8199e65 2014-11-20 21:20:54 +08:00
honghui a97386f8d7 can't build IPA using developer certificate in Mac OS X 10.10 2014-11-20 21:20:54 +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
XiaoYang e68199b8bb Merge pull request #163 from lvlonggame/v3 
fix bug: read animation number by different version.
 2014-11-19 18:03:27 +08:00
lvlong 3b8fcd21eb fix bug: read animation number by different version. 2014-11-19 17:59:35 +08:00
yangxiao 460bc2bf08 move aabb calculation to bundle 2014-11-19 17:58:40 +08:00
minggo fc86716ff9 Merge pull request #9166 from andyque/fixLinuxLinkError 
fix linux linker error
 2014-11-19 17:40:49 +08:00
XiaoYang 17e45981f6 Merge pull request #162 from tangziwen/v3 
use dummy texture even if in release mode
 2014-11-19 17:19:15 +08:00
tangziwen 0d43a8f337 add macro CC_MODEL_VIEWER 2014-11-19 17:01:34 +08:00
yangxiao 3c0779885d refact reskin test code 2014-11-19 16:50:09 +08:00
tangziwen 63fcdcebdd use dummy texture even if in release mode 2014-11-19 16:16:59 +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
yangxiao cd060e01dc Merge branch 'newcode' into v3 2014-11-19 11:54:36 +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
yangxiao fb638bdf94 Merge branch 'newcode' into v3 2014-11-19 10:12:05 +08:00
yangxiao eccfbe5c59 merge bundle modification 2014-11-19 10:09:30 +08:00
zhangbin 3715aeb0f6 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2014-11-19 10:00:51 +08:00