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

25589 Commits

Author SHA1 Message Date
James Chen 528f24010b Workaround for missing __ctype_get_mb_cur_max function in ndk-r10c 2014-11-25 10:33:16 +08:00
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
Vladimir Timofeev 782e3bcd01 cmake: Add correct _POSIX_C_SOURCE and _BSD_SOURCE (linux) defines when build luasocket, so all types and func properly defined 2014-11-24 17:24:45 +03:00
Vladimir Timofeev 393b3d0971 cmake: Disable try to link with static system installed libs, seems that linux distros not supported this option mostly 2014-11-24 17:24:34 +03:00
Vladimir Timofeev 3dadcf4aea As we have --std=c99 in CMAKE_C_FLAGS, to expose some macros and functions we should declare feature-check-marco... 
Define _DARWIN_C_SOURCE should enable all mac os non standard extensions.
 2014-11-24 17:24:11 +03:00
Vladimir Timofeev 03401668b8 cmake: fix FindFontconfig.cmake - FONCONFIG_FOUND was not set, when FONTCONFIG_INCLUDE_DIRS was empty (on CentOS 6.5 for example) 2014-11-24 17:23:12 +03: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
Wenhai Lin d63474436b fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW 2014-11-24 17:21:14 +08:00
LinWenhai fa90897e5b remove unnecessary keyword 2014-11-24 16:27:42 +08:00
Dhilan007 7119a5855d Fix crash when missing image resource of FNT font. 2014-11-24 15:57:00 +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
Dhilan007 4bc4f43b28 Reducing unnecessary function call 2014-11-24 15:27:20 +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
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