2youyouo2
|
f178b8e759
|
add fractions to raycast callback
|
2017-03-17 14:43:58 +08:00 |
|
zilongshanren
|
4bff1b2c24
|
fix bmfont cache
|
2017-03-15 23:25:50 +08:00 |
|
2youyouo2
|
594075ec69
|
fixed physics jsbinding
|
2017-03-15 11:09:59 +08:00 |
|
2youyouo2
|
6e57af7aca
|
fixed xocde and android project
|
2017-03-14 16:55:37 +08:00 |
|
2youyouo2
|
e8467cde8b
|
Merge branch 'physics' of github.com:2youyouo2/cocos2d-x-lite into physics
|
2017-03-14 16:38:17 +08:00 |
|
2youyouo2
|
ca07dc5968
|
remove unused log
|
2017-03-14 16:37:47 +08:00 |
|
2youyou2
|
fc7de34ab0
|
fixed windows physics compile error
|
2017-03-14 16:29:40 +08:00 |
|
2youyouo2
|
c6c89fedac
|
Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into physics
|
2017-03-10 10:59:40 +08:00 |
|
2youyouo2
|
d6ab74a55e
|
support physics on android
|
2017-03-10 10:01:36 +08:00 |
|
2youyouo2
|
ca83d6038f
|
fixed crash when create joint
|
2017-03-10 10:01:24 +08:00 |
|
zhangbin
|
7c9093cd9c
|
Improve the js-binding implementation of slot.attachment.
|
2017-03-09 15:07:56 +08:00 |
|
2youyouo2
|
7cc35f458a
|
Merge branch 'v1.4' of github.com:cocos-creator/cocos2d-x-lite into physics
|
2017-03-08 16:49:58 +08:00 |
|
2youyouo2
|
c278e1cce8
|
support physics binding
|
2017-03-08 14:16:13 +08:00 |
|
pandamicro
|
9c090eb5f6
|
Merge pull request #557 from pandamicro/v1.4
Remove duplicated implementation of setTimeout/setInterval
|
2017-03-06 16:20:10 +08:00 |
|
pandamicro
|
f53775013b
|
Remove duplicated implementation of setTimeout/setInterval
|
2017-03-06 16:07:24 +08:00 |
|
pandamicro
|
9cec0942b3
|
Merge pull request #556 from natural-law/hot-fix
Solve the error that using method Slot::setDisplay in JSB.
|
2017-03-06 11:12:50 +08:00 |
|
zhangbin
|
6c3cdfc5d0
|
Solve the error that using method Slot::setDisplay in JSB.
|
2017-03-06 10:44:00 +08:00 |
|
Wang Nan
|
f3472d70a4
|
Merge pull request #554 from natural-law/issue5342
Solve the error when using DragonBones on native.
|
2017-03-02 17:13:28 +08:00 |
|
zhangbin
|
06e4c3eedf
|
Solve the error when using DragonBones on native.
|
2017-03-02 17:11:31 +08:00 |
|
Wang Nan
|
a385fea200
|
Merge pull request #552 from natural-law/v1.4
Add js binding for the properties of RegionAttachment & MeshAttachment.
|
2017-03-02 11:07:05 +08:00 |
|
zhangbin
|
93be53efed
|
Add js binding for the properties of RegionAttachment & MeshAttachment.
|
2017-03-02 11:04:57 +08:00 |
|
pandamicro
|
f52fa57459
|
Fix event on heap not removing js proxy issue
|
2017-03-01 22:32:18 +08:00 |
|
Nan Wang
|
f5ce457f38
|
update version to 1.4.1
|
2017-02-27 15:05:18 +08:00 |
|
pandamicro
|
2c4ba9ec2f
|
Merge pull request #547 from pandamicro/v1.4
Add ;
|
2017-02-27 09:39:34 +08:00 |
|
pandamicro
|
3792fd59dc
|
Add ;
|
2017-02-27 09:38:55 +08:00 |
|
pandamicro
|
5ac97200b9
|
Merge pull request #545 from pandamicro/v1.4
Fix JSB memory leak and reduce overall memory usage
|
2017-02-26 23:04:27 +08:00 |
|
pandamicro
|
f787cebfb9
|
Reuse js objects for jsb_get_or_create_weak_jsobject, reduce memory usage
|
2017-02-24 18:08:36 +08:00 |
|
pandamicro
|
af7661c0ce
|
Remove useless jsb polyfills to reduce memory usage
|
2017-02-24 18:08:35 +08:00 |
|
pandamicro
|
50d2fc66d3
|
Merge pull request #544 from pandamicro/v1.4
Fix crash issue caused by released NullValue in JSCallbackWrapper
|
2017-02-24 18:06:19 +08:00 |
|
pandamicro
|
1a09c1e408
|
Support exectureGlobalFunction
|
2017-02-24 17:58:40 +08:00 |
|
zhangbin
|
79f1705ed1
|
Solve the error when parameter of FileUtils:: fullPathForFilename contains ".."
|
2017-02-23 16:53:14 +08:00 |
|
pandamicro
|
b58e17eb18
|
Fix JSCallbackWrapper crash caused by released NullValue
|
2017-02-23 12:10:31 +08:00 |
|
pandamicro
|
1096e4c2fe
|
Clear pool when restart
|
2017-02-23 12:09:31 +08:00 |
|
James Chen
|
779cc28217
|
Sync from https://github.com/cocos2d/cocos2d-x/pull/17381
|
2017-02-20 10:46:28 +08:00 |
|
Wang Nan
|
09172858fc
|
Merge pull request #533 from zilongshanren/fix-bmfont-use-same-texture-issue
fix label ttf resize_height line wrap
|
2017-02-17 17:18:08 +08:00 |
|
James Chen
|
92c0b0e5dc
|
Updates license year.
|
2017-02-16 11:17:32 +08:00 |
|
James Chen
|
2b459eaf36
|
Synchronizes changes in https://github.com/cocos2d/cocos2d-x/pull/17342
|
2017-02-16 11:15:45 +08:00 |
|
James Chen
|
a9b35750cf
|
Updates JSBindings to support pass a CA file through ‘new WebSocket(url, [protocols], caFilePath)’ API.
|
2017-02-16 11:15:45 +08:00 |
|
James Chen
|
18537b6a8a
|
Updates project configuration for win32 and assert logic fix for HttpClient.
|
2017-02-16 11:13:31 +08:00 |
|
James Chen
|
31326476c7
|
Updates WebSocket.cpp/h to support wss.
|
2017-02-16 11:13:31 +08:00 |
|
zilongshanren
|
f422740e91
|
fix label ttf resize_height line wrap
|
2017-02-10 17:59:04 +08:00 |
|
CocosRobot
|
f78565cbf1
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-02-10 09:57:04 +00:00 |
|
Wang Nan
|
d7eb5fb1b9
|
Merge pull request #531 from natural-law/issue5202
Modify the callback argument of spine event listener.
|
2017-02-10 17:34:27 +08:00 |
|
zhangbin
|
d27bfa164e
|
Modify the callback argument of spine event listener.
Change the argument trackIndex to trackEntry.
|
2017-02-10 17:16:25 +08:00 |
|
CocosRobot
|
482b5df3fc
|
[ci skip][AUTO]: updating jsbinding automatically
|
2017-02-10 08:26:33 +00:00 |
|
pandamicro
|
9ae7ed8d38
|
Enhance pointer type conversion
|
2017-02-10 16:20:24 +08:00 |
|
zhangbin
|
d5e3930131
|
Solve the conflict with google-protobuf.
|
2017-02-07 18:15:31 +08:00 |
|
pandamicro
|
a38b0c18bc
|
Merge pull request #524 from pandamicro/v1.4
Revert Network modifications
|
2017-02-06 12:38:44 +08:00 |
|
pandamicro
|
1da6a0e5ae
|
Revert Network modifications
|
2017-02-06 12:37:44 +08:00 |
|
zhangbin
|
edc6940902
|
Update the class SkeletonBatch in spine runtime.
|
2017-02-03 13:44:30 +08:00 |
|