pandamicro
|
1096e4c2fe
|
Clear pool when restart
|
2017-02-23 12:09:31 +08:00 |
|
pandamicro
|
e18ffc3370
|
Merge pull request #529 from pandamicro/v1.4
Enhance pointer type conversion
|
2017-02-10 16:21:10 +08:00 |
|
pandamicro
|
9ae7ed8d38
|
Enhance pointer type conversion
|
2017-02-10 16:20:24 +08:00 |
|
pandamicro
|
e40c4ba878
|
Revert connection timeout
|
2017-02-10 14:37:07 +08:00 |
|
Wang Nan
|
c47785c392
|
Merge pull request #527 from natural-law/binary-template-error
Set the default APP_ABI with armeabi-v7a for binary template..
|
2017-02-09 12:03:03 +08:00 |
|
zhangbin
|
4caac936ae
|
Set the default APP_ABI with armeabi-v7a for binary template..
|
2017-02-08 14:22:34 +08:00 |
|
pandamicro
|
350099f88d
|
Merge pull request #526 from pandamicro/v1.4
Fix AssetsManager minor issues
|
2017-02-07 18:21:39 +08:00 |
|
pandamicro
|
988c840945
|
Fix size parsing issue
|
2017-02-07 18:20:20 +08:00 |
|
pandamicro
|
47b5556a63
|
Fix update immediately in checkUpdate callback issue
|
2017-02-07 18:20:12 +08:00 |
|
pandamicro
|
e13815013d
|
Merge pull request #525 from natural-law/hot-fix
Solve the conflict with google-protobuf.
|
2017-02-07 18:19:15 +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 |
|
Wang Nan
|
17aa0d5571
|
Merge pull request #523 from natural-law/hot-fix
Update the class SkeletonBatch in spine runtime.
|
2017-02-04 11:36:42 +08:00 |
|
zhangbin
|
edc6940902
|
Update the class SkeletonBatch in spine runtime.
|
2017-02-03 13:44:30 +08:00 |
|
pandamicro
|
b183ae4e67
|
Merge pull request #522 from pandamicro/v1.4
Fix compilation issues on win32
|
2017-01-24 15:27:31 +08:00 |
|
pandamicro
|
d6683e9376
|
Fix compilation issues on win32
|
2017-01-24 15:26:24 +08:00 |
|
Wang Nan
|
62a55fa172
|
Merge pull request #520 from zilongshanren/fix-bmfont-use-same-texture-issue
fix memory leaks of graphics node
|
2017-01-24 14:16:56 +08:00 |
|
pandamicro
|
912c98b9a3
|
Merge pull request #521 from pandamicro/v1.4
Fix AssetsManager issues on x86 platform
|
2017-01-24 13:32:36 +08:00 |
|
pandamicro
|
e37816eab3
|
Fix AssetsManager issues on x86 platform
|
2017-01-24 13:29:27 +08:00 |
|
zilongshanren
|
052e40a9f8
|
fix memory leaks of graphics node
|
2017-01-24 11:45:39 +08:00 |
|
pandamicro
|
d74672cb02
|
Merge pull request #519 from pandamicro/v1.4
Fix nextSavePoint issue (it should be float)
|
2017-01-23 18:38:44 +08:00 |
|
pandamicro
|
292fd4a941
|
Fix nextSavePoint issue (it should be float)
|
2017-01-23 18:38:22 +08:00 |
|
子龙山人
|
eda1ae7ad8
|
Merge pull request #518 from zilongshanren/fix-bmfont-use-same-texture-issue
add opacity support to drawnode
|
2017-01-23 17:01:01 +08:00 |
|
zilongshanren
|
60f8d20c82
|
add opacity support to drawnode
|
2017-01-23 16:59:45 +08:00 |
|
pandamicro
|
8cfced97bf
|
Merge pull request #517 from pandamicro/v1.4
Fix AssetsManager updateSucceed issue
|
2017-01-22 19:03:32 +08:00 |
|
pandamicro
|
1ada1f3351
|
Small fixes
|
2017-01-22 18:59:49 +08:00 |
|
pandamicro
|
13c57ba54a
|
Add __ENABLE_GC_FOR_NATIVE_OBJECTS__
|
2017-01-22 18:59:38 +08:00 |
|
pandamicro
|
fca36add5d
|
Fix updateSucceed issue
|
2017-01-22 18:59:18 +08:00 |
|
pandamicro
|
fe4b471444
|
Merge pull request #516 from pandamicro/v1.4
Fix websocket cycling destructor issue
|
2017-01-22 18:44:16 +08:00 |
|
pandamicro
|
cec9760bd0
|
Fix websocket cycling destructor issue
|
2017-01-22 18:43:32 +08:00 |
|
Wang Nan
|
9ee37163da
|
Merge pull request #515 from dumganhar/fix/audio-soft-decode
Updates external/config.json to use latest external libraries.
|
2017-01-20 16:46:28 +08:00 |
|
James Chen
|
2ff622a686
|
Updates external/config.json to use latest external libraries.
|
2017-01-20 16:44:46 +08:00 |
|
James Chen
|
5013c73f01
|
warning fix
|
2017-01-20 16:44:00 +08:00 |
|
Wang Nan
|
859fb9f383
|
Merge pull request #514 from knoxHuang/v1.4
fix handleTouchesMove bug for #cocos-creator/fireball/issues/5099
|
2017-01-20 14:33:40 +08:00 |
|
knoxHuang
|
97c717989e
|
fix handleTouchesMove bug for #cocos-creator/fireball/issues/5099
|
2017-01-20 11:43:08 +08:00 |
|
Wang Nan
|
feddbe159b
|
Merge pull request #509 from natural-law/hot-fix
Solve the error effect in the spine runtime.
|
2017-01-20 09:45:42 +08:00 |
|
子龙山人
|
f75063e814
|
Merge pull request #513 from zilongshanren/fix-bmfont-use-same-texture-issue
fix bmfont use same texture issue
|
2017-01-19 11:16:23 +08:00 |
|
zilongshanren
|
b4092b7dea
|
fix bmfont use same texture issue
|
2017-01-19 11:14:33 +08:00 |
|
子龙山人
|
5bf3b231f2
|
Merge pull request #512 from zilongshanren/fix-label-outline-toggle
fix videoplayer crash issue
|
2017-01-18 18:24:41 +08:00 |
|
zilongshanren
|
6d0fc9dcbf
|
fix videoplayer crash issue
|
2017-01-18 18:16:19 +08:00 |
|
pandamicro
|
1791ea0294
|
Merge pull request #511 from pandamicro/v1.4
Avoid register too much succeed asset in manifest initialization
|
2017-01-18 10:18:31 +08:00 |
|
pandamicro
|
e420c238b9
|
Avoid register too much succeed asset in manifest initialization
|
2017-01-18 10:11:25 +08:00 |
|
pandamicro
|
7ce9b606a9
|
Merge pull request #510 from pandamicro/v1.4
Fix jsb crash issues by improve JS wrappers and action references
|
2017-01-18 10:11:16 +08:00 |
|
pandamicro
|
353009ae79
|
Register cppOwner ptr to ensure viability in destructor of JS wrappers
|
2017-01-18 10:09:46 +08:00 |
|
pandamicro
|
e6ae546acd
|
Fix Sequence and Spawn referencing sub action issues
|
2017-01-18 10:09:45 +08:00 |
|
zhangbin
|
6d80e8a931
|
Solve the error effect in the spine runtime.
|
2017-01-18 09:34:07 +08:00 |
|
pandamicro
|
87f2c31be5
|
Auto compartment when retain / release script object
|
2017-01-16 18:32:04 +08:00 |
|
pandamicro
|
8d03a3061d
|
Merge pull request #508 from pandamicro/v1.4
Fixed Unknown type TCHAR issue
|
2017-01-16 16:04:16 +08:00 |
|
pandamicro
|
a6f038124e
|
Fixed Unknown type TCHAR issue
|
2017-01-16 16:02:55 +08:00 |
|