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

15193 Commits

Author SHA1 Message Date
James Chen 7abeacd86e HttpClient don't have to be inherited from Object, its a singeton, ok? 2014-01-02 15:47:38 +08:00
Zhe Wang 210aae9243 Delete LICENSE_FontLabel.txt 2014-01-02 15:29:09 +08:00
Zhe Wang 911aafe3db Delete LICENSE_sigslot.txt 2014-01-02 15:28:24 +08:00
Zhe Wang 4252a5501d Delete LICENSE_iconv.txt 2014-01-02 15:28:01 +08:00
Zhe Wang 75d68ee966 Delete LICENSE_bada_pthread.txt 2014-01-02 15:25:42 +08:00
samuele3hu a2b706c87c Rename some common script files to keep consistent 2014-01-02 15:18:32 +08:00
James Chen 1df3ad7317 Merge pull request #4784 from CocosRobot/updategeneratedsubmodule_1388645893 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-01 22:59:33 -08:00
CocosRobot c6425172b7 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:58:15 +00:00
James Chen 91e25bc0b4 Merge pull request #4782 from CocosRobot/updategeneratedsubmodule_1388645344 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-01 22:51:49 -08:00
CocosRobot ada5eb82ec [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-02 06:49:06 +00:00
James Chen 1480dd99d6 Merge pull request #4777 from 2youyouo2/develop 
update armature, change interface from "by" to "with"
 2014-01-01 22:47:18 -08:00
James Chen 69d681e343 Merge pull request #4781 from dumganhar/js-ui-test 
Updates JSB gui test
 2014-01-01 22:44:25 -08:00
samuele3hu cc2e6aef63 Add missis “ccs.” prefix 2014-01-02 14:25:15 +08:00
James Chen e2887a2b64 Updates JS-Test submodule reference. 2014-01-02 14:22:22 +08:00
James Chen 3e044cf90e Updates tools/tojs/cocos2dx_gui.ini. target_namespace from ccs to ccii. 2014-01-02 14:22:00 +08:00
James Chen dd54e906f0 ccs.XXX —> ccui.XXX for gui js bindings. 2014-01-02 14:21:24 +08:00
James Chen efc7effac5 Adds override keyword for some override methods in gui::Widget class. 2014-01-02 14:20:52 +08:00
samuele3hu f1d94b9b7b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DispatcherBak1 2014-01-02 12:02:28 +08:00
samuele3hu b8d4010ae5 Develop branch adds lua trigger for CocoStudio 2014-01-02 12:00:37 +08:00
James Chen fa32569e80 Merge pull request #4776 from pyrasis/develop 
[Win32] Update project files.
 2014-01-01 19:56:29 -08:00
Lee, Jae-Hong c44dea5eb8 [Win32] Update project files. 
- lIbGUI
 2014-01-02 12:49:56 +09:00
yinkaile 1f38fc28a6 change interface 2014-01-02 11:07:31 +08:00
minggo 3a1c5e4f6e Merge pull request #4759 from Dhilan007/develop_crash 
fix crash related to not support the z length modifier for size_t on vs
 2014-01-01 18:47:21 -08:00
yinkaile 3f544b8fc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-01-02 10:40:48 +08:00
子龙山人 8de6cb1981 Merge pull request #6 from cocos2d/develop 
sync original repo
 2014-01-01 18:32:55 -08:00
heliclei e944dae338 update exception catch clause 2014-01-02 10:19:48 +08:00
James Chen 13cf67747a Update CHANGELOG [ci skip] 2014-01-02 09:58:05 +08:00
James Chen 3f4236dda0 Update AUTHORS [ci skip] 2014-01-02 09:57:21 +08:00
James Chen d1ad635ad8 Merge pull request #4497 from zhiqiangxu/develop 
closed #3559: Useless conversion in ScrollView::onTouchBegan
 2014-01-01 17:55:41 -08:00
James Chen e5389ddb31 Merge pull request #4765 from heliclei/develop 
Add exception handling
 2014-01-01 06:00:50 -08:00
James Chen 579f81fb61 Update AUTHORS [ci skip] 2014-01-01 21:56:51 +08:00
James Chen aff08adc66 Update CHANGELOG [ci skip] 2014-01-01 21:55:58 +08:00
James Chen 0ec2738ce5 Merge pull request #4720 from zarelaky/develop 
closed #3556: openal context not destroy correctly on mac and ios
 2014-01-01 05:55:03 -08:00
James Chen b09d93d09e Merge pull request #4767 from CocosRobot/updategeneratedsubmodule_1388584195 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-01 05:51:36 -08:00
CocosRobot ff550bf865 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-01 13:49:57 +00:00
James Chen 2abb152c01 Merge pull request #4766 from dumganhar/gui-rename 
Merge PR #4761, GUI class name renaming
 2014-01-01 05:44:23 -08:00
James Chen 591740253d [GUI] Updates scripting binding configure file. 2014-01-01 21:32:54 +08:00
James Chen 71d21d2e10 Merge commit 'refs/pull/4761/head' of git://github.com/cocos2d/cocos2d-x into gui-rename 2013-12-31 19:13:59 +08:00
heliclei 1c0fc7859b 1.Add exception handling 
2.Correct pull request action name
3.Enlarge description text
 2013-12-31 18:29:32 +08:00
James Chen 168b131fcb Merge pull request #4764 from dumganhar/develop 
[JSB] Adds cc.VisibleRect and updates JS-Test submodule
 2013-12-31 02:28:14 -08:00
James Chen 8c1c9fef15 Bug fix in cc.VisibleRect 2013-12-31 18:17:20 +08:00
James Chen f793ff01b2 Updates JS-test submodule. 2013-12-31 18:15:47 +08:00
James Chen 74a7f68dc1 [JSB] Adds cc.VisibleRect. 2013-12-31 18:12:42 +08:00
James Chen c8c37ac63c Updates JS-Test submodule 2013-12-31 17:25:14 +08:00
CaiWenzhi e825d255bd Merge branch 'develop' into develop_nutty_modify_framework_ModifyLabelClassName 2013-12-31 16:38:11 +08:00
James Chen 7f2dc5197e Updates travis-script, don't build template proj. 
Since we are supporting create project anywhere, to test template projects, projects should be created firstly.Therefore, disable building template for travis-ci.
 2013-12-31 16:37:05 +08:00
CaiWenzhi 81bdfac795 Modify class name Label LabelBMFont LabelAtlas 2013-12-31 16:36:33 +08:00
Dhilan007 ebf3faadc3 fix crash related to not support the z length modifier for size_t on vs 2013-12-31 16:32:16 +08:00
James Chen db475fb43c Merge pull request #4757 from dumganhar/develop 
Adds execute permission for create_project.pyw
 2013-12-31 00:11:22 -08:00
James Chen 75d28a3114 Adds execute permission for create_project.pyw 2013-12-31 16:10:55 +08:00