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

11527 Commits

Author SHA1 Message Date
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Xpol Wan 768f02bae3 revert pch.cpp for windows 8.1 and windows 10. 2016-03-21 11:00:32 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
minggo dcb3aa20c1 Merge pull request #15237 from njh0602/somefix 
remove unnecessary scope operator
 2016-03-18 18:31:53 +08:00
CocosRobot e2f820df25 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-18 09:11:18 +00:00
zilongshanren 7993ad93d2 fix jsb API inconsistency. 
Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275
 2016-03-18 16:18:40 +08:00
zilongshanren 56878bd441 Merge pull request #14532 from xpol/refactor-utf-module 
Overhaul UTF modules and add full set of UTFs conversion functions.
 2016-03-18 14:00:47 +08:00
zilongshanren 6ce5ee24b4 Merge pull request #15274 from zilongshanren/fixJsBindings-deprecated 
fix polygon api typo
 2016-03-18 13:44:40 +08:00
zilongshanren 2bb4847848 Merge pull request #15251 from xpol/detect-apple-platforms 
Detect Apple platforms
 2016-03-18 13:44:24 +08:00
Xpol Wan 4bbfb56983 Try fixes binding generator error. 2016-03-18 10:21:38 +08:00
zilongshanren 589d7e47bf fix polygon api typo 2016-03-17 17:16:56 +08:00
zilongshanren a1b4cd845f Revert "Fix incorrect function name of getTrianglesCount" 2016-03-17 16:38:17 +08:00
zilongshanren 11ed05a0be Merge pull request #15245 from mogemimi/fix-function-name 
Fix incorrect function name of getTrianglesCount
 2016-03-17 16:08:40 +08:00
CocosRobot c250ac8bfd [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-17 05:53:10 +00:00
zilongshanren 034410f5c5 Merge pull request #15259 from mxenabled/steerlink/ccnode_do_enumerate 
Enumerate getChildren() instead of _children.
 2016-03-17 13:47:57 +08:00
mogemimi 2f75effe96 Add backwards compatibility for 'getTriaglesCount' 2016-03-17 14:22:09 +09:00
zilongshanren d6f9ed93d6 add bindings 2016-03-17 11:56:48 +08:00
zilongshanren f5119a8dea Merge pull request #15262 from CocosRobot/update_lua_bindings_1458186037 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-17 11:44:02 +08:00
CocosRobot 69960024e5 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-17 03:42:52 +00:00
zilongshanren ad7ac83128 Merge pull request #15240 from newnon/v3_not_needed_define 
fix unneeded define that breaks some libraries to build on windows
 2016-03-17 11:40:51 +08:00
zilongshanren 535d3b3c32 Merge pull request #15241 from newnon/v3_gl_program_imageview 
GLProgram for ImageView
 2016-03-17 11:39:58 +08:00
zilongshanren 00ec3690b2 Merge pull request #15242 from newnon/v3_cursor_support_for_textfield 
Cursor support for text field
 2016-03-17 11:39:11 +08:00
zilongshanren 18992b0404 Merge pull request #15252 from xiaofeng11/v3_studioRef 
Remove cocos2dx.h reference from all cocos studio related files
 2016-03-17 11:38:20 +08:00
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working 
(android, iOS tested)
 2016-03-17 10:26:53 +09:00
sheldon.teerlink c54513bb13 Enumerate getChildren() instead of _children. 2016-03-16 15:03:33 -06:00
XiaoFeng 0a657cd219 Remove cocos2dx.h reference from all cocos studio related files 2016-03-16 14:02:08 +08:00
Xpol Wan 0211c372b4 Update comment. 2016-03-16 13:30:11 +08:00
Xpol Wan bfb97739e2 Detect Apple platforms correctly. 2016-03-16 13:15:41 +08:00
mogemimi 23a05ddab2 Fix incorrect function name of getTrianglesCount 2016-03-15 07:39:42 +09:00
Sergey 8541dead20 Cursor support for text field 2016-03-14 18:09:04 +03:00
Sergey 980d5fec68 GLProgram for ImageView 2016-03-14 17:05:39 +03:00
Sergey 0d67d5d533 fix unneeded define that breaks some libraries to build on windows 2016-03-14 16:58:01 +03:00
dimon4eg b7779180b1 fix annoying "callBackName cannot be found" log 2016-03-14 12:11:23 +02:00
NamJunHyone 98cbc6c359 remove unnecessary scope operator 2016-03-14 18:33:58 +09:00
XiaoFeng 06ac05259b More fix to compile libjscocos2dx as dll under win32 2016-03-14 12:06:14 +08:00
CocosRobot 16edf90f70 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-11 14:40:00 +00:00
zilongshanren 1409adc07a Merge pull request #15205 from mogemimi/fix-mojibake-and-typo 
Fix typos in the documentation
 2016-03-11 22:33:31 +08:00
zilongshanren 5a3a4c356f Merge pull request #15195 from perminovVS/textfiled-support-cursor-v1.2 
Textfiled support cursor v1.2
 2016-03-11 22:32:55 +08:00
Vladimir Perminov fa7d9c7163 Remarks zilongshanren 
Copy constructor remove from StringUTF8
StringUTF8::set change to StringUTF8::replace
TextFieldTTF::setCursorUse change to TextFieldTTF::setCursorEnabled
TextFieldTTF::_cursorUsechange to TextFieldTTF::_cursorEnabled
 2016-03-11 15:09:50 +03:00
pandamicro 0424ab2db5 Merge pull request #15222 from xiaofeng11/v3_depsUpdate 
update deps
 2016-03-11 16:20:09 +08:00
XiaoFeng 3acea03924 Update deps lib and chipmunk manual binding to support both libcocos2dx and libjscocos2dx compiled as dll file under win32 system 2016-03-11 15:44:28 +08:00
xiaofeng11 7b338c2f4c Merge pull request #15223 from geron-cn/v3bugfixs 
fix bug: eventframe can be enter one time when event time has a single frame.
It's OK, merged
 2016-03-11 13:34:21 +08:00
geron-cn b3ee96ebd2 fix bug: https://github.com/cocos2d/cocos2d-x/issues/15084 2016-03-11 12:56:58 +08:00
Ricardo Quesada 9477bfd801 Merge pull request #15135 from dumganhar/ws-close-fix 
Closes websocket connection by dispatching a 'resetDirector' event.
 2016-03-10 17:39:47 -08:00
mogemimi 582835b670 Fix typos in the documentation 2016-03-11 00:34:32 +09:00
geron-cn 7824acc34e fix scrollview bugs: 
- fix bar's position not right after size changed
- fix bar setAutoHideEnabled some time not right
 2016-03-10 18:06:20 +08:00
geron-cn 0bd9d1638d Squashed commit of the following: 
commit 976d28b4d1c71576799ecd4d7cc51e39f3d15b2d
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:58:17 2016 +0800

    avoid warning

commit 1c0ad1a56262bdb37f76badc7b40925e413999f3
Merge: 4604c47 b9b3049
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:52:43 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 4604c47ded82a83b675d1f418fe0015683e6a57b
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Wed Mar 9 18:51:02 2016 +0800

    fix bugs:
    - fix there is a bar dot after init a scrollview with scrollbar
    - fix some time var can not auto hide after scroll

commit e70b093d8e8a18b532c50c23f4c43b0131933ea4
Merge: 45268ac f2c9994
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:32:08 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 45268ac10bf579b16a0beb8ad45b55512b47b49f
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Mon Mar 7 15:30:47 2016 +0800

    remove inline

commit a1c70265dfc2fd0ffbe8ff81a987af7d0bbc7a06
Merge: 8269019 b5a44bc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Fri Mar 4 10:48:41 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol

commit 8269019874ca1bd0d265dff14e105e56bcc15bb2
Merge: 46f2e8c a6b02fc
Author: geron-cn <c.ever.fallen@gmail.com>
Date:   Thu Mar 3 18:43:40 2016 +0800

    Merge branch 'v3' of github.com:cocos2d/cocos2d-x into uitabcontrol
 2016-03-09 19:08:18 +08:00
xiaofeng11 b9b3049acb Merge pull request #15213 from FrostPolaris/v3 
Fix the bug that TextField may be set with a multi-line localized text.

It's OK, merged.
 2016-03-09 18:34:03 +08:00
pandamicro 849a2ee544 Merge pull request #15215 from minggo/firefox-remote-debug 
[ci skip]fix a bug that will miss packets
 2016-03-09 16:59:03 +08:00
minggo e44f4d8d61 fix a typo 2016-03-09 16:07:57 +08:00