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

12801 Commits

Author SHA1 Message Date
James Chen 8cf1337777 Update AUTHORS [ci skip] 2013-11-01 17:48:10 +08:00
James Chen c754e1b64f Merge pull request #4035 from darkdukey/mousewheel_mac 
issue #3099: Adding MouseEvent and MouseListener, Adding Mouse Support For Desktop Platform.
 2013-11-01 02:33:28 -07:00
minggo 5ca7f3425b Merge pull request #4055 from minggo/iss2905-adjust_folder 
fix a bug when building AssetsManagerTest
 2013-11-01 02:04:23 -07:00
James Chen aad4f3551a Merge pull request #4054 from dumganhar/develop 
Don't set debug flag in AndroidManifest.xml.
 2013-11-01 02:03:18 -07:00
minggo 81c16d9a0e fix a bug when building AssetsManagerTest 2013-11-01 17:03:15 +08:00
James Chen 9fad8bfc8d Don't set debug flag in AndroidManifest.xml. 2013-11-01 17:02:35 +08:00
minggo cd0a1b4d6d Merge pull request #4053 from minggo/iss2905-adjust_folder 
[ci skip]Iss2905 adjust folder
 2013-11-01 01:54:07 -07:00
minggo 915d75ea7c build release version of android samples 2013-11-01 16:44:35 +08:00
minggo 0a59d9eb3e fix assetsmansger path 2013-11-01 16:44:04 +08:00
James Chen 485c9e7fbe Merge pull request #4049 from CocosRobot/updategeneratedsubmodule_1383291729 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-11-01 00:43:58 -07:00
CocosRobot 8aac938531 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 07:42:11 +00:00
James Chen 8e7ed129c5 Update before-install.sh 2013-11-01 15:39:46 +08:00
James Chen a93a904537 Merge pull request #4048 from dumganhar/develop 
[Bindings] Skip Label::getLettersInfo
 2013-11-01 00:36:16 -07:00
James Chen daf4e22819 [Bindings] Skip Label::getLettersInfo 2013-11-01 15:34:08 +08:00
James Chen 9177f78e5e Merge pull request #4046 from dumganhar/ios-mac-project-fix 
iOS and Mac project fix[ci skip]
 2013-11-01 00:24:08 -07:00
James Chen a04d1acede Fix of compilation errros of SimpleGame. 2013-11-01 15:19:51 +08:00
James Chen ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
James Chen e0640ab5c6 Merge pull request #4044 from CocosRobot/updategeneratedsubmodule_1383288749 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-10-31 23:57:32 -07:00
CocosRobot 6eb6809b2c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 06:52:31 +00:00
James Chen 997cee4cb4 Merge pull request #4043 from samuele3hu/developHttp 
Modify the all luajit build scripts and let libluajit.a of mac only support 64bit
 2013-10-31 23:48:18 -07:00
samuelhu e93bcca13e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 2013-11-01 14:44:21 +08:00
samuelhu 8580b16638 Modify let the libluajit.a of mac only support 64bit 2013-11-01 14:40:35 +08:00
samuelhu b0fdb66d2d Modify the all luajit build scripts and let libluajit.a of mac only support 64bit 2013-11-01 14:38:14 +08:00
minggo be1afb502b Merge pull request #4041 from minggo/iss2905-adjust_folder 
can run build-android.python in any path
 2013-10-31 23:28:23 -07:00
minggo d98c6f8de6 can run build-android.python in any path 2013-11-01 14:27:29 +08:00
James Chen afeb38be51 Merge pull request #4040 from dumganhar/travis-update 
Updating travic-ci scripts.
 2013-10-31 20:51:34 -07:00
James Chen 72d6f8650b Regular expression fix for generate-jsbindings.sh. 2013-11-01 11:50:43 +08:00
James Chen 1d932ae95f Updating travic-ci scripts. 2013-11-01 11:46:02 +08:00
James Chen db6bce4cf0 Merge pull request #4023 from samuele3hu/developHttp 
issue #3049:Add XMLHttpRequest lua binding and corresponding test sample
 2013-10-31 20:40:29 -07:00
samuelhu 5010779e39 issue #3049:Reset .project file in pro.android. 2013-11-01 11:36:06 +08:00
James Chen 3a8c052ae5 Merge pull request #4039 from dumganhar/spv25 
issue #2826: Bug fix of 'js::IsInRequest'
 2013-10-31 19:56:09 -07:00
James Chen 0298c338a6 issue #2826: Updating cocos2d-console submodule. 2013-11-01 10:46:06 +08:00
James Chen baccf828f3 closed #2826: Removing js::IsInRequest in ScriptingCore.cpp for win32. 2013-11-01 10:45:01 +08:00
James Chen 0c6748b577 issue #2826: Bug fix of 'js::IsInRequest' 2013-11-01 10:44:15 +08:00
minggo f684dc0ff7 Merge pull request #4025 from Dhilan007/di2893 
issues #2893:perfect new label
 2013-10-31 18:46:30 -07:00
minggo 0a9755bcc4 Merge pull request #4037 from samuele3hu/developLabelTTF 
issue #2970:crash for CCLabelTTF when setting dimension width less than the font height
 2013-10-31 18:45:42 -07:00
Ricardo Quesada c9a7181a55 Merge pull request #4038 from ricardoquesada/perf_glprogram 
Adds flags in  GLProgram to prevent sending uneeded uniforms
 2013-10-31 17:57:51 -07:00
Ricardo Quesada 17af5b6850 Adds flags in GLProgram to prevent sending uneeded uniforms 2013-10-31 17:56:15 -07:00
James Chen 074f688d95 Merge pull request #4030 from dumganhar/spv25 
[sp v25] Updating SpiderMonkey library to FFv25.
 2013-10-31 07:08:09 -07:00
samuelhu de4aaeda2d issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-31 22:06:34 +08:00
samuelhu 4031556398 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developHttp 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	samples/Lua/TestLua/Resources/luaScript/mainMenu.lua
 2013-10-31 21:57:24 +08:00
James Chen 8884c58ac1 issue #2826: Updating ScriptingCore.cpp. runScript small fix. 2013-10-31 21:03:06 +08:00
Dhilan007 150f1aeaab issue #2893:improve new label 2013-10-31 20:17:30 +08:00
Dhilan007 b8faaeba59 issus #2893:improve new label 2013-10-31 17:52:22 +08:00
samuelhu 80c29b5a9c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLabelTTF 2013-10-31 17:01:43 +08:00
samuelhu 15cf519757 issue #2970:crash for CCLabelTTF when setting dimension width less than the font height 2013-10-31 16:59:55 +08:00
James Chen ca4c181e4a Merge pull request #4036 from dumganhar/develop 
closed #3093: [JSB] The last test of OpenglTest crashes on Windows.
 2013-10-31 01:43:55 -07:00
James Chen 4b2429186c closed #3093: The last test of OpenglTest crashes on Windows. 2013-10-31 16:27:00 +08:00
minggo 2c2cdd08dc Merge pull request #4034 from samuele3hu/developLuaOcBridge 
issue #2794:Add LuaObjectCBridge and related test sample
 2013-10-31 01:14:59 -07:00
Nite Luo 771844fc58 Fix android build after adding MouseEvent and MouseTest 2013-10-31 00:40:38 -07:00