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

18919 Commits

Author SHA1 Message Date
Huabing.Xu 29c345bd02 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-04 18:45:21 +08:00
Huabing.Xu 5d70170a4b getNodetoParentTransform getNodeToWorldTransform return Matrix instead of kmMat4 2014-04-04 18:41:29 +08:00
James Chen 541d4dea0c Merge pull request #6105 from andyque/feature3636 
Added create functions with parameters for all ui controls
 2014-04-04 18:34:59 +08:00
andyque 4b6aa2a22c closed #4636. remove Hungary style 2014-04-04 18:26:53 +08:00
Nick Barrios eae1ccb279 CCGLView: Remove frameZoomFactor param from createWithFullScreen overload. 2014-04-04 06:26:00 -04:00
cw c0fe791aae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime 
Conflicts:
	templates/lua-template-runtime/src/main.lua
 2014-04-04 18:17:54 +08:00
Huabing.Xu 6b4451482f remove matrixToKmMat4 function 2014-04-04 18:13:10 +08:00
James Chen 2f0d561f03 Merge pull request #6144 from shujunqiao/cocos-console-test-add 
[ci skip]add send email in cocos-console-test.py.
 2014-04-04 18:06:38 +08:00
Huabing.Xu 70561088df remove kmMat4ToMatrix function 2014-04-04 18:04:29 +08:00
minggo cf3cf86537 [ci skip] 2014-04-04 18:04:29 +08:00
Nick Barrios 58224d9b23 CCGLView: Add createWithFullscreen overloaded method that allows passing in Size, to set video mode. 2014-04-04 06:02:29 -04:00
minggo 439b30434e Merge pull request #6097 from newnon/android_crash_fix 
Android crash fix on new devices
 2014-04-04 18:01:59 +08:00
Huabing.Xu 184f10ae0f add conversion from kmMat4 to Matrix 2014-04-04 17:58:37 +08:00
andyque e346ed3559 closed #4636. done 2014-04-04 17:38:58 +08:00
andyque e20b3d8eb8 issue #4636. refactor SliderReader 2014-04-04 17:35:15 +08:00
Huabing.Xu f1b1678900 Director::getMatrix returns Matrix instead of kmMat4 2014-04-04 17:31:21 +08:00
andyque af5fe04480 issue #4636. refactor LoadingBarReader 2014-04-04 17:25:20 +08:00
andyque a4e0c1a6e2 issue #4636. refactor LayoutReader 2014-04-04 17:21:23 +08:00
andyque 3482815e69 issue #4636. refactor ImageViewReader 2014-04-04 17:18:24 +08:00
Huabing.Xu ea6d8e4e42 replace kmMat4 in director 2014-04-04 17:16:57 +08:00
andyque c252aa5a55 issue #4636. refactor CheckBoxReader 2014-04-04 17:12:47 +08:00
shujunqiao 1d2c91e403 add send email in cocos-console-test.py. 2014-04-04 17:11:16 +08:00
James Chen eaaab7a49f Update CHANGELOG [ci skip] 2014-04-04 17:02:06 +08:00
James Chen 9cb7871cb4 Merge pull request #6103 from natural-law/issue4584 
Add feature to force update the environment variables in setup.py
 2014-04-04 16:59:57 +08:00
andyque 77aee27f05 issue #4636. refactor ButtonReader 2014-04-04 16:51:07 +08:00
andyque 51404500b7 issue #4636. fixed WidgetReader error 2014-04-04 16:24:54 +08:00
andyque ec83b3db04 issue #4636. fix ButtonReader 2014-04-04 15:21:28 +08:00
James Chen 7b4a1308ea Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node 
children Test`.
 2014-04-04 12:48:16 +08:00
James Chen fe036c3870 Merge pull request #6137 from CocosRobot/update_lua_bindings_1396519852 
[AUTO]: updating luabinding automatically
 2014-04-03 18:16:55 +08:00
CocosRobot c72f256d01 [AUTO]: updating luabinding automatically 2014-04-03 10:12:05 +00:00
James Chen 51697a8906 Update CHANGELOG [ci skip] 2014-04-03 18:04:38 +08:00
James Chen 1ec3f014e8 Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener 
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
 2014-04-03 18:02:44 +08:00
Huabing.Xu f9405e0ea9 Merge branch 'develop' into develop_migrate_math_lib_merge 2014-04-03 17:47:16 +08:00
James Chen c595dd5dec Merge pull request #6136 from CocosRobot/update_lua_bindings_1396518289 
[AUTO]: updating luabinding automatically
 2014-04-03 17:46:51 +08:00
CocosRobot 279b371031 [AUTO]: updating luabinding automatically 2014-04-03 09:46:03 +00:00
James Chen b174eca9ee Merge pull request #6135 from CocosRobot/update_cocosfiles_1396518155 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-04-03 17:45:15 +08:00
CocosRobot 25b24a62cb [AUTO][ci skip]: updating cocos2dx_files.json 2014-04-03 09:42:36 +00:00
andyque c501aa2dec issue #4636. replace __String with StringUtils::format 2014-04-03 17:42:04 +08:00
Huabing.Xu 1b8e45fe19 remove kmGLFreeAll call 2014-04-03 17:40:14 +08:00
James Chen cb8edabb30 Merge pull request #6133 from samuele3hu/develop_new_label 
fix the error about `draw` of GLNode and modify the related test cases
 2014-04-03 17:34:27 +08:00
Huabing.Xu 14f004b12a remove reference to kmGL in director 2014-04-03 17:32:40 +08:00
Huabing.Xu 67e62ce73d readied director::getMatrix again. remove kmGLgetMatrix 2014-04-03 17:26:06 +08:00
James Chen a2081ea210 issue #4557: Updates comments for EventListener::setPaused. 2014-04-03 17:20:16 +08:00
andyque 9bcfea2279 issue #4636. fix some typo 2014-04-03 17:13:24 +08:00
samuele3hu 550f4dca29 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label 2014-04-03 17:03:09 +08:00
James Chen a3214b7505 issue #4557: Updates comments for EventListener::setEnabled/setPaused. 
Also does whitespace cleanup and untabify codes. Thanks emacs. :)
 2014-04-03 17:02:17 +08:00
samuele3hu b68f6bf65e fix the error about `draw` of GLNode and modify the related test cases 2014-04-03 17:02:14 +08:00
James Chen 7a5dba9eb9 issue #4557: Adds const for `EventListener::isEnabeld`. 2014-04-03 16:46:16 +08:00
James Chen ec56796062 Merge pull request #6125 from 2youyouo2/develop 
Two fixes for armature:
1.fixed set blend func
2.fixed changedisplay does not rebind parent's bone
 2014-04-03 16:23:55 +08:00
James Chen a1e9804da3 Update CHANGELOG [ci skip] 2014-04-03 16:21:57 +08:00