dd136dbc07
Merge pull request #14832 from cocos2d/slackmoehrle-patch-1
...
added myself :-)
2016-01-05 09:19:34 +08:00
f052fd45be
added myself :-)
...
added myself :-)
2016-01-04 14:46:28 -05:00
abccd72c35
Merge pull request #14791 from ricardoquesada/v3_js_fixes_squashed
...
Adds iOS tests, calls GC after replacing scene
2016-01-04 10:09:33 +08:00
b599f2f8d1
Merge branch 'v3_js_fixes_squashed' of github.com:ricardoquesada/cocos2d-x into v3_js_fixes_squashed
2015-12-29 18:30:25 -08:00
2ee5dafbbc
fixes xcodeproj
2015-12-29 18:28:34 -08:00
b92b67edad
moves macro definition to `ccConfig.h`
2015-12-29 17:36:02 -08:00
7cd80cb669
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:36:02 -08:00
046584c7fd
Merge branch 'v3_js_fixes_squashed' of github.com:ricardoquesada/cocos2d-x into v3_js_fixes_squashed
2015-12-29 17:33:30 -08:00
0a6bff7c71
moves macro definition to `ccConfig.h`
2015-12-29 17:33:08 -08:00
8e02749993
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-29 17:33:08 -08:00
634dd45c8f
moves macro definition to `ccConfig.h`
2015-12-29 14:26:41 -08:00
9c7edc09f4
Merge pull request #14816 from ricardoquesada/tvos_fixes
...
fixes compilation issues on tvOS
2015-12-29 12:58:45 -08:00
77aa3871b6
fixes compilation issues on tvOS
2015-12-29 12:30:00 -08:00
3a3bf8da0f
Merge pull request #14808 from ricardoquesada/tvos_support
...
adds tvOS support
2015-12-29 09:01:23 -08:00
b6d1edc8e7
Merge branch 'tvos_support' of github.com:ricardoquesada/cocos2d-x into tvos_support
2015-12-28 16:43:01 -08:00
666a6c6f88
adds missing scheme files
2015-12-28 16:42:44 -08:00
492389fd5b
Update CCPlatformConfig.h
2015-12-28 16:03:48 -08:00
692c0f8a0e
adds tvOS support
...
Ported tests:
- js-tests
- cpp-tsts
- lua-tests
- game-controller tests
all of them working, but most of the tests can't be navigated
since they expect a controller.
2015-12-28 15:59:36 -08:00
add1bc7cbc
Adds iOS tests, calls GC after replacing scene
...
and some bug fixes
Squashed commit of the following:
commit 36b74ce4e68bf2f4a4c464453e695497716506eb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:07:01 2015 -0800
adds missing file
commit 017d03807122faa38fefaa8f4554db8edc83561d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 19:02:27 2015 -0800
disables GC by default
commit a2f3767a952e052eb8f0391bb5cbd1a8d0ce1b38
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Dec 22 18:57:14 2015 -0800
Adds iOS test and calls GC after replacing the scene
commit 7b3b628caeb3366356d9a896aebd9c96887a85ed
Merge: 79e926a e311655
2015-12-23 08:54:00 -08:00
d11498ddef
Merge pull request #14788 from mogemimi/fix-method-name
...
Fix method name spelling in AutoPolygon
2015-12-23 19:27:53 +08:00
b0c4adcbd0
Fix method name spelling in AutoPolygon
2015-12-23 19:07:03 +09:00
a5525c15ab
Merge pull request #14763 from ArisLittle/patch-1
...
fix some minor typos in the comments
2015-12-23 09:39:20 +08:00
e311655fbe
Merge pull request #14778 from VisualSJ/v3_12_11
...
Close webgl dedicated test in canvas mode
2015-12-22 18:59:53 +08:00
843694cea5
Close webgl dedicated test in canvas mode
2015-12-22 18:46:30 +08:00
875a2d83b1
Close webgl dedicated test in canvas mode
2015-12-22 18:36:48 +08:00
e8d3e3f136
Update CHANGELOG
2015-12-22 13:44:30 +08:00
68e166568e
fix some minor typos in the comments
...
change spelling from "a item" to "an item", "a event" to "an event", "a index" to "an index" in cocos/ui/UIListView.h
2015-12-21 14:26:50 +08:00
727480e44f
Merge pull request #14760 from mogemimi/fix-doc-typo
...
Fix typos in documentation, comments and strings
2015-12-21 09:32:57 +08:00
aac1558b75
Fix typos in documentation, comments and strings
2015-12-21 08:22:41 +09:00
4ff9ed0ffe
Merge pull request #14758 from pandamicro/v3
...
Sync v3.10 to v3
2015-12-20 23:47:07 +08:00
022bcc24f1
Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
2015-12-20 22:56:33 +08:00
1071f63ac7
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
2015-12-20 22:45:51 +08:00
f747075a83
Merge pull request #14748 from pandamicro/v3.10
...
Temporary disable forceGC on win32
2015-12-19 23:27:12 +08:00
8f836162aa
Temporary disable forceGC on win32
2015-12-19 22:45:57 +08:00
386b850871
Fix issue in MenuItem init usage
2015-12-19 22:45:22 +08:00
ae48253da6
Fix UI addEventListener issue
2015-12-19 22:44:25 +08:00
e9bddf0c6d
Merge pull request #14747 from liamcindy/v3_ui_js
...
fix scrpite sameples error with controlButton
2015-12-19 22:26:38 +08:00
ffbac99dc5
fix script samples error with controlButton
2015-12-19 22:22:41 +08:00
041150a36f
Merge pull request #14336 from mogemimi/fix-function-name
...
Fix spelling of function name
2015-12-19 06:20:29 -08:00
ef3bb81be6
Merge pull request #14746 from zilongshanren/v3.10
...
fix lua focus test
2015-12-19 19:14:30 +08:00
ac4f66fff2
fix lua focus test
2015-12-19 18:32:43 +08:00
a165ecb1e9
Merge pull request #14745 from pandamicro/v3.10
...
Upgrade bindings generator
2015-12-19 18:09:09 +08:00
f43379a313
Merge pull request #14744 from CocosRobot/update_lua_bindings_1450516210
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-19 17:19:08 +08:00
4f94b03b86
Upgrade bindings generator
2015-12-19 17:18:39 +08:00
0f90f74df9
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-12-19 09:12:27 +00:00
ba74e8fc17
Update CHANGELOG
2015-12-19 17:07:50 +08:00
94ee0734a5
Merge pull request #14721 from newnon/v3.10_slider_missprint
...
slider misprint fix
2015-12-19 17:06:26 +08:00
4fda883c3b
Merge pull request #14742 from xiaofeng11/v3.10
...
Fix TextField won't show security text when first time set password enable
2015-12-19 17:01:43 +08:00
795637c0c5
Merge pull request #14743 from liamcindy/v3_ui_LoadingBar
...
fix loadingbar direction changed error
2015-12-19 16:59:42 +08:00
8bf7908e93
fix loadingbar direction changed error
2015-12-19 15:59:27 +08:00
zilongshanren