Neo Kim
|
b99b3d1112
|
Remove `CC_DLL` in front of `createSpriteFromBase64()` in ccUtils.h to avoid compilation error on windows platform
|
2015-11-15 23:02:43 +09:00 |
Neo Kim
|
603d788fbf
|
PageView - Fix that page indicator was not working well in vertical page view.
|
2015-11-15 22:49:42 +09:00 |
Neo Kim
|
b0ae23d567
|
PageView - Add more comments
|
2015-11-15 22:49:42 +09:00 |
Neo Kim
|
ad134a6363
|
PageView - Fix that the indicator's direction is not appropriate when `PageView::setDirection()` is called before `PageView::setIndicatorEnabled(true)`.
|
2015-11-15 22:49:42 +09:00 |
mogemimi
|
9ec1e2069a
|
Fix deprecated warnings
|
2015-11-13 14:38:48 +09:00 |
yangxiao
|
39a6f1e8f1
|
char* to string
|
2015-11-12 18:08:29 +08:00 |
CocosRobot
|
4ccc6ce5de
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-11 06:53:45 +00:00 |
pandamicro
|
8695fbe711
|
Merge pull request #14172 from njh0602/somefix2
Add virtual keyword.
|
2015-11-11 14:17:27 +08:00 |
pandamicro
|
6fc7aca423
|
Merge pull request #14153 from Fraggle/patch-1
PMA Handling issue
|
2015-11-11 14:14:22 +08:00 |
pandamicro
|
ac06c9f8bb
|
Merge pull request #14260 from pyrosphere/add-app-version
Added Application::getVersion() to get the app version.
|
2015-11-11 14:13:42 +08:00 |
pandamicro
|
3963e8a774
|
Merge pull request #14333 from nhuanvd/cocos2dxactivity_bugfix
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
|
2015-11-11 14:10:24 +08:00 |
pandamicro
|
5ff7cac4ae
|
Merge pull request #14298 from TheCodez/patch-1
Fix #14298
|
2015-11-11 14:04:40 +08:00 |
Neo Kim
|
94637bef2f
|
PageView - Change to keep some of the original API names because it makes more sense.
|
2015-11-10 21:35:01 +09:00 |
Neo Kim
|
9cbbd283c7
|
PageView - Deprecate the APIs related to custom scroll threshold.
|
2015-11-10 21:35:01 +09:00 |
Neo Kim
|
049607b5d8
|
Replace tab indents to 4 spaces.
|
2015-11-10 21:03:51 +09:00 |
XiaoFeng
|
1f0c498bcb
|
Fixed actionNode position error bug
|
2015-11-09 19:45:17 +08:00 |
pandamicro
|
c08b4a0f9d
|
Merge pull request #14343 from super626/v3
fix cull face for render queue
|
2015-11-09 12:51:39 +08:00 |
yangxiao
|
9d2fca6d34
|
fix cull face for render queue
|
2015-11-09 10:42:12 +08:00 |
XiaoFeng
|
c0c35c603e
|
Update version number & RELEASE_NOTES.md, prepare 3.9 release
|
2015-11-06 18:38:09 +08:00 |
Nhuan Vu Duc
|
fec8a5db02
|
Fix cannot add view to mFrameLayout when extends Cocos2dxActivity
|
2015-11-06 13:05:40 +07:00 |
zhangcheng
|
8183d34b68
|
revert old timelineParser-2.x.js and add "||false" to it.
|
2015-11-06 12:50:36 +08:00 |
zhangcheng
|
76ed15591f
|
Update web submodule to latest.
|
2015-11-06 11:56:45 +08:00 |
pandamicro
|
81cb13a159
|
Merge pull request #14328 from xiaofeng11/v3
Fix "TextureCache Test" in js-test crash under Android
|
2015-11-06 10:56:31 +08:00 |
XiaoFeng
|
139d8b5310
|
Remove unused code
|
2015-11-06 10:10:09 +08:00 |
XiaoFeng
|
1a56668cd3
|
Fix "TextureCache Test" in js-test crash under Android
|
2015-11-06 09:49:19 +08:00 |
Jeff Wang
|
c1a64e9243
|
new implementation of EditBoxImpl-win32
|
2015-11-06 02:14:34 +08:00 |
yangxiao
|
3016bf696a
|
fix updateVerticesForLOD
|
2015-11-05 15:18:46 +08:00 |
CocosRobot
|
f7803cba19
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-11-04 11:09:49 +00:00 |
mogemimi
|
a31cce9a80
|
Fix minor grammar and typo in documentation
|
2015-11-04 17:14:00 +09:00 |
pandamicro
|
7d93b419fd
|
Merge pull request #14303 from xiaofeng11/v3_fix
Fix ComponentTest in la-test can not load lua file under iOS & Android
|
2015-11-04 13:52:14 +08:00 |
pandamicro
|
e13c9a8d8d
|
Merge pull request #14313 from super626/v3
Function genMaterial keeps old state block
|
2015-11-04 13:45:36 +08:00 |
yangxiao
|
16a79ed9df
|
function genMaterial keeps old state block
|
2015-11-04 11:10:28 +08:00 |
Dale Stammen
|
dfe56769a1
|
added missing Light3DReader files
|
2015-11-03 08:04:55 -08:00 |
pandamicro
|
4d0098c6be
|
Merge pull request #14299 from mogemimi/fix-docs-typo
Fix typos in documentation
|
2015-11-03 18:12:21 +08:00 |
XiaoFeng
|
3223a97b26
|
Fix ComponentTest in la-test can not load lua file under iOS & Android
|
2015-11-03 15:49:46 +08:00 |
liamcindy
|
872141d547
|
update for light3d reader
|
2015-11-03 13:34:21 +08:00 |
mogemimi
|
8f632365c3
|
Fix typos in documentation
|
2015-11-03 04:43:44 +09:00 |
Michael Kösel
|
4f89828625
|
Removed PhysicsBody::update from PhysicsWorld
|
2015-11-02 14:18:21 +01:00 |
namhyeonuk
|
7fe2b87574
|
CREATE_FUNC macro NULL -> nullptr
|
2015-10-31 20:18:39 +09:00 |
Filipe Lemos
|
61ce3e8a03
|
Fixed warnings about missing override in CCApplication for iOS/Mac
|
2015-10-30 10:02:07 +00:00 |
pandamicro
|
c80f523637
|
Merge pull request #14269 from pandamicro/v3
[ci skip]Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
|
2015-10-30 17:20:58 +08:00 |
pandamicro
|
246eab11a1
|
Fix cocos2d/cocos2d-html5#3156 setBlendFunc issue in parser
|
2015-10-30 17:19:21 +08:00 |
zilongshanren
|
3e2094981f
|
add scale9sprite rendering type test
|
2015-10-30 14:01:01 +08:00 |
pandamicro
|
b58e656620
|
Merge pull request #14264 from super626/v3
Fix: Mesh::setGLProgramState may modify state block
|
2015-10-30 10:11:23 +08:00 |
zilongshanren
|
f84c2de1e2
|
add sprite and scale9sprite batch test
|
2015-10-30 09:58:02 +08:00 |
Filipe Lemos
|
11fc969ecb
|
Fixed inconsistency in getVersion() when no version is available on Android
|
2015-10-29 17:14:32 +00:00 |
zilongshanren
|
1417534194
|
add rendering type to scale9sprite
|
2015-10-29 23:13:36 +08:00 |
zilongshanren
|
7c82f9fe88
|
cache slice sprite calculation
|
2015-10-29 21:53:58 +08:00 |
Filipe Lemos
|
9aa1f7138d
|
Added override keyword to getVersion
|
2015-10-29 08:36:03 +00:00 |
zilongshanren
|
9a14ad5b14
|
fix a small bug related to non slice anchorPoint
|
2015-10-29 14:27:27 +08:00 |
yangxiao
|
11f5e6cf96
|
setGLProgramState should not modify state block
|
2015-10-29 14:22:13 +08:00 |
yangxiao
|
16d9cf1af9
|
setStateBlock implement
|
2015-10-29 14:21:25 +08:00 |
pandamicro
|
c0ecf7f7aa
|
Merge pull request #14262 from liamcindy/3.9_light_js
update for light3d js reader
|
2015-10-29 13:52:33 +08:00 |
pandamicro
|
617f5265f1
|
Merge pull request #14256 from pandamicro/v3
Use generational gc friendly API in JSTouchDelegate
|
2015-10-29 12:34:42 +08:00 |
zilongshanren
|
ccf4cb5a74
|
improve scale9sprite
|
2015-10-29 10:41:58 +08:00 |
pandamicro
|
ac54c9b7de
|
Merge pull request #14261 from liamcindy/3.9_light
update for light3d reader
|
2015-10-29 10:08:32 +08:00 |
unknown
|
f2f6d25408
|
update for light3d js reader
|
2015-10-29 10:04:56 +08:00 |
unknown
|
917edbcf62
|
update for light3d reader
|
2015-10-29 09:53:54 +08:00 |
Filipe Lemos
|
04fa7a8902
|
Added Application::getVersion() to get the app version.
|
2015-10-28 17:57:57 +00:00 |
Neo Kim
|
e59b7b74be
|
PageView - Add `scrollToItem()` having only one parameter.
|
2015-10-28 16:57:54 +09:00 |
Neo Kim
|
69b794d284
|
PageView - Remove `_indicatorEnabled` flag. Null `_indicator` means that it is disabled.
|
2015-10-28 16:57:53 +09:00 |
Neo Kim
|
9ed617c978
|
PageView - Add API descriptions
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
b72e4118f0
|
PageViewIndicator - Add `PageViewIndicator.cpp` to build configuration files.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
e3fcd6722a
|
PageViewIndicator - Add some getter and setters.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
8abd1ab600
|
PageView - The indicator should be created before `ListView::init()`
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
2d2d17172c
|
PageViewIndicator - Fix that indexes were upside down in vertical view.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
1897051664
|
PageView - Add `setDirection()` and `setIndicatorEnabled()` methods.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
eefdffc032
|
PageViewIndicator - Add `setDirection()` method.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
368a3048c4
|
PageView - Add `setIndicatorPosition()`.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
fc0fe976f7
|
PageView - Complete `handleReleaseLogic()` method.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
b19ed5a3b5
|
ScrollView - Change `moveInnerContainer()` to virtual method.
|
2015-10-28 16:56:36 +09:00 |
Neo Kim
|
b3f33de071
|
ListView - Change `calculateItemDestination()` to a class method.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
c684016ee6
|
PageView - Implementing page view indicator
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
4dbfb79110
|
Add `onItemListChanged()`method.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
0ee09fcfce
|
PageView - Implement the page indicator
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
30e2e46f20
|
PageView - Add `PageViewIndicator` which indicates current page among total pages.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
76acb91861
|
Move `createSpriteFromBase64()` from `UIScrollViewBar.cpp` to `ccUtils.h` in order to use it in other places.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
a2bc0d4859
|
ScrollViewBar - Change wording in comment.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
b9a4449494
|
PageView - Add `handleReleaseLogic()` for page view.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
46c0a43105
|
ScrollView - Use a vector in `scrollChildren()` instead of two floats.
|
2015-10-28 16:56:35 +09:00 |
Neo Kim
|
84d0625b93
|
ScrollView - Remove redundant codes.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
5de6aa78ec
|
ScrollView - Remove the return value of `scrollChildren()`.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
30d39af5fa
|
Refactor `jumpTo` methods to use `moveInnerContainer()`.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
e67250e162
|
ScrollView - Create `moveInnerContainer()` to replace `moveChildren()` and `moveChildrenToPosition()`. All move related logic will be integrated into one.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
97acf52cc8
|
PageView - Replace the legacy methods of `PageView` with the ones of `ListView`.
|
2015-10-28 16:56:34 +09:00 |
Neo Kim
|
e567259826
|
PageView - Change `PageView` to derive from `ListView` and use `ScrollView::Direction` instead of `PageView::Direction`.
|
2015-10-28 16:56:34 +09:00 |
pandamicro
|
7d832b0753
|
Merge pull request #14238 from pandamicro/v3
Add cc.Director.EVENT_BEFORE_UPDATE
|
2015-10-28 15:50:37 +08:00 |
pandamicro
|
06b828250a
|
Merge pull request #14241 from yuyangame/patch-1
fix cc.game.config['showFPS'] bug
|
2015-10-28 15:48:21 +08:00 |
pandamicro
|
893edbaf24
|
Merge pull request #14246 from WenhaiLin/v3.9
Fixed text may display of incomplete when Label create with system font on Mac.
|
2015-10-28 15:47:45 +08:00 |
pandamicro
|
b6b9364a84
|
Merge pull request #14232 from xiaofeng11/v3
Fix FadeOutDownTilesTest won't show last tile
|
2015-10-28 15:44:28 +08:00 |
WenhaiLin
|
7b758fd780
|
Fixed text may display of incomplete when Label create with system font on Mac.
|
2015-10-28 12:06:58 +08:00 |
pandamicro
|
68d75a519a
|
Use generational gc friendly API in JSTouchDelegate
|
2015-10-28 11:55:28 +08:00 |
CocosRobot
|
09cbc2145d
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-28 03:29:16 +00:00 |
Kvial
|
27773b6f1a
|
fix cc.game.config['showFPS'] bug
```javascript
//project.json
{
...
'showFPS' : false,
...
}
```
```javascript
//CCBoot.js
...
config[CONFIG_KEY.showFPS] = config[CONFIG_KEY.showFPS] || true;// this property will be set to true
...
```
|
2015-10-27 20:36:05 +08:00 |
XiaoFeng
|
6029635493
|
Remove comment out codes
|
2015-10-27 18:43:51 +08:00 |
pandamicro
|
616eae2b6d
|
Add cc.Director.EVENT_BEFORE_UPDATE
|
2015-10-27 17:32:57 +08:00 |
pandamicro
|
535c4bcd1d
|
Merge pull request #14236 from CocosRobot/update_lua_bindings_1445937846
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-27 17:31:43 +08:00 |
CocosRobot
|
35f7f3cb2f
|
[ci skip][AUTO]: updating luabinding & jsbinding automatically
|
2015-10-27 09:29:42 +00:00 |
pandamicro
|
aa9f0d5bd5
|
Merge pull request #14049 from CodeAndWeb/v3-sprite-polygoninfo-from-plist
Extending SpriteFrameCache to read PolygonInfo from atlas plist file
|
2015-10-27 17:28:22 +08:00 |
pandamicro
|
d2d60e36d2
|
Merge pull request #14222 from TheCodez/fix_memoryleak
Fix memory leak in Enhance-API
|
2015-10-27 17:22:11 +08:00 |