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

26043 Commits

Author SHA1 Message Date
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
minggo 76824cd5f2 Merge pull request #9218 from vovkasm/cmake-linux-mac-fixes 
Cmake linux mac fixes
 2014-11-25 22:45:42 +08:00
Vladimir Timofeev b299f7f74d Remove debug info. And add warning message if pkg-config not found. 2014-11-25 16:41:46 +03:00
Vladimir Timofeev 3bb163a979 Add fresh FindPkgConfig.cmake for sure that vendors not overwrite it. 2014-11-25 16:18:07 +03:00
Vladimir Timofeev 43fb2986dc Additional debug info. 2014-11-25 16:00:05 +03:00
Vladimir Timofeev a562c70c73 Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes 
* origin/v3:
  Update CHANGELOG
  Update AUTHORS
  fixed typo
  Updates definition of Complete.
  [AUTO][ci skip]: updating cocos2dx_files.json
  Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
  Skip binding nodeWithFlatBuffers of CSLoader for lua
 2014-11-25 15:24:07 +03:00
Haneol Park a6e4b31b0d Additional unnecessary set dirty of ui widgets 2014-11-25 20:42:03 +09:00
Vladimir Timofeev 4e048951ff cmake: add policy CMP0017 to fix warnings on 2.8.8 cmake and set it to NEW for predictable include behaviour 2014-11-25 14:19:49 +03:00
Vladimir Timofeev a8695b2f86 add some debug info 2014-11-25 13:40:01 +03:00
James Chen 15333ca517 Merge branch 'arm64-juno' of https://github.com/dumganhar/cocos2d-x into arm64-juno 2014-11-25 17:03:28 +08:00
Haneol Park d25fdca4af Unnecessary set dirty of ui widget 2014-11-25 17:50:46 +09:00
James Chen 6998d91781 MathUtilTest is only available for optimized instructions. 2014-11-25 16:36:07 +08:00
James Chen 59a9d7e4c2 Update CHANGELOG 2014-11-25 16:19:09 +08:00
James Chen cf7377a5bb Update AUTHORS 2014-11-25 16:17:28 +08:00
James Chen 1867f64326 Merge pull request #9229 from shrimpz/v3 
fixed typo in luaval_to_quaternion
 2014-11-25 16:16:09 +08:00
Shrimpz ac666d1e6d fixed typo 2014-11-25 15:51:25 +08:00
Ricardo Quesada e6633d85ee Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-24 21:41:21 -08:00
Ricardo Quesada 654f335aa1 Updates definition of Complete. 2014-11-24 21:40:12 -08:00
Vladimir Timofeev aad8d2e98f remove some debug output 2014-11-25 07:26:40 +03:00
Vladimir Timofeev d8980b3a7b cmake: fixes for old cmake 2.8.12 2014-11-25 07:26:33 +03:00
Vladimir Timofeev 4e2ab8b961 pkg-config return include directory for use as '#include <GLFW/glfw3.h>', but we use '#include "glfw3.h"', fix include dir. 2014-11-25 07:26:17 +03:00
Vladimir Timofeev 2838f57a96 Rewrite FindGLFW3.cmake, so it can found static glfw3 and link all deps. 2014-11-25 07:26:06 +03:00
James Chen 26ac8aedae Merge pull request #61 from huangshiwu/wp8-arm64-juno 
Adds PerformanceMathTest for wp8 and winRT
 2014-11-25 11:49:05 +08:00
huanghsiwu 8db214a778 Adds PerformanceMathTest for wp8 and winRT 2014-11-25 11:30:00 +08:00
James Chen dab99eeb8b Adds PerformanceMathTest for win32. 2014-11-25 10:33:17 +08:00
James Chen e31a3fce83 Typo fix for the name of MultiTouchTest 2014-11-25 10:33:16 +08:00
James Chen 5d21c889aa Reverts GCC_TREAT_WARNINGS_AS_ERRORS=YES for Xcode project of cpp-tests. 2014-11-25 10:33:16 +08:00
James Chen 19de8a0935 Adds PerformanceMathTest.cpp 2014-11-25 10:33:16 +08:00
wangqm0513 a6128d7506 Update MathUtilNeon64.inl 
Rewrite  CrossVec3 function code
 2014-11-25 10:33:16 +08:00
James Chen 2c0445b25d Updates Xcode project for Math perf test 2014-11-25 10:33:16 +08:00
James Chen 9248b56bde Adds UnitTest for MathUtil 2014-11-25 10:33:16 +08:00
James Chen 9760dce4c0 Updates loop count and step count for Math performance test. 2014-11-25 10:33:16 +08:00
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