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

25462 Commits

Author SHA1 Message Date
James Chen 126f9eaff1 The fix for recognizing android arm64 device and using NEON64 for android arm64 device. 2014-11-25 10:33:15 +08:00
James Chen 54cd36d2d1 Adds Math Performance test. 2014-11-25 10:33:15 +08:00
minggo 19f06a578e Merge pull request #9225 from CocosRobot/update_cocosfiles_1416879324 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-25 10:13:10 +08:00
CocosRobot 8c20e7a5c6 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-25 01:35:25 +00:00
minggo afe7e382ce Merge pull request #9219 from samuele3hu/v3_rc1_fix 
Skip binding nodeWithFlatBuffers of CSLoader to lua
 2014-11-25 09:33:43 +08:00
Ricardo Quesada aebfd7483a Merge pull request #9222 from ricardoquesada/revert_flatbuffers 
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
 2014-11-24 10:30:49 -08:00
Ricardo Quesada 9e10d2d32b Revert "Merge pull request #9193 from pipu/v3_flatbuffers" 
This reverts commit fa22b12628, reversing
changes made to 8dce62b94c.
 2014-11-24 10:19:53 -08:00
samuele3hu a62fa8de58 Skip binding nodeWithFlatBuffers of CSLoader for lua 2014-11-24 23:36:44 +08:00
minggo 97df35f346 Merge pull request #9207 from dumganhar/iss8984-remove-unused 
#8984: Removes unused codes in CCStdC-linux.cpp
 2014-11-24 18:48:05 +08:00
James Chen be97a306a6 Merge pull request #9217 from CocosRobot/update_cocosfiles_1416822877 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-24 18:07:17 +08:00
CocosRobot 451cbe52d2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-24 09:54:39 +00:00
minggo fa22b12628 Merge pull request #9193 from pipu/v3_flatbuffers 
V3 flatbuffers
 2014-11-24 17:53:16 +08:00
minggo 8dce62b94c Merge pull request #9209 from CocosRobot/update_lua_bindings_1416813895 
[AUTO]: updating luabinding automatically
 2014-11-24 15:42:10 +08:00
James Chen 13b1c91785 Merge pull request #9208 from CocosRobot/update_lua_bindings_1416813762 
[AUTO]: updating luabinding automatically
 2014-11-24 15:27:11 +08:00
CocosRobot f2905f1b8e [AUTO]: updating luabinding automatically 2014-11-24 07:26:52 +00:00
CocosRobot 7dc623fcab [AUTO]: updating luabinding automatically 2014-11-24 07:24:39 +00:00
minggo 74e7aa6db9 Merge pull request #9205 from Dhilan007/v3-scriptfix 
replace tab with four spaces
 2014-11-24 15:22:00 +08:00
minggo b8bb61c7c6 Merge pull request #9028 from andyque/fixWidgetFlipIssue 
Fix widget flip issue
 2014-11-24 15:19:50 +08:00
minggo 2a0c3983e5 [ci skip] Update CHANGELOG 2014-11-24 15:18:31 +08:00
minggo 88c3cc2ad9 Merge pull request #9105 from Dhilan007/v3-video-web-fix 
Fix WebView and VideoPlayer in wrong place on Android 2.3.x
 2014-11-24 15:15:18 +08:00
James Chen cb6d81599b #8984: Removes unused codes in CCStdC-linux.cpp 2014-11-24 15:01:57 +08:00
James Chen 15a850a24f Disable clang build on linux temporarily since we're using "-stdlib=libc++ " which wasn't installed on travis machine. 2014-11-24 15:01:14 +08:00
Dhilan007 4e769d40b1 replace tab with four spaces 2014-11-24 11:26:34 +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
minggo c46f1182f6 Merge pull request #9089 from wangqm0513/v3 
Update MathUtilNeon64.inl
 2014-11-22 09:21:04 +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
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