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

35453 Commits

Author SHA1 Message Date
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
zilongshanren 561fa96a00 Merge pull request #15261 from rouddyNeo/uiedit_programmatically_attachable 
UIEditBox attachWithIME, detachWithIME make working
 2016-03-17 11:37:33 +08:00
YooJaehong 7eeccbc771 UIEditBox attachWithIME, detachWithIME make working 
(android, iOS tested)
 2016-03-17 10:26:53 +09:00
Denna Lawrence 737455fda6 Add optional alpha parameter to Color4B and Color4F constructors 2016-03-16 16:08:49 -06: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 d6b2f08b30 The CC_TARGET_OS_* in xcodeproj are now not needed. 2016-03-16 13:20:53 +08:00
Xpol Wan bfb97739e2 Detect Apple platforms correctly. 2016-03-16 13:15:41 +08:00
Slack-Moehrle 181adbc17b added roadmap 
added roadmap
 2016-03-15 10:41:35 -04:00
xiaofeng11 c9306a053f Merge pull request #15238 from Dimon4eg/fix-annoying-log 
fix annoying "callBackName  cannot be found" log

It's ok, merged.
 2016-03-15 09:29:52 +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
zilongshanren 03d68a6537 Merge pull request #15226 from CocosRobot/update_lua_bindings_1457707343 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-14 21:41:17 +08: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
pandamicro 45bbc8a1ae Merge pull request #15235 from xiaofeng11/v3_cmDllWin32 
More fix to compile libjscocos2dx as dll under win32
 2016-03-14 14:05:06 +08:00
XiaoFeng 06ac05259b More fix to compile libjscocos2dx as dll under win32 2016-03-14 12:06:14 +08:00
Vladimir Perminov 5c1a272178 Remove comment // S_FALSE is succeeded 2016-03-13 19:30:13 +03:00
Steve K. Chiu 4769890d4e Fix calculation of outLength 
The order of integer arithmetic is important, the original code fail to
calculate the length correctly, e.g. inLength 20 for base64Encode should
output 28, not 30. It is fixed and simplified with this commit.
 2016-03-12 15:42:52 +08:00
zilongshanren f32cc6bee6 Merge pull request #15225 from CocosRobot/update_lua_bindings_1457707072 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-11 23:39:46 +08:00
CocosRobot 8c6ace46d7 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-11 14:44:35 +00: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
Naruto TAKAHASHI cf38b1fbfd fix build failed of gradle 2016-03-11 19:23:26 +09: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
xiaofeng11 5f15489a62 Merge pull request #15220 from geron-cn/v3bugfixs 
fix scrollview bugs

It's OK, merged
 2016-03-11 09:36:15 +08:00
zilongshanren af5c5ae1e8 Merge pull request #14777 from raksa/v3.10 
prevent recompile when run Android app on Android Studio to device or Emulator.
 2016-03-11 09:34:59 +08:00
mogemimi 582835b670 Fix typos in the documentation 2016-03-11 00:34:32 +09:00
geron-cn 4247292c82 add test case for fix bugs 2016-03-10 18:06:54 +08: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
XiaoFeng cce46195ca Add websocket close test 2016-03-10 14:01:38 +08:00
xiaofeng11 d398083c9a Merge pull request #15218 from geron-cn/v3bugfixs 
fix bugs

It's OK, merged
 2016-03-10 09:24:58 +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
zilongshanren c456ef985d Merge pull request #15217 from CocosRobot/update_cocosfiles_1457514100 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-09 17:08:54 +08:00
CocosRobot 9bb29f4880 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-09 09:01:44 +00: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