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

12541 Commits

Author SHA1 Message Date
minggo 40d91f0afa disable compressing png when deploying for iOS device 2013-09-18 11:16:28 +08:00
James Chen 37ce756d12 Merge pull request #3674 from CocosRobot/updategeneratedsubmodule_1379468394 
[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
 2013-09-17 18:51:46 -07:00
CocosRobot 8c1bdd900b [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-18 01:39:57 +00:00
minggo 75d31b3c5c Merge pull request #3603 from ktaobo/disable-nslog 
Disable log output on release build
 2013-09-17 18:37:09 -07:00
minggo 38b618bc4f Merge pull request #3661 from samuele3hu/developTest 
Modify AppDelegate.cpp file of multi-platform-lua for Design Resolution Size
 2013-09-17 18:36:21 -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
zhangcheng 0e8b6bd57b Merge branch '#4684' of https://github.com/chengstory/cocos2d-x into #4684 2013-09-17 23:47:18 +08:00
zhangcheng 0708edb762 1. remove CocoStudio/GUI/Action *.cpp *.h 2013-09-17 23:45:53 +08:00
minggo 95bdfcd84d Merge pull request #3668 from CocosRobot/updategeneratedsubmodule_1379432233 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-09-17 08:41:13 -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
CocosRobot eb88e8e365 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-09-17 15:37:17 +00:00
Huabing.Xu e521d881b2 check glfw has been installed when installing glfw 2013-09-17 23:26:54 +08:00
James Chen 4542732207 Merge pull request #3664 from dumganhar/keyboard_test 
[win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32.
 2013-09-17 08:23:02 -07:00
James Chen f403f7d683 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into keyboard_test 
Conflicts:
	samples/samples.xcodeproj/project.pbxproj
 2013-09-17 23:24:14 +08:00
Dhilan007 a3524f420d . 2013-09-17 23:22:16 +08:00
James Chen e563c27994 Keypad event fix for js and lua bindings. 2013-09-17 23:21:45 +08:00
minggo c2e53d5673 Merge pull request #3665 from minggo/merge-physics 
Merge physics
 2013-09-17 08:18:55 -07:00
Dhilan007 509bea531a android platform:fix EditBox not show input box and crash. 2013-09-17 23:16:32 +08:00
Dhilan007 3a283839bb Merge https://github.com/cocos2d/cocos2d-x into develop 2013-09-17 23:06:04 +08:00
James Chen 513237d5f6 Fixing armature test crash. 2013-09-17 23:03:33 +08:00
chengstory 5fade0829f 1. change files name. 2013-09-17 22:58:33 +08:00
zhangcheng c065dd2920 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684 2013-09-17 22:41:42 +08:00
zhangcheng a1d2045793 1.rename cocoaction system files 2013-09-17 22:39:42 +08:00
James Chen aaf4a6a81b [win32] clear keycode map before init eglview. 2013-09-17 22:37:16 +08:00
minggo b1c8871208 linux build ok 2013-09-17 22:36:15 +08:00
James Chen 7d94878173 [win32] glfw keyboard callback is enabled now. Enables KeyboardTest for win32. 2013-09-17 22:34:20 +08:00
chengstory cf1f054012 1. update mac and iOS projects. 2013-09-17 21:36:30 +08:00
minggo 5e858becf4 Merge pull request #3660 from nutty898/Merge_GUI_to_Develop 
Merge gui to develop
 2013-09-17 06:25:09 -07:00
CaiWenzhi 1f45bad5e7 Modify guy example 2013-09-17 21:19:04 +08:00
zhangcheng ec401d1148 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into #4684 2013-09-17 21:15:36 +08:00
zhangcheng b86a8271d9 1. Upload Cocostudio Action. 2013-09-17 21:14:45 +08:00
samuele3hu 0428cbbade Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest 2013-09-17 21:02:29 +08:00
CaiWenzhi d9721a41dd Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 21:01:50 +08:00
samuele3hu 423e7adf93 Modify AppDelegate.cpp file of multi-platform-lua 2013-09-17 21:01:43 +08:00
James Chen e3a34bd5c5 Merge pull request #3657 from 2youyouo2/develop 
update armature[ci skip]
 2013-09-17 05:45:17 -07:00
CaiWenzhi f42797bc0d Merge branch 'develop' into Merge_GUI_to_Develop 2013-09-17 20:43:16 +08:00
James Chen 05ef572b24 Merge pull request #3656 from dabingnn/release30_bug_hot_fix 
fix template cpp not compiled in ipad retina[ci skip]
 2013-09-17 05:36:00 -07:00
James Chen 1b573da782 Merge pull request #3652 from dumganhar/iss2450-httpclient-64bit-crash 
closed #2450: Fixing HttpClientTest crashes on 64bit system.[ci skip]
 2013-09-17 05:35:28 -07:00
CaiWenzhi 841408d1bc Modify events methods 2013-09-17 20:34:26 +08:00
James Chen 50904d9c2d Merge pull request #3658 from dumganhar/develop 
[jsb] Marks cc.Menu.setHanlderPriority as deprecated method. Bug fix in JSTouchDelegate class.[ci skip]
 2013-09-17 05:31:45 -07:00
James Chen b3dfa0f886 [jsb] Marks cc.Menu.setHanlderPriority as deprecated method. Bug fix in JSTouchDelegate class. 2013-09-17 20:33:25 +08:00
2youyou2 57ec881727 support set tween key 2013-09-17 20:14:08 +08:00
CaiWenzhi 9d07b2c1d2 Temp commit 2013-09-17 20:13:23 +08:00
minggo ba820790ec Merge https://github.com/cocos2d/cocos2d-x into merge-physics 2013-09-17 20:06:33 +08:00
Huabing.Xu c1599300f6 fix template cpp not compiled in ipad retina 2013-09-17 20:05:24 +08:00
James Chen 81df48b264 Updating submodule of JS-Test. 2013-09-17 19:32:15 +08:00
Dhilan007 cb4683c8c2 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 19:30:53 +08:00
minggo ab26d63b86 Merge branch 'merge-physics' of https://github.com/minggo/cocos2d-x into develop 2013-09-17 19:30:49 +08:00
James Chen ea2afd75ca Merge pull request #3655 from dumganhar/develop 
Updating submodule of JS-Test.[ci skip]
 2013-09-17 04:30:24 -07:00
Dhilan007 087271b455 Merge branch 'develop' of github.com:cocos2d/cocos2d-x into develop 2013-09-17 19:26:53 +08:00