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

177 Commits

Author SHA1 Message Date
Michael Contento ffad18a1ed Trigger onKeyReleased only after the key has been released 2013-11-02 06:15:08 +01:00
CocosRobot 6360c40725 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 13:03:20 +00:00
James Chen e2f14635e8 Merge pull request #4065 from dumganhar/develop 
closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter.
 2013-11-01 05:55:32 -07:00
James Chen 50c4261092 closed #3104: Touch listener should be registered in Menu::initXXX and Control::init rather than onEnter. 2013-11-01 20:53:51 +08:00
James Chen 84e8aaf016 Merge pull request #4012 from ledyba/fix_inclusion_phys 
include climits for UINT_MAX
 2013-11-01 04:55:51 -07:00
CocosRobot a272bcd6ea [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 10:02:54 +00:00
minggo d4210c77bb Merge pull request #4058 from samuele3hu/developAssetsManager 
issue #3037:Add assetsmananger lua binding and a releated test sample
 2013-11-01 02:50:47 -07: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
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
 2013-11-01 17:17:21 +08:00
CocosRobot 8aac938531 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 07:42:11 +00: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 ed10b92a60 Fix of including wrong include files. 2013-11-01 15:19:10 +08:00
CocosRobot 6eb6809b2c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-11-01 06:52:31 +00: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
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 baccf828f3 closed #2826: Removing js::IsInRequest in ScriptingCore.cpp for win32. 2013-11-01 10:45:01 +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 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 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
samuelhu 5891f00967 issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-31 21:52:28 +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 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2013-10-31 17:22:14 +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 4b2429186c closed #3093: The last test of OpenglTest crashes on Windows. 2013-10-31 16:27:00 +08:00
Nite Luo 771844fc58 Fix android build after adding MouseEvent and MouseTest 2013-10-31 00:40:38 -07:00
samuelhu de4b4dcc73 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developLuaOcBridge 2013-10-31 15:23:25 +08:00
samuelhu faf3b30e9b issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
James Chen f478e2d2a5 issue #2826: Bug fixes for win32. 2013-10-31 15:15:52 +08:00
James Chen 6f978c5cbd issue #2826: Bug fixes after using Spidermonkey v25. Adding JSB_AUTOCOMPARTMENT_WITH_GLOBAL_OBJCET macro. 2013-10-31 15:13:49 +08:00
Nite Luo 49a2acfbd4 Merge branch 'develop' into mousewheel_mac 2013-10-31 00:10:45 -07:00
Nite Luo a27975763f Add MouseEvent to win32 build 2013-10-31 00:04:39 -07:00
dingpinglv 7e8faed7af fixed #3048: rename some comments 2013-10-31 14:36:17 +08:00
dingpinglv f172abbc14 fixed #3048: add some comments for cc.rect 2013-10-31 14:31:25 +08:00
Nite Luo fe04448c8d Merge folder changes from develop 2013-10-30 23:19:36 -07:00
dingpinglv c116d070d3 Closed #3048: cc.rect can receiving different type parameters now 2013-10-31 14:16:42 +08:00
James Chen 0f7a99f898 [sp v25] Don't use 'using namespace std;' to make android build happy. 2013-10-31 11:15:18 +08:00
James Chen 541a0478ac [sp v25] Removing unused comments in main.js 2013-10-31 11:15:18 +08:00
James Chen d2fc29dbfa [sp v25] Updating Debugger script. 2013-10-31 11:15:17 +08:00
James Chen a81998ccf6 [sp v25] Debugger script, loading file is ok. 2013-10-31 11:15:17 +08:00
James Chen d1b88b0a78 [sp v25] Updating auto-generated and bindings-generated submodules. 2013-10-31 11:15:17 +08:00
James Chen 3b86d6398f [sp v25] Fixing complication errors after updating Spidermonkey to v25. 2013-10-31 11:15:17 +08:00
Dhilan007 a68d92ff5a perfect vs-project configuration 2013-10-31 10:51:38 +08:00
Dhilan007 12db6a32ab issues #2893: 
1.Texture atlas are create on demand, based on the characters used in the label.
  2.Create Quads (and not sprites) for each letter.
 2013-10-31 10:49:37 +08:00
samuelhu 1f07a659a6 issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
samuelhu c08a09a7e0 #3049:Add LICENSE_JSON4LUA and some constant values. 2013-10-30 10:52:04 +08:00