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

10615 Commits

Author SHA1 Message Date
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
minggo 7e56bb57c8 Merge pull request #3076 from samuele3hu/execDev 
issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader
 2013-07-05 01:32:06 -07:00
Éloi Rivard 6354b7e9c3 Fixed linux compilation bug in eclipse 2013-07-05 10:28:06 +02:00
samuele3hu ec2f5376f1 issue #2244:Add namespace to some enums 2013-07-05 16:05:38 +08:00
James Chen 4838f0f39c Merge pull request #3081 from dumganhar/iss2368-js-test-url 
issue #2368: JS-Test repo needs to use the URL of cocos2d/cocos2d-js-tests
 2013-07-05 00:36:42 -07:00
James Chen 47c28c43c9 Updating auto jsbindings glue codes. 2013-07-05 15:34:45 +08:00
James Chen a996b878cd issue #2368: Updating JS-test. 2013-07-05 15:30:33 +08:00
James Chen d6da357795 issue #2368: Using cocos2d/cocos2d-js-tests.git as the submodule. 2013-07-05 15:30:12 +08:00
James Chen fcc02d476c Updating AppDelegate.cpp 2013-07-05 15:24:29 +08:00
James Chen e03091f934 Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture. 2013-07-05 15:18:04 +08:00
James Chen 6dffa99e32 Merge pull request #3080 from dumganhar/iss2373-const 
Adding missing overload const getter functions.
 2013-07-05 00:13:55 -07:00
James Chen 268245635d issue #2373: Fixing a bug in CardinalSplineTo::clone function. this->_points needs to be cloned. 2013-07-05 15:08:52 +08:00
James Chen ec902c3550 issue #2373: Adding missing overload const getter functions. 2013-07-05 15:08:52 +08:00
James Chen d2746bbe90 issue #2373: Removing inline for virtual function. Adding more const getter functions. 2013-07-05 15:08:52 +08:00
James Chen 9d2152b513 sudo apt-get update before install new packages 2013-07-05 13:45:37 +08:00
minggo 12bc534475 Merge pull request #3079 from dabingnn/Issue-2367-ClippingNodes-Bug 
issue #2367: Fix Bug "ClippingNodes work different in Android and IOS"
 2013-07-04 22:42:03 -07:00
James Chen 76bbef97ce Merge pull request #3078 from natural-law/develop 
Add online IAP feature in plugins : uc, nd91 & qh360.
 2013-07-04 22:40:41 -07:00
Huabing.Xu 7a61ead598 issue #2367: Fix Bug "ClippingNodes work different in Android and IOS" 2013-07-05 11:59:46 +08:00
zhangbin 2bdf55d78d Add workspace for iOS projects of plugin-x. 2013-07-05 11:42:01 +08:00
samuele3hu 9eb31df9f3 issue #2244:Replace the tab with space 2013-07-05 11:29:21 +08:00
samuele3hu 2aef49f251 issue #2244:Replace the tab with space 2013-07-05 11:24:28 +08:00
zhangbin 1d4c9dbfe0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-05 11:02:30 +08:00
James Chen 267823d473 Merge pull request #3077 from dumganhar/iss2371-template 
Updating multi-platform-template for iOS and Mac, and deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder.
 2013-07-04 20:01:33 -07:00
James Chen 8f5dba6c44 issue #2371: Using the same prefix header for iOS and Mac. 2013-07-05 10:53:16 +08:00
zhangbin 4282190781 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-07-05 10:52:49 +08:00
James Chen a25dce5b2d issue #2371: Deleting cocos2dx/proj.ios and cocos2dx/proj.mac since it isn't needed anymore, moving the prefix header file to previous folder. 2013-07-05 10:52:46 +08:00
zhangbin e999cc9541 closed #2376, Add online IAP feature in plugins : uc, nd91 & qh360. 2013-07-05 10:51:08 +08:00
James Chen cd2fae36f1 issue #2371: Updating multi-platform-template for iOS and Mac 2013-07-05 10:31:20 +08:00
samuele3hu bb244edae6 issue #2244:Modify a function name to createCCBReader 2013-07-05 10:25:37 +08:00
samuele3hu c0e89a4ee9 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into execDev 2013-07-05 09:49:01 +08:00
minggo 7bcafb46a4 Merge pull request #3051 from samuele3hu/execDev 
issue #2244:make some execute funs into one fun in ScriptEngineProtocol
 2013-07-04 03:33:12 -07:00
James Chen debfc23b16 Merge pull request #3074 from dumganhar/iss2371-add-lua-ios-mac 
ios and mac projects need to be unified in one simple xcode project, adding lua projects for Mac and iOS.
 2013-07-04 02:55:38 -07:00
samuele3hu b0e4757c24 issue #2244:Modify CallFunc event bug and modify a function name to createCCBreader 2013-07-04 17:54:02 +08:00
James Chen 3138281cab issue #2371: [Lua] Only 64bit target needs the linking flag '-pagezero_size 1000 -image_base ' 2013-07-04 17:53:23 +08:00
James Chen 6ed014ab00 issue #2371: Removing unused file. 2013-07-04 17:25:52 +08:00
James Chen dca0874ee3 issue #2371: Removed unused projects. 2013-07-04 17:24:34 +08:00
James Chen be98d53264 issue #2371: Reverting .gitignore file. We need to add .xcworkspacedata to ignore list. 2013-07-04 17:22:07 +08:00
James Chen 1755e7778f close #2371: Updating LuaCocos2d.cpp. 2013-07-04 17:15:48 +08:00
James Chen a67ac821f7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-04 17:15:09 +08:00
James Chen 1d941f7c25 issue #2371: Adding scripting/lua/luajit/mac/libluajit.a 2013-07-04 17:11:13 +08:00
James Chen 7d3a63bb23 issue #2371: Adding HelloLua and TestLua projects for MAC. 2013-07-04 17:10:47 +08:00
James Chen 740d0b7cab issue #2371: Delete unused files 2013-07-04 17:09:51 +08:00
James Chen 62879c3789 issue #2371: Updating CCTexture2D.pkg. 2013-07-04 17:09:23 +08:00
James Chen 686a1021b6 issue #2371: Updating luajit building script for Mac 64 bit. We need to build a 32bit, 64bit fat library. 2013-07-04 17:08:56 +08:00
James Chen 399a6a9a48 issue #2371: Updating LuaCocos2d.cpp. 2013-07-04 17:07:56 +08:00
James Chen 83b23c67fd issue #2371: Set design resolution for TestLua. 2013-07-04 17:07:34 +08:00
James Chen 84ce80dcd2 issue #2371: [Mac] glClearDepth --> glClearDepthf, glDepthRange --> glDepthRangef, glReleaseShaderCompiler --> NULL . 2013-07-04 16:31:50 +08:00
James Chen 50a8067b74 issue #2371: std::vector<std::string>::iterator --> auto in CCFileUtils.cpp. 2013-07-04 16:30:35 +08:00
James Chen 808ce2e208 close #2371: Adding Lua projects for Mac. 2013-07-04 16:29:06 +08:00
samuele3hu 570f2663f4 issue #2244:Modify ScriptData struct and functions related with sendEvent 2013-07-04 15:44:42 +08:00