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

7669 Commits

Author SHA1 Message Date
Vladimir Timofeev 610e24b453 Fix warning: CCLOG_STRING_TAG not used by enclosing it in platform ifdef. Provide empty SendLogToWindow implementation by default. 2015-01-21 13:07:21 +03:00
Vladimir Timofeev 4e25ffbc7f Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences. 2015-01-21 12:59:53 +03:00
CocosRobot 5e273da0ec [AUTO]: updating luabinding automatically 2015-01-21 09:33:26 +00:00
minggo 72fb059aeb Merge pull request #10144 from andyque/fixButtonPressActionIssue 
fix button pressAction scale issue
 2015-01-21 16:37:59 +08:00
WenhaiLin 5fd9ccfecb Fixed AudioEngine causes game 'freeze' on Android 2015-01-21 16:18:47 +08:00
minggo 86b1f4594a Merge pull request #10147 from geron-cn/fixProjectNodeLoader 
ProjectNode's actiontimeline  should  jump to 0 frame when  after nest i...
 2015-01-21 15:49:39 +08:00
geron-cn 2fc79e2da5 ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd 2015-01-21 15:21:23 +08:00
minggo 97f29adf84 Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas 
fix crash for textureAtlas
 2015-01-21 15:02:06 +08:00
andyque d58426db99 fix button pressAction scale issue 2015-01-21 14:54:37 +08:00
CocosRobot 4f7b6608c4 [AUTO]: updating luabinding automatically 2015-01-21 06:46:49 +00:00
minggo 26bdd8b532 Merge pull request #10140 from minggo/crash-fix 
check if plist file exist
 2015-01-21 14:41:44 +08:00
minggo 097d4f3266 check if plist file exist 2015-01-21 14:36:49 +08:00
Huabing.Xu 0ca47ab40f fix crash for textureAtlas 2015-01-21 14:14:53 +08:00
minggo 335f69d95d Merge pull request #10110 from super626/v3 
Fix Animate3D speed bug and add parameter to Ray::intersects
 2015-01-21 14:11:11 +08:00
minggo 607ae4c2ca Merge pull request #10136 from andyque/fixSliderProgressBarRender 
fix progress bar render issue when switch scale9
 2015-01-21 14:10:18 +08:00
CocosRobot b31b22491d [AUTO]: updating luabinding automatically 2015-01-21 05:44:30 +00:00
andyque 7f7506fb99 fix progress bar render issue when switch scale9 2015-01-21 13:41:40 +08:00
minggo 08d392dd5f Merge pull request #10132 from samuele3hu/v3_4_issue9537 
Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h
 2015-01-21 13:39:29 +08:00
samuele3hu 205ead5b63 Rename lua-coco-studio-conversions.cpp/h to lua-cocos-studio-conversions.cpp/h 2015-01-21 11:48:34 +08:00
minggo 342d12201b Merge pull request #10131 from CocosRobot/update_lua_bindings_1421809643 
[AUTO]: updating luabinding automatically
 2015-01-21 11:12:42 +08:00
CocosRobot 8f099c7f0d [AUTO]: updating luabinding automatically 2015-01-21 03:09:35 +00:00
minggo fde86c7fd2 Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix 
Fixed the alpha channel of text color of system font not take effect
 2015-01-21 11:09:27 +08:00
minggo abc6511ceb Merge pull request #10125 from samuele3hu/v3_4_issue9537 
issue #10107: Binding AnimationInfo to lua
 2015-01-21 11:02:11 +08:00
minggo dca1edccd7 Merge pull request #10113 from liamcindy/Scale9Error 
update for ui object scale9 state refresh
 2015-01-21 10:51:55 +08:00
minggo 9f24b9a350 Merge pull request #10090 from Dhilan007/v3-issue10089 
Fixed lose the precision of label's dimensions
 2015-01-21 10:51:27 +08:00
minggo 372b11422d Merge pull request #10115 from dabingnn/FixCrashOnWin32 
Fix crash on win32
 2015-01-21 10:34:22 +08:00
minggo 0d95e6595a Merge pull request #10124 from CocosRobot/update_lua_bindings_1421806130 
[AUTO]: updating luabinding automatically
 2015-01-21 10:13:05 +08:00
CocosRobot 2f75d56c9b [AUTO]: updating luabinding automatically 2015-01-21 02:10:47 +00:00
samuele3hu 666af29681 issue #10107: Binding AnimationInfo to lua 2015-01-21 10:06:48 +08:00
minggo 5f37ba8096 Merge pull request #10095 from super626/fixnode 
fix anchor point bug
 2015-01-21 09:58:00 +08:00
minggo e8b6705d29 Merge pull request #10071 from liamcindy/Text_2.4 
fix uitext size error
 2015-01-21 09:40:34 +08:00
minggo f65e2690f3 Merge pull request #10122 from CocosRobot/update_lua_bindings_1421804049 
[AUTO]: updating luabinding automatically
 2015-01-21 09:37:28 +08:00
minggo eb2ca9eef5 Merge pull request #10069 from liamcindy/Button_2.4 
add function for ui button
 2015-01-21 09:36:35 +08:00
CocosRobot dae3e365ed [AUTO]: updating luabinding automatically 2015-01-21 01:36:21 +00:00
minggo 6870692cfe Merge pull request #10072 from liamcindy/TextBMFont 
BMFont need to refresh size by refresh the string
 2015-01-21 09:32:54 +08:00
minggo 38fbe91a5f Merge pull request #10097 from doomsdayer/v3_version_1 
Flatbuffer generation updated
 2015-01-21 09:25:11 +08:00
minggo b61a28633e Merge pull request #10102 from andyque/addListViewReuseCell 
Refactoring bad coding style
 2015-01-21 09:24:56 +08:00
Liam 902fba0638 fix slider and loadingbar scale9 error 2015-01-20 20:57:54 +08:00
Liam a72e65b4de add function for uiText and uiTextField 2015-01-20 18:40:25 +08:00
Huabing.Xu 65b6500491 Merge branch 'v3' into FixCrashOnWin32 
Conflicts:
	cocos/2d/CCDrawNode.cpp
	cocos/renderer/ccShaders.cpp
 2015-01-20 18:09:11 +08:00
Wenhai Lin b20d59c596 Fixed the alpha channel of text color of system font not take effect[android] 2015-01-20 17:34:13 +08:00
Liam a42d213d16 update for ui object scale9 state refresh 2015-01-20 17:24:04 +08:00
Huabing.Xu 79eee9b145 fix crash on windows 2015-01-20 16:50:51 +08:00
CocosRobot 9a15610983 [AUTO]: updating luabinding automatically 2015-01-20 08:17:36 +00:00
minggo 4ff7a95d5a Merge pull request #10106 from samuele3hu/v3_4_issue9537 
issue #9537:Make parameters more sense
 2015-01-20 16:11:08 +08:00
minggo 151146deff Merge pull request #10103 from damorton/v3 
Update CCRef.cpp
 2015-01-20 16:09:35 +08:00
WenhaiLin 415bbeba21 Fixed the alpha channel of text color of system font not take effect 2015-01-20 16:04:14 +08:00
samuele3hu d4db54dc64 issue #9537:Make parameters more sense 2015-01-20 15:41:59 +08:00
CocosRobot 37dcdacc7f [AUTO]: updating luabinding automatically 2015-01-20 07:38:26 +00:00
David 1e3ee08561 Update CCRef.cpp 
Updated the comment explaining the Ref::retain and Ref::release functions for readability.
 2015-01-20 07:32:18 +00:00
minggo 6ebe1169f6 Merge pull request #10066 from samuele3hu/v3_4_rc1_check 
Add macro judgement for CC_PLATFORM_MAC
 2015-01-20 15:32:05 +08:00
andyque 9a43706db8 refactor variable names of ui::Scale9Sprite 2015-01-20 15:29:25 +08:00
minggo 7dee9d2356 Merge pull request #10074 from liamcindy/LayoutComponent_2.4 
update for lay out component
 2015-01-20 15:12:49 +08:00
andyque 38906dce45 refactor for scale9Sprite 2015-01-20 15:10:03 +08:00
yusheng.lu f274277367 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1 2015-01-20 14:35:15 +08:00
andyque 1fb30c61f7 clean up coding style 2015-01-20 14:24:10 +08:00
andyque 221e7a4310 refactor remedyLayoutParamter function 2015-01-20 14:24:10 +08:00
Liam 81f3995cc1 update uiTextBMFont setString 2015-01-20 14:20:20 +08:00
yangxiao 2a2330438c fix anchor point bug 2015-01-20 14:10:11 +08:00
Liam 118b74e95c update uiTextBMFont setFontFile 2015-01-20 13:55:39 +08:00
minggo bad526e8de Merge pull request #10064 from pipu/fix_memory_leak 
Fix memory leak
 2015-01-20 13:48:35 +08:00
WenhaiLin f2c6a48976 Fixed lose the precision of label's dimensions 2015-01-20 11:46:43 +08:00
minggo a3046730d7 Merge pull request #10073 from liamcindy/Widget_2.4 
the ui widget need to refresh size by ignore state
 2015-01-20 11:23:23 +08:00
lvlong 7934d36e24 modify function description. 2015-01-20 10:46:00 +08:00
minggo a05fc8bc8e Merge pull request #10070 from liamcindy/Imageview_2.4 
fix imageview render error
 2015-01-20 10:41:17 +08:00
Dale Stammen 56d8e62409 added support for device orienation change. Fixed gravity for winrt landscape flipped 2015-01-19 09:38:49 -08:00
pipu ea84ae78dc Invoke FileUtils::getInstance()->getStringFromFile() instead of FileUtils::getInstance()->getFileData(). 2015-01-19 17:16:26 +08:00
Liam 3b0ba72b01 update for lay out component 2015-01-19 17:11:04 +08:00
Liam 62020483fc the ui widget need to refresh size by ignore state 2015-01-19 17:09:15 +08:00
Liam d38b802780 BMFont need to refresh size by refresh the string 2015-01-19 17:07:15 +08:00
Liam e8fa6597df fix uitext size error 2015-01-19 17:02:28 +08:00
Liam 987bfd4831 fix imageview render error 2015-01-19 17:00:53 +08:00
Liam 90df276067 add function for ui button 2015-01-19 16:58:46 +08:00
yusheng.lu 5dc87f49b0 Moved the version pair to 1st position of its map. 2015-01-19 14:42:43 +08:00
samuele3hu cc732743da Add macro judgement for CC_PLATFORM_MAC 2015-01-19 13:58:03 +08:00
pipu 103fecf3ef Fixes memory leaks of using FileUtils::getInstance()->getFileData() in FlatBuffersSerialize.cpp. 2015-01-19 11:45:20 +08:00
cpascal 281d231a5d Fixed inconsistent time-scale in Httpclient. 2015-01-19 10:50:42 +09:00
Huabing.Xu d1c0c0eeb6 [ci skip] update version 2015-01-19 09:50:19 +08:00
htl 5a87908344 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-19 09:38:34 +08:00
Dale Stammen 7b6b02d338 catch exception for older winrt tablets not supporting accelerometer report interval 2015-01-16 15:36:16 -08:00
Dale Stammen 86567afa5f added kShaderType_PositionColor_noMVP_GrayScale for WP8 to support UIScale9Sprite 2015-01-16 15:02:05 -08:00
Dale Stammen 5988cb520d added precompiled shader for ccPositionTextureColor_noMVP_vert and ccUIGrayScale_frag shader for UIScale9Sprite" 2015-01-16 14:59:08 -08:00
Dale Stammen 7b3154a7ee updated precompiled shaders for WP8 2015-01-16 11:19:32 -08:00
Dale Stammen 2c6ec3eebe added ccShader_PositionColorPointsize-no-gl_PointSize.vert for WP8.1 2015-01-16 11:19:00 -08:00
andyque fcfcb4fd71 fix websocket dead lock 2015-01-16 18:43:57 +08:00
minggo b556f970b0 Merge pull request #10043 from dualface/v3-origin 
fix ResolutionPolicy support
 2015-01-16 18:09:40 +08:00
dualface d39b1b7e58 fix ResolutionPolicy support 2015-01-16 18:04:13 +08:00
Huabing.Xu 19bb6a0c68 fix opengl 502 by using glGetBooleanv 2015-01-16 15:21:23 +08:00
WenhaiLin 05e25601fc Fixed fail to query the shapes which add to PhysicsWorld in the current frame 2015-01-16 14:22:16 +08:00
lvlong fc0c4bae7a modify by colleague for cocostudio. 2015-01-16 13:23:03 +08:00
minggo 9db2e54dc3 Merge pull request #10036 from samuele3hu/v3_4_rc1 
Update the luaval_to_int32 conversional function to get correct value
 2015-01-16 10:41:46 +08:00
minggo 53cfd8229b Merge pull request #10029 from Dhilan007/v3-34rc0 
[ci skip]Fixed log level within the CocosPlayClient
 2015-01-16 10:27:10 +08:00
htl 4069808d20 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_origin 2015-01-16 10:25:44 +08:00
samuele3hu 4601331dee Update the luaval_to_int32 conversional function to get correct value 2015-01-16 09:50:22 +08:00
Nite Luo d43a8cf9ca Move setDepthTest to renderer 2015-01-15 16:54:27 -08:00
Nite Luo 9848a8133b Fix Vertex Z issue 2015-01-15 16:41:07 -08:00
Nite Luo 9d7604cab7 undeprecate init for custom command 2015-01-15 15:56:44 -08:00
Nite Luo 0bddeb88c8 Disable 3D rendering support for commands that needs to execute in order 2015-01-15 14:57:51 -08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
minggo 8f8194fbc8 Merge pull request #10026 from andyque/fixWidgetNavigationNullptr 
fix crash when navigation controller is null
 2015-01-15 18:27:56 +08:00