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

19447 Commits

Author SHA1 Message Date
Ryeeeeee eec96e9e96 sounds pause automatically when switching background 2014-05-08 14:44:47 +08:00
andyque 898a66131a issue #5056. move gui test from ExtensionsTest to the outside 2014-05-08 14:35:45 +08:00
James Chen 2473422a2f Merge pull request #6622 from CocosRobot/update_cocosfiles_1399528834 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-08 14:30:10 +08:00
James Chen 32438a88cd Merge pull request #6623 from CocosRobot/update_lua_bindings_1399528933 
[AUTO]: updating luabinding automatically
 2014-05-08 14:29:54 +08:00
CocosRobot 119ef29a87 [AUTO]: updating luabinding automatically 2014-05-08 06:03:37 +00:00
CocosRobot 9e45b4be3a [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-08 06:00:35 +00:00
minggo 8dba4e3b13 Merge pull request #6570 from gin0606/buildNativeVariableArguments 
Upgrade build_native.py to take variable number of arguments
 2014-05-08 13:59:16 +08:00
minggo 4defe28f1f [ci skip] 2014-05-08 13:47:04 +08:00
minggo e9caee282f Merge pull request #6574 from andyque/focus3861 
issue #3861, add focus functionality to ui framework
 2014-05-08 13:44:01 +08:00
James Chen 7e0aed8702 Merge pull request #6618 from CocosRobot/update_lua_bindings_1399519120 
[AUTO]: updating luabinding automatically
 2014-05-08 11:58:58 +08:00
Ricardo Quesada 4b15b884e7 Uniform is a struct 2014-05-07 20:38:15 -07:00
andyque f6d0135b9b Merge branch 'v3' into focus3861 2014-05-08 11:27:57 +08:00
andyque 323987beb2 closed #4861, done 2014-05-08 11:26:29 +08:00
andyque 238ffcc545 issue #4861, fix pass focus to child 2014-05-08 11:24:09 +08:00
Ricardo Quesada 90ec7dd9ec Merge branch 'improved_glprogram' of https://github.com/super626/cocos2d-x into improved_glprogram 2014-05-07 20:21:03 -07:00
Ricardo Quesada b401f6adc1 Lots of new code 
Adds GLProgramState
 2014-05-07 20:20:19 -07:00
CocosRobot 7aff750381 [AUTO]: updating luabinding automatically 2014-05-08 03:19:36 +00:00
James Chen fec0dba8aa Merge pull request #6589 from samuele3hu/v3_fix 
Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test
 2014-05-08 11:15:54 +08:00
James Chen 37cb91fdc0 Update CHANGELOG [ci skip] 2014-05-08 10:52:15 +08:00
James Chen e521d7bc73 Merge pull request #6614 from Dhilan007/v3_labelhotfixed 
closed #4906: Label created with system font is still visible when its opacity is 0
 2014-05-08 10:51:23 +08:00
andyque b5f1f7455b issue #4861, fix a problem when layout focus loops 2014-05-08 10:46:05 +08:00
samuele3hu ec45dbb0c9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-08 10:22:52 +08:00
Dhilan007 7495f22708 closed #4906:Fixed the label continue to appear when its opacity is set to 0. 2014-05-08 10:12:29 +08:00
Huabing.Xu 41f48e7fa9 Merge branch 'v3' into tony_improved_glprogram 2014-05-07 15:30:04 -07:00
Ricardo Quesada 98454eeb69 Adds GLProgram::createXXX() 2014-05-07 14:38:41 -07:00
Ricardo Quesada 02405a8efe Improved samples 2014-05-07 12:41:04 -07:00
Ricardo Quesada a2c4ddf028 beautify Uniform and VertexAttrib 2014-05-07 11:26:26 -07:00
Ricardo Quesada b1ed7178fe Improved API for Uniforms 2014-05-07 10:44:45 -07:00
yangxiao 5190fb27c8 use proposed vertex attribute api 2014-05-07 09:27:44 -07:00
James Chen f0a834fcad Merge pull request #6611 from dumganhar/v3 
Updates comments in download-deps.py and updates .gitignore
 2014-05-07 23:13:14 +08:00
Mircea Rila b66b4c6f1d upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 
remove C4005 warnings after upgrading projects
 2014-05-07 17:41:04 +03:00
James Chen 357b07d532 Updates comments in download-deps.py and updates .gitignore 2014-05-07 21:36:51 +08:00
James Chen d65d9cae21 Merge pull request #6609 from lmskater/fix_adds-download-deps.py-for-prb 
[Jenkins][ci skip] Fix copy logic of current_3rd_libs
 2014-05-07 20:37:46 +08:00
lm 15c3a0eb8c [Jenkins][ci skip] Fix copy logic of current_3rd_libs 2014-05-07 20:34:06 +08:00
James Chen 1a7ae40fac Merge pull request #6607 from lmskater/adds-download-deps.py-for-prb 
[Jenkins][ci skip] Check external file to support build
 2014-05-07 19:11:56 +08:00
James Chen 3e8f2e41f5 Merge pull request #6603 from CocosRobot/update_cocosfiles_1399455250 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-07 19:10:55 +08:00
lm 05af9e5bed [Jenkins][ci skip] Check external file to support build 2014-05-07 19:01:46 +08:00
andyque 05b7d274c8 issue #4861. fix distance calculation 2014-05-07 18:27:05 +08:00
James Chen a0572e94f8 Merge pull request #6605 from Dhilan007/v3_labelhotfixed 
fixed compilation fail on Android.
 2014-05-07 18:23:20 +08:00
Dhilan007 72709c30d5 fixed compilation fail on Android. 2014-05-07 18:20:40 +08:00
James Chen cb1b32366e Merge pull request #6604 from CocosRobot/update_cocosfiles_1399455808 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-05-07 17:44:45 +08:00
CocosRobot 7fb79c2a52 [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-07 09:43:30 +00:00
CocosRobot 8642d35fbd [AUTO][ci skip]: updating cocos2dx_files.json 2014-05-07 09:34:10 +00:00
James Chen 4e59949d33 Merge pull request #6601 from natural-law/v3 
Update the reference of submodule plugin-x.
 2014-05-07 17:32:50 +08:00
James Chen 3fee1c3f23 Merge pull request #6597 from dumganhar/v3 
Re-adds download-deps.py, unzip works ok and output more detail informations
 2014-05-07 17:31:29 +08:00
James Chen e44fb8141e Updates zip_file_size in external/config.json 2014-05-07 17:30:38 +08:00
James Chen c3bf87b5c7 Updates download-deps.py 2014-05-07 17:26:41 +08:00
James Chen 7d2aed773d Adds 'zip_file_size' section in 'external/config.json' 2014-05-07 17:25:42 +08:00
samuele3hu 8615e13c91 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 17:16:40 +08:00
zhangbin ab4063a393 Update the reference of submodule plugin-x. 2014-05-07 17:04:08 +08:00