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

2087 Commits

Author SHA1 Message Date
Vincent Yang 3addf38134 Fixed #12906 : Can't add custom member to cocos2d::Scene subclass. 2015-07-22 12:01:34 +08:00
pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
	docs/RELEASE_NOTES.md
	tools/cocos2d-console
	tools/tojs/cocos2dx.ini
 2015-07-21 11:39:24 +08:00
andyque 042a3dc2ec add xcpretty to framework mac build 2015-07-17 10:48:05 +08:00
Bin Zhang a5e3267c98 Update the reference of submodule cocos2d-console. 2015-07-17 10:08:35 +08:00
pandamicro 490d5a3747 Remove cleanup from auto bindings add made it support override in JS 2015-07-16 14:09:26 +08:00
pandamicro 436564f922 Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	docs/RELEASE_NOTES.md
	web
 2015-07-15 14:39:40 +08:00
pandamicro 3c08b497ba Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2015-07-15 14:26:19 +08:00
pandamicro 7f7cf92da3 Update bindings-generator 2015-07-15 14:21:47 +08:00
andyque 15b0fea530 fix win32&win8.1 template compile 2015-07-15 10:00:35 +08:00
Bin Zhang 55890f6206 Update the JS templates to keep the directory structure is same with before. 2015-07-14 18:07:17 +08:00
andyque 97168fa139 add cocos framework build on linux platform. 2015-07-14 16:25:54 +08:00
andyque ac1bf36208 update submodule 2015-07-14 10:10:20 +08:00
Bin Zhang 569695d844 Update the reference of submodule cocos2d-console. 2015-07-14 09:40:42 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
Bin Zhang 75920b8e11 Update the reference of submodule cocos2d-console. 2015-07-13 12:05:17 +08:00
pandamicro 15bb633adb Revert "add lua-binding of EventDispacher::dispatchCustomEvent()" 2015-07-12 20:19:52 +08:00
pandamicro 0d9da2f500 Merge pull request #12773 from minggo/bind-missing-function 
add lua-binding of EventDispacher::dispatchCustomEvent()
 2015-07-11 17:17:32 +08:00
Bin Zhang 8ca9e10a22 Use msbuild to generating engine prebuilt libs on win32. 2015-07-10 17:01:08 +08:00
pandamicro 2d27091398 Merge pull request #12717 from jianglong0156/FileUtilsWriteFunctionMerge 
add write api in FileUtils
 2015-07-10 15:13:21 +08:00
minggo 3911e1d696 add lua-binding of EventDispacher::dispatchCustomEvent() 2015-07-10 10:29:21 +08:00
andyque 9857a4acc4 fix template daily build 2015-07-09 14:17:49 +08:00
andyque 6cf38586c2 fix template daily build 2015-07-09 13:50:58 +08:00
andyque 32171c491a fix slave scripts path 2015-07-09 11:34:37 +08:00
andyque 0d0787b212 fix pr build scripts 2015-07-09 11:26:55 +08:00
andyque c83a398381 fix win32 and winrt build error 2015-07-09 10:27:13 +08:00
andyque 4bdbca829b fix scripts path error 2015-07-09 10:15:27 +08:00
andyque 7098261523 unassigned shouldn't trigger jenkins rebuild 2015-07-09 10:10:37 +08:00
andyque 3f07b0c67a refactor daily build into one 2015-07-09 09:53:20 +08:00
andyque 2df9ce8909 fix runtime ios build error 2015-07-08 18:05:12 +08:00
pandamicro 30c79fea02 Add auto bindings for Frame::g|setTweenType 2015-07-08 17:19:30 +08:00
andyque dda07bebf5 fix ios/mac/win32/win8.1 compile error 2015-07-08 07:36:26 +08:00
andyque a18116aaa4 minor improvements 2015-07-07 16:56:38 +08:00
andyque 0ca645f744 add runtime daily build script 2015-07-07 16:54:03 +08:00
andyque 47bae38168 finish template daily build 2015-07-07 16:27:38 +08:00
andyque 04ade7c16e remove xcode scheme 2015-07-07 14:57:25 +08:00
jianglong0156 13d00d129d fix the jsb and lua ini error, ignore writeDataToFile 2015-07-07 14:54:31 +08:00
andyque a5115bd739 improve 2015-07-07 14:34:02 +08:00
andyque 494036be1a fix linux build 2015-07-07 14:34:02 +08:00
andyque d8bf9c8a2a improve template daily build scripts 2015-07-07 14:34:02 +08:00
andyque 6238ddebf3 Merge remote-tracking branch 'upstream/v3.7-release' into v3 2015-07-07 10:18:43 +08:00
pandamicro a9f98aefea [Simulator JSB] Fix issue caused by video and web view binding 2015-07-07 09:38:38 +08:00
andyque 92585d3a8e fix python syntax error 2015-07-06 17:09:55 +08:00
andyque 881a388892 add framework daily build scripts 2015-07-06 16:43:37 +08:00
Bin Zhang 0bcdf898bf Solve the error in simulator. 2015-07-04 10:17:40 +08:00
pandamicro aeeb6eb683 Merge pull request #12661 from pandamicro/v3.7-release 
Fixed #12652 Add retain/release for XMLHTTPReqest in JSB
 2015-07-04 08:40:55 +08:00
pandamicro 6f3fc302e6 Fix web view and video player in simulator 2015-07-04 08:39:49 +08:00
andyque 4704d38c13 add v3 to travis build 2015-07-03 18:27:42 +08:00
andyque 698f70f5b6 fix runtime template compilation 2015-07-03 15:38:53 +08:00
andyque f37d4d226b fix templates daily build issue 2015-07-03 15:18:33 +08:00
Bin Zhang f27b370b94 Add argument --ios to compile Mac & iOS platforms separately. 2015-07-03 11:31:40 +08:00