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

745 Commits

Author SHA1 Message Date
Dhilan007 3305dd1de3 issues #2905:add miss file 2013-10-23 17:05:27 +08:00
Dhilan007 f11dba586a issue #2905:modification vs-project for folder structure change 2013-10-21 22:09:21 +08:00
James Chen d6be31f74a Merge commit 'refs/pull/3943/head' of git://github.com/cocos2d/cocos2d-x into create-project-fix 2013-10-18 10:40:12 +08:00
James Chen 5c5f2d84e2 issue #2905: Updating tolua settings. 2013-10-16 16:27:45 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
Toru Matsuoka de9e831e35 Fix definition of platform for ios and mac. 
Remove unnecessary files
 2013-10-14 20:42:45 +09:00
Toru Matsuoka 613bb89120 Make "rename" setting usable. 2013-10-14 20:19:21 +09:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
minggo 9cf7d48d62 include correct path in cocos2dx.ini to generate audio lua binding 2013-10-10 17:04:36 +08:00
minggo 7b7aabf2de include correct path in cocos2dx.ini to generate audio binding 2013-10-10 16:54:05 +08:00
samuele3hu 531e454eae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
 2013-10-10 11:47:36 +08:00
Dhilan007 20971b0ad2 issues #2895:Synchronize JSB from master to developer 2013-10-08 15:57:34 +08:00
samuele3hu 508654738a issue #2768:Modify armature test sample and skip some functions to lua 2013-10-08 15:45:13 +08:00
samuele3hu 4c1bd825af Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 2013-10-08 10:17:58 +08:00
James Chen 5673af2b3e Updating Bindings-generator. 2013-09-22 10:23:48 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
Ricardo Quesada 4f07dbaece Restores .py file to its original layout 2013-09-19 18:32:47 -07:00
Ricardo Quesada 51834e5291 Xcode template projects fixes 
Updats the xcode project with recommended fixes from Xcode 5.0
 2013-09-19 18:27:11 -07:00
Ricardo Quesada 7ecb9778a3 Product Name is the project name 2013-09-19 18:12:02 -07:00
minggo b91b350f2b Merge pull request #3666 from Dhilan007/develop 
android platform:fix EditBox not show input box and crash.
 2013-09-17 18:33:43 -07:00
minggo fce3aa756d Merge pull request #3667 from dabingnn/release30_bug_hot_fix 
check glfw has been installed when installing glfw
 2013-09-17 08:41:00 -07:00
Huabing.Xu e521d881b2 check glfw has been installed when installing glfw 2013-09-17 23:26:54 +08:00
minggo d488796896 Merge branch 'iss2771_physical' of https://github.com/boyu0/cocos2d-x into merge-physics 2013-09-17 18:14:12 +08:00
Dhilan007 a39e0d8521 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 18:06:48 +08:00
samuele3hu 068d0140d9 Manual bind the getDescendants function of the SpriteBatchNode class 2013-09-17 17:41:53 +08:00
boyu0 a454e373c7 issue #2771: move include chipmunk and box2d to cpp 2013-09-17 17:39:08 +08:00
Dhilan007 18cea20634 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 17:14:20 +08:00
boyu0 b5b6406976 issue #2771: edit compile setting. 2013-09-17 17:09:07 +08:00
Dhilan007 5d8ea9f1e5 JSB:manually bind SpriteBatchNode::getDescendants in "cocos2d_specifics.cpp". 2013-09-17 17:03:45 +08:00
boyu0 89ec5edf78 issue #2771: edit compile setting. 2013-09-17 16:42:24 +08:00
samuele3hu 3809a6feed Repair some lua test samples bug and del tool/tolua++ folders 2013-09-17 13:59:48 +08:00
minggo e4f8929898 Merge pull request #3606 from dabingnn/issue_2808_glfw_bug_enhancement 
Issue 2808 glfw bug enhancement
 2013-09-15 20:18:02 -07:00
Huabing.Xu 20fde2bcde issue #2808:glfw linux scripts 2013-09-16 10:11:46 +08:00
samuele3hu aa4c90e97a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Armature 
Conflicts:
	extensions/cocos-ext.h
 2013-09-14 19:29:36 +08:00
James Chen dd7bfd7b60 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into new-event-dispatcher-rebase 
Conflicts:
	cocos2dx/CCDirector.h
	cocos2dx/keyboard_dispatcher/CCKeyboardDispatcher.h
	cocos2dx/keypad_dispatcher/CCKeypadDelegate.h
	cocos2dx/keypad_dispatcher/CCKeypadDispatcher.h
	cocos2dx/layers_scenes_transitions_nodes/CCLayer.h
	cocos2dx/menu_nodes/CCMenu.h
	cocos2dx/platform/CCAccelerometerDelegate.h
	cocos2dx/platform/android/CCAccelerometer.h
	cocos2dx/platform/ios/CCAccelerometer.h
	cocos2dx/platform/mac/CCAccelerometer.h
	cocos2dx/platform/win32/CCAccelerometer.h
	cocos2dx/script_support/CCScriptSupport.h
	cocos2dx/touch_dispatcher/CCTouchDelegateProtocol.h
	cocos2dx/touch_dispatcher/CCTouchDispatcher.h
	cocos2dx/touch_dispatcher/CCTouchHandler.h
	extensions/CocoStudio/Components/CCInputDelegate.h
 2013-09-13 19:06:09 +08:00
James Chen ff24eac21a [dispatcher] Adding new EventDispatcher Test to Makefile and project. 2013-09-13 18:08:00 +08:00
samuele3hu 3a334b7478 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into doxygen 2013-09-13 11:42:04 +08:00
samuele3hu a34ec99014 issue #2784:Add js-binding and lua-binding document 2013-09-13 11:41:20 +08:00
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
James Chen ce52997fc2 [Dispatcher] Updating tools/tojs/.ini 2013-09-12 15:34:14 +08:00
James Chen 2603e4acf4 Merge pull request #3540 from samuele3hu/TableView 
issue #2764:Modify ScriptHandlerMgr's enum to enum class and modify some related functions
 2013-09-11 02:52:38 -07:00
성낙호 bf4eaa7e7c merged 2013-09-09 18:20:16 +09:00
samuele3hu 357466bab2 issue #2768:Add Armature lua binding and releated test samples 2013-09-09 10:20:32 +08:00
minggo 249b4d79a3 Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor 
Iss2460 glfw refractor
 2013-09-05 18:28:31 -07:00
samuele3hu 4f9a9bfe85 issue #2433:Modify ScriptHandlerMgr's enum to enum class and modify some related functions 2013-09-04 22:17:26 +08:00
samuele3hu 5ee2a7e58e issue #2433:Rename pointSize function name as setPointSize and Modify bindings-nerator 2013-08-30 17:15:16 +08:00
samuele3hu 8f338cc209 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator-new 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-08-30 15:21:59 +08:00
Huabing.Xu ef7f51d875 issue #2460: script compile error 2013-08-30 10:29:59 +08:00
Huabing.Xu 0136a2cb0f issue #2460: script compile error 2013-08-30 09:37:48 +08:00