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

25570 Commits

Author SHA1 Message Date
CocosRobot 36a5a170d2 [AUTO]: updating luabinding automatically 2014-11-27 02:55:33 +00:00
minggo dd053d55bb Merge pull request #9252 from samuele3hu/v3_strip 
Update the bindings-generator submodule
 2014-11-27 10:50:12 +08:00
minggo 1dcab911f5 Merge pull request #9253 from pyrosphere/fix-cpu-num-check 
Fix CPU check on android template
 2014-11-27 10:22:43 +08:00
minggo 42e1ad4294 Merge pull request #9250 from vovkasm/cmake-fix-modules-include-path-2 
Fix modules include path to be relative project directory.
 2014-11-27 10:21:51 +08:00
minggo eed98dadbe Merge pull request #9261 from CocosRobot/update_lua_bindings_1417053636 
[AUTO]: updating luabinding automatically
 2014-11-27 10:21:10 +08:00
minggo b7abbb0de3 [ci skip] Update CHANGELOG 2014-11-27 10:20:18 +08:00
CocosRobot 3ed78b820e [AUTO]: updating luabinding automatically 2014-11-27 02:02:29 +00:00
minggo e8cff91bd7 Merge pull request #9248 from andyque/fixTextIgnoreContentSizeIssue 
Fix text ignore content size issue
 2014-11-27 09:57:33 +08:00
Ricardo Quesada 4e7a73243e Merge pull request #9258 from ricardoquesada/fps_low_pass_filter 
Director users a low-pass filter to display the FPS
 2014-11-26 14:18:43 -08:00
Ricardo Quesada 1361f2c619 Director users a low-pass filter to display the FPS 
FPS is more stable. Uses a 5% low-pass filter
 2014-11-26 13:31:44 -08:00
minggo 45f57aa63c Merge pull request #9246 from vovkasm/cmake-fix-glfw3-include-dirs 
Fix finding glfw3 on ubuntu 14.10
 2014-11-26 20:28:59 +08:00
minggo cf8b88a19b [ci skip] Update CHANGELOG 2014-11-26 20:07:42 +08:00
minggo 51b4736740 Merge pull request #9149 from samuele3hu/v3_compile_binary 
Resolve the bugs that XmlHttpRequest would truncate binary data
 2014-11-26 20:05:21 +08:00
Filipe Lemos b722df671b Fix CPU check on android template 2014-11-26 11:02:22 +00:00
samuele3hu aa4277ed72 Update the bindings-generator submodule 2014-11-26 18:20:22 +08:00
minggo 12bfaee605 Merge pull request #9249 from samuele3hu/v3_facebook_patch 
Update plugin submodule
 2014-11-26 16:21:56 +08:00
Vladimir Timofeev 552080cb69 Fix modules include path to be relative project directory. 
This change allow to include cocos project directory from another CMakeFiles.txt (with add_subdirectory). And will allow anyone to connect cocos as submodule to their project easily.
 2014-11-26 11:03:22 +03:00
samuele3hu 5256ed5749 Update plugin submodule 2014-11-26 15:43:13 +08:00
andyque e118b085b8 add UIText bug fix tests 2014-11-26 15:05:20 +08:00
minggo e93ff4f5b7 Merge pull request #8979 from Gamevy/bugfix/release-eaglview-on-ios 
eaglview release leak in CCEAGLViewImpl-ios
 2014-11-26 13:54:49 +08:00
minggo 4e84b4d4f6 Merge pull request #9130 from samael65535/patch-1 
Add shader linking log
 2014-11-26 13:51:15 +08:00
minggo 7e6594f5dd [ci skip] Update CHANGELOG 2014-11-26 13:50:33 +08:00
minggo d7de8a48a3 Merge pull request #9241 from dumganhar/iss8988-left-ctrl 
issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHTALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode.
 2014-11-26 13:47:36 +08:00
andyque a2883aa097 fix UIText dimension error when set ignoreContentSize to false 2014-11-26 13:41:24 +08:00
minggo 0d9b679bb7 [ci skip] Update CHANGELOG 2014-11-26 11:52:32 +08:00
minggo 5d58ffc5ab Merge pull request #9212 from Dhilan007/v3-fontfnt-crash 
Fix crash when missing image resource of FNT font.
 2014-11-26 11:48:53 +08:00
minggo dbb473fdcb Merge pull request #9203 from dumganhar/arm64-juno 
Some updates for neon64 instruction
 2014-11-26 11:46:19 +08:00
minggo d34156d2db Merge pull request #9242 from CocosRobot/update_lua_bindings_1416971910 
[AUTO]: updating luabinding automatically
 2014-11-26 11:45:32 +08:00
CocosRobot 39c2c8a2cb [AUTO]: updating luabinding automatically 2014-11-26 03:20:28 +00:00
minggo 14bbaab0ba Merge pull request #9210 from Dhilan007/v3-physics-scale 
Reducing unnecessary function call
 2014-11-26 10:57:59 +08:00
minggo d90d9a6184 Merge pull request #9240 from CocosRobot/update_lua_bindings_1416970436 
[AUTO]: updating luabinding automatically
 2014-11-26 10:57:29 +08:00
minggo e5de1c8394 Merge pull request #9237 from andyque/removeJenkinsDecription 
add exception guard to db operation
 2014-11-26 10:56:56 +08:00
CocosRobot 0f14dee924 [AUTO]: updating luabinding automatically 2014-11-26 02:56:12 +00:00
minggo 797db8109c Merge pull request #9215 from 2youyouo2/v3_setCurrentFrame 
fixed setCurrentFrame
 2014-11-26 10:54:23 +08:00
minggo 7f4cabcd9f Merge pull request #9216 from Dhilan007/v3-debugfix 
fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW
 2014-11-26 10:53:36 +08:00
minggo 1443c28558 Merge pull request #9230 from volzhs/v3 
Unnecessary set dirty of ui widget
 2014-11-26 10:50:38 +08:00
minggo 3d7c3257b0 Merge pull request #9238 from ricardoquesada/guideline_fixes 
Code conforms with the cocos2d-x c++ guidelines
 2014-11-26 10:49:58 +08:00
James Chen cebfed108c issue #8988: Adds new enum types (LEFT_CTRL, RIGHT_CTRL, LEFT_ALT, RIGHT_ALT, LEFT_SHIFT, RIGHT_SHIFT) in EventKeyboard::KeyCode. 2014-11-26 10:41:14 +08:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
andyque b70ddc7a14 add exception guard to db operation 2014-11-26 09:52:27 +08:00
Ricardo Quesada 4cc59a9a0f Merge pull request #9201 from MSOpenTech/v3-win8.1-appstate 
V3 win8.1 universal app pause and resume support
 2014-11-25 14:43:42 -08:00
Vladimir Timofeev 4047ba0fda cmake: on some systems (ubuntu 14.10 for ex) pkg-config --cflags glfw3 returns only special includes, so try search glfw3.h in default locations if fist search fail 2014-11-25 22:51:35 +03:00
Dale Stammen 2c8cb4b3bd updated Application::getCurrentLanguage to work on WP8 and Universal App 2014-11-25 11:21:56 -08:00
Ricardo Quesada f8b9e9e445 Merge pull request #9235 from ricardoquesada/async_fixes_test 
Fixes in async test
 2014-11-25 10:44:27 -08:00
Ricardo Quesada 9b5f147224 Fixes in async test 
code is cleaner
 2014-11-25 10:43:58 -08:00
Dale Stammen fac9d2880f added missing OpenURL support for universal app 2014-11-25 10:05:02 -08:00
Dale Stammen 6ad3a23ed3 added support for lost directx device 2014-11-25 08:25:34 -08:00
Dale Stammen 8da06fb9cc Merge branch 'v3' into v3-win8.1-appstate 2014-11-25 08:07:29 -08:00
James Chen 60a6039666 Merge pull request #9233 from CocosRobot/update_cocosfiles_1416926893 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-25 22:48:56 +08:00
CocosRobot 0b286aa412 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-25 14:48:14 +00:00