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

21682 Commits

Author SHA1 Message Date
minggo 92e113a602 [ci skip] 2014-07-08 10:59:50 +08:00
minggo b0d260d293 Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9 
Fix UITextField IME can't auto detach
 2014-07-08 10:56:16 +08:00
minggo 4ef666ef8b Merge pull request #7335 from Dhilan007/v3-labelttf-color 
fixed can's set color for LabelTTF correctly on IOS.
 2014-07-08 10:54:40 +08:00
minggo aca498b06f [ci skip] 2014-07-08 10:53:07 +08:00
Dhilan007 6e2caf1c78 fixed can's set color for LabelTTF correctly on IOS. 2014-07-08 10:31:14 +08:00
minggo b583684d61 Merge pull request #7332 from 2youyouo2/v3 
fixed set color to parent, it will effect its children
 2014-07-08 10:26:58 +08:00
minggo bf1ec7d463 Merge pull request #7333 from natural-law/v3 
Add configuration in templates to set the bundle identity of Mac & iOS project.
 2014-07-08 10:25:15 +08:00
zhangbin d69050399b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:23:07 +08:00
zhangbin af5cf0a33f Add configuration in templates to set the bundle identity of Mac & iOS project. 2014-07-08 10:22:08 +08:00
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
Huabing.Xu 9fb85e303f change the logic of texture loading 2014-07-08 10:08:02 +08:00
minggo 3344ebbcdd Merge pull request #7267 from andyque/addBinaryFileTests 
add tests to GUI
 2014-07-08 09:51:17 +08:00
minggo e6a3238b80 Merge pull request #7330 from MSOpenTech/wp8-v3-fix 
WP8 v3 build fix
 2014-07-08 09:45:53 +08:00
Dale Stammen 021ee7d1e7 check if _itemsPerRow == 0 to avoid divide by zero 2014-07-07 11:17:05 -07:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
XiaoYang b0f5ce36ff Merge pull request #48 from lvlonggame/v3 
delete the cube model file and modify 3DBundle
 2014-07-07 21:51:10 +08:00
minggo fd7f3dba4b [ci skip] 2014-07-07 19:59:41 +08:00
minggo e1b29a8ef6 Merge pull request #7329 from Dhilan007/v3-gc-refactor 
issue #4689:Fixed lose disconnected event and incorrect device name/id.
 2014-07-07 18:45:23 +08:00
Dhilan007 bbf0fead91 update API annotation. 2014-07-07 18:25:53 +08:00
Dhilan007 9cf01c0e47 update test case 2014-07-07 17:57:08 +08:00
minggo 38e74e7881 Merge pull request #7328 from dabingnn/v3_rollBackTexture 
roll back initWithImage logic
 2014-07-07 17:50:20 +08:00
Dhilan007 d1034fdaae 1.fixed lose disconnected event. 
2.fixed incorrect device name and device id;
 2014-07-07 17:47:07 +08:00
Huabing.Xu d935b5db38 roll back initWithImage logic 2014-07-07 17:35:05 +08:00
minggo 3f262568a2 [ci skip: update version] 2014-07-07 17:24:14 +08:00
lvlong e315ef527a parseGLType bug 2014-07-07 17:22:46 +08:00
lvlong 70b9d9b9ac delete cube_anim 2014-07-07 17:11:37 +08:00
lvlong a48d33ce31 Merge branch 'newcode' into v3 2014-07-07 17:06:37 +08:00
minggo cd77690032 Merge pull request #7326 from Dhilan007/v3-gc-refactor 
issue #4689: support external key.
 2014-07-07 17:04:27 +08:00
minggo cd2a438b89 Merge pull request #7327 from andyque/addUITests 
fix some minor bugs of ui
 2014-07-07 17:01:27 +08:00
andyque 9a77ea9d57 add nested layout 2014-07-07 15:48:50 +08:00
andyque 6f33e4b84f add UIPageView button tests 2014-07-07 15:31:06 +08:00
andyque 037a7dc882 fix TextReader TTF font Reader issue 2014-07-07 15:22:14 +08:00
andyque 0483c64286 fix widget ignoreContentSize issue 2014-07-07 15:21:14 +08:00
Dhilan007 ddfe82ae08 Replace log with CCLOG 2014-07-07 15:04:29 +08:00
Dhilan007 68bd717ea7 issue #4689: support external key. 2014-07-07 12:06:24 +08:00
minggo fb580539fa Merge pull request #7325 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-07 10:35:28 +08:00
zhangbin ac4a8b1960 Update the reference of submodule cocos2d-console. 2014-07-07 10:11:46 +08:00
lvlong 0a9e96bfdf modify Bundle3D::parseGLType add other type 2014-07-07 09:16:08 +08:00
minggo 2d504dcc9b Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig 
Remove redundant comment in ccConfig.h
 2014-07-06 21:09:39 +08:00
minggo 7df668a675 Merge pull request #7323 from CocosRobot/update_lua_bindings_1404651855 
[AUTO]: updating luabinding automatically
 2014-07-06 21:08:39 +08:00
CocosRobot 4c1da7d89a [AUTO]: updating luabinding automatically 2014-07-06 13:05:59 +00:00
minggo b214ea9a34 Merge pull request #7322 from minggo/update-release-note 
Update release note
 2014-07-06 21:01:17 +08:00
minggo 4d8ea7ca2d Update RELEASE_NOTES.md 2014-07-06 20:59:34 +08:00
minggo f52a9bfa8e update release note 2014-07-06 20:53:17 +08:00
minggo 5ff83d1a2b Merge pull request #7309 from mannewalis/v3 
changes needed for swift bindings to work
 2014-07-06 17:10:26 +08:00
minggo 982d7441a0 Merge pull request #7310 from boyu0/lua_SceneEditorTest 
Add SceneEditorTest for lua
 2014-07-06 16:01:49 +08:00
mannewalis f238593bfb Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x: (78 commits)
  fix ui::Helper::seekWigetByName can not find pages in pageview
  [AUTO][ci skip]: updating cocos2dx_files.json
  add const for getter. fixed redefinition of 'registerListeners'
  Update CCController-android.cpp
  fixed missing function
  issue #4689: Refactoring game controller API[ios]
  Add resources
  version1.2
  Remove useless codes
  Refactoring game controller API
  should not include android cpp files in win/wp project
  Remove useless codes
  Remove useless codes
  Add Lua bindings for utils and CaptureScreen test case
  revert Android.mk
  issue #4689: Refactor controller API.
  add setXXTEAKeyAndSign
  fix indent problems
  initialize member variable
  fix windows compile and running error
  ...
 2014-07-05 12:26:44 -07:00
yangxiao c7ad436d8a Merge branch 'newcode' into v3 2014-07-05 13:57:51 +08:00
minggo 9d6c5748dc Merge pull request #7320 from andyque/fixSeekFile 
fix ui::Helper::seekWigetByName can not find pages in pageview
 2014-07-05 13:44:35 +08:00