zilongshanren
|
805be977fe
|
tweak PageView page turning event time.
|
2016-02-04 15:57:32 +08:00 |
zilongshanren
|
35b0112290
|
fix linux compile issue
|
2016-02-04 15:30:16 +08:00 |
zilongshanren
|
a93bc88d31
|
add Mac Editbox multiline support.
1. It also refactor the original logic and optimize the iOS EditBox implementation.
|
2016-02-04 14:21:07 +08:00 |
mogemimi
|
44d2a161dc
|
Remove unnecessary c_str() calls
|
2016-02-04 11:52:14 +09:00 |
Wenhai Lin
|
691e0d73f9
|
Merge pull request #15014 from WenhaiLin/v3-0203
Avoid creating temporary string objects
|
2016-02-03 23:46:45 +08:00 |
Wenhai Lin
|
4992037c5c
|
Avoid creating temporary string objects
|
2016-02-03 23:12:37 +08:00 |
zilongshanren
|
d8a4dc7cb0
|
Merge pull request #15011 from CocosRobot/update_lua_bindings_1454492874
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-03 18:01:39 +08:00 |
CocosRobot
|
330751a150
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-03 09:50:03 +00:00 |
zilongshanren
|
4f388d769a
|
Merge pull request #15002 from WenhaiLin/v3-TargetedAction-donefix
Fixed TargetedAction::isDone always return false!
|
2016-02-03 17:44:26 +08:00 |
pandamicro
|
72be9a3966
|
Fix other issues
|
2016-02-02 23:39:18 +08:00 |
pandamicro
|
3c550853bc
|
Fix restart game issue and windows crash issue
|
2016-02-02 23:38:37 +08:00 |
zilongshanren
|
7a9e0e7b71
|
Merge pull request #15003 from WenhaiLin/v3-0202-labelfix
Label:Fixed characters are displayed incorrectly with some specific font.
|
2016-02-02 17:56:43 +08:00 |
pandamicro
|
08056b7b02
|
Fix debugger issue
|
2016-02-02 16:45:17 +08:00 |
pandamicro
|
fefd05e54d
|
Fix Menu event get released issue
|
2016-02-02 16:44:32 +08:00 |
Wenhai Lin
|
bae36b7a98
|
Label:Fixed characters are displayed incorrectly with some specific font.
|
2016-02-02 11:16:36 +08:00 |
Wenhai Lin
|
eba594bb41
|
Fixed TargetedAction::isDone always return false!
|
2016-02-02 11:07:38 +08:00 |
zilongshanren
|
30a7141ea0
|
Merge pull request #14997 from CocosRobot/update_lua_bindings_1454308300
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-01 14:36:51 +08:00 |
CocosRobot
|
4ab9ffff4f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-02-01 06:34:11 +00:00 |
zilongshanren
|
2144c7a0e5
|
Merge pull request #14974 from mogemimi/fix-xcode-settings
Fix warnings when building projects for iOS and tvOS
|
2016-02-01 14:29:06 +08:00 |
zilongshanren
|
36668071bb
|
Merge pull request #14986 from GuoLunHao/v3_version
update cocos2d-x's version to 3.11
|
2016-02-01 14:28:14 +08:00 |
zilongshanren
|
ee31d2ad22
|
Merge pull request #14940 from mxenabled/stop_auto_scroll
Add ability to stop auto scrolling in ui::ScrollView and extension::ScrollView
|
2016-02-01 14:27:55 +08:00 |
lunhao.guo
|
b2e5e480fe
|
update cocos2d-x's version to 3.11
|
2016-01-29 14:49:05 +08:00 |
mogemimi
|
4ac4f1a5c7
|
Fix warnings when building projects for iOS and tvOS
|
2016-01-29 08:07:17 +09:00 |
zilongshanren
|
ad756cf6bb
|
Merge pull request #14983 from CocosRobot/update_lua_bindings_1453953583
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-28 13:31:43 +08:00 |
CocosRobot
|
346144742f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2016-01-28 04:01:53 +00:00 |
zilongshanren
|
41edaa8b32
|
Merge pull request #14975 from greekman99/master
Fixed subtle documentation issues
|
2016-01-28 11:55:56 +08:00 |
minggo
|
e246390c42
|
Merge pull request #14978 from xpol/const-ref-args-for-file-utils-write-methods
Small refactor FileUtils.
|
2016-01-28 10:36:31 +08:00 |
pandamicro
|
01f41921d1
|
Fix enableDebugger issue
|
2016-01-28 01:55:10 +08:00 |
pandamicro
|
e2568b3a6f
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into hbmemory
Conflicts:
tests/js-memory-gc-tests/src/tests-main.js
|
2016-01-28 01:12:49 +08:00 |
pandamicro
|
de9b51c0cf
|
Fix other GC issues
|
2016-01-28 01:03:50 +08:00 |
pandamicro
|
554523a201
|
Use JS::Heap instead of Mozilla::maybe to improve stability
|
2016-01-28 01:03:13 +08:00 |
zilongshanren
|
b0d0a7a064
|
Merge pull request #14964 from zilongshanren/fix14909
fix pageview page turning event issue
|
2016-01-27 20:53:48 +08:00 |
zilongshanren
|
366407ca1c
|
fix win32 compile issue
|
2016-01-27 20:21:32 +08:00 |
Xpol Wan
|
56e5cf2101
|
Fixes indent.
|
2016-01-27 13:43:55 +08:00 |
Xpol Wan
|
d8bf7fa767
|
Remove unnecessary memory copy when saving string.
|
2016-01-27 13:40:19 +08:00 |
Xpol Wan
|
ea9dda052b
|
Better name for data to be saved.
|
2016-01-27 13:39:31 +08:00 |
Xpol Wan
|
f3aef10d33
|
Should be const reference for data/string args to be written.
|
2016-01-27 11:22:46 +08:00 |
Justin Luong
|
bd4615795e
|
fixed documentation for better reading clarity
|
2016-01-27 11:42:25 +10:00 |
pandamicro
|
55756cb043
|
Improve test cases
|
2016-01-26 19:34:01 +08:00 |
pandamicro
|
93987c7848
|
Remove PersistentRooted as much as possible and use pure JS references
|
2016-01-26 19:33:35 +08:00 |
Justin Luong
|
c89df2f243
|
Merge remote-tracking branch 'upstream/v3'
|
2016-01-26 20:52:55 +10:00 |
zilongshanren
|
83a6fd36ce
|
Merge pull request #14971 from mogemimi/use-string-instead-of-chars
Replace char* with std::string in HttpRequest
|
2016-01-26 09:59:23 +08:00 |
zilongshanren
|
f853a43e04
|
Merge pull request #14970 from mxenabled/steerlink/cleanup_obsolete_win32
Remove obsolete Win32 references.
|
2016-01-26 09:58:32 +08:00 |
zilongshanren
|
74e7bd2083
|
fix win32 compile error
|
2016-01-26 09:52:53 +08:00 |
mogemimi
|
7dd7dfede7
|
Replace char* with std::string in HttpRequest
|
2016-01-26 05:13:18 +09:00 |
sheldon.teerlink
|
60d640442f
|
Remove obsolete Win32 references.
|
2016-01-25 12:23:53 -07:00 |
zilongshanren
|
bc44769b8b
|
add more deprecated functions
|
2016-01-25 18:14:48 +08:00 |
zilongshanren
|
00ad5bd620
|
fix jsb deprecated constants
|
2016-01-25 15:40:51 +08:00 |
zilongshanren
|
b43764fc92
|
fix lua deprecated function bindings
|
2016-01-25 14:48:17 +08:00 |
zilongshanren
|
dbf5b2c4a5
|
fix pageview page turning event issue
|
2016-01-25 11:53:40 +08:00 |