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

14979 Commits

Author SHA1 Message Date
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
James Chen 940c673278 Merge pull request #4657 from chuanweizhang2013/develop 
closed #2860: Project creator supports creating project at any folder and supports UI
 2013-12-31 00:07:03 -08:00
minggo da2487f653 Merge pull request #4754 from dabingnn/develop_RenderTextureBug 
Develop render texture bug
 2013-12-30 23:23:16 -08:00
chuanweizhang 6b5b49bb0b solve linux can't build 2013-12-31 15:08:21 +08:00
chuanweizhang 2579573b7e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-31 14:58:37 +08:00
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug 
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
 2013-12-31 14:58:11 +08:00
Huabing.Xu 8d9f62731e fix RenderTextureTestDepthStencil test sample 2013-12-31 14:48:07 +08:00
minggo a80c9dd625 Merge pull request #4752 from Dhilan007/label_distanceField 
fix align text error in label
 2013-12-30 22:27:55 -08:00
James Chen 999d46301c Merge pull request #4750 from natural-law/develop 
Update the JS binding code & samples for latest cocos2d engine.
 2013-12-30 22:15:53 -08:00
Dhilan007 b51efbd654 fix align text error in label 2013-12-31 14:13:26 +08:00
zhangbin 06dba7fc69 Update the JS binding code & samples for latest cocos2d engine. 2013-12-31 14:07:45 +08:00
yinkaile c88f098a66 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2013-12-31 13:18:27 +08:00