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

25558 Commits

Author SHA1 Message Date
Dhilan007 4e769d40b1 replace tab with four spaces 2014-11-24 11:26:34 +08:00
kaile.yin 2a86677619 fixed setCurrentFrame 2014-11-24 10:49:22 +08:00
minggo 87f70cfaec Merge pull request #9113 from Dhilan007/v3-scriptfix 
fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING
 2014-11-24 10:09:19 +08:00
Dale Stammen 4557b2ed8b Merge branch 'v3' into v3-win8.1-appstate 2014-11-23 14:10:49 -08:00
minggo c46f1182f6 Merge pull request #9089 from wangqm0513/v3 
Update MathUtilNeon64.inl
 2014-11-22 09:21:04 +08:00
Dale Stammen fc09fa8798 Merge branch 'v3' into v3-win8.1-appstate 2014-11-21 16:27:01 -08:00
Dale Stammen a607d41454 implemented lostDevice support when app loses the directx device 2014-11-21 16:24:51 -08:00
Dale Stammen 32fe5d07ae fixed compiler warning. Don't use _filePath to check tga if it's length is 0 2014-11-21 16:23:54 -08:00
Ricardo Quesada 0b4a8ad97b Merge pull request #9195 from ricardoquesada/fixes_fileutils 
Fixes for FileUtils
 2014-11-21 14:53:42 -08:00
Ricardo Quesada 9fedb14354 Fixes for FileUtils 
compiles after previous patch
 2014-11-21 14:52:13 -08:00
Ricardo Quesada 0f268e7aaa Merge pull request #9176 from MSOpenTech/v3-winrt-accelerometer-fix 
Fixed accelerometer for windows store apps device orientation
 2014-11-21 11:50:08 -08:00
Ricardo Quesada 16623545f9 Merge pull request #9190 from dptd/update 
Updated link to information about contribution.
 2014-11-21 11:49:11 -08:00
Ricardo Quesada ca9b82c78d Merge pull request #9194 from dptd/cpp11 
changed few loops for C++11 range-based for loop
 2014-11-21 11:48:46 -08:00
Bartosz Duszel fbd27dff9c changed few loops for C++11 range-based for loop 2014-11-21 20:12:55 +01:00
Dale Stammen 2a86c77066 added foreground, background, lostdevice support 2014-11-21 10:31:57 -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
Dale Stammen a5b1faa379 added winrt and wp8 support for EVENT_RENDERER_RECREATED 2014-11-21 10:00:34 -08:00
Dale Stammen 9bf15d424f added CC_PLATFORM_WINRT to enable CC_ENABLE_CACHE_TEXTURE_DATA 2014-11-21 09:52:33 -08:00
pipu 5d50a8ef92 Modify that initialize Color4B for WidgetReader 2014-11-21 19:36:20 +08:00
pipu 27cf8efa6c Merge pull request #14 from chengstory/Branch_v3_flatbuffers 
Update windows project.
 2014-11-21 18:45:07 +08:00
zhangcheng 32ce3dca2e 1, Update windows project. 2014-11-21 18:12:46 +08:00
pipu 6be17520c7 Config android, linux, wp8 2014-11-21 18:08:09 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
James Chen 2e66e7de1e Merge pull request #9188 from CocosRobot/update_cocosfiles_1416535058 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-21 13:59:53 +08:00
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
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