pandamicro
fa1749578b
Merge pull request #723 from knoxHuang/develop
...
fix native call error for fireball/issues/6113
2017-07-26 14:12:46 +08:00
knoxHuang
7e70a8f7d5
fix native call error for fireball/issues/6113
2017-07-26 14:00:37 +08:00
Wang Nan
ce2facba86
Merge pull request #722 from zilongshanren/improve-bmfont-atlas-cache
...
fix bmfont atlas cache strategy
2017-07-26 09:45:17 +08:00
pandamicro
5b89db9a7e
Merge pull request #720 from pandamicro/develop
...
Solution to Promise crash
2017-07-25 18:05:16 +08:00
pandamicro
d726489d94
Fix JS promise support
2017-07-25 18:03:57 +08:00
zilongshanren
11a2e68a52
fix bmfont atlas cache strategy
2017-07-25 16:40:24 +08:00
Wang Nan
30ae97336b
Merge pull request #721 from jareguo/develop
...
deprecate engineDir in main.js
2017-07-25 09:52:54 +08:00
Jare Guo
99df2ea2b4
deprecate engineDir in main.js
2017-07-24 20:39:44 +08:00
pandamicro
7b7ab9f5c4
Temp solution to Promise crash
2017-07-24 18:24:15 +08:00
pandamicro
fc3da9c04a
Merge pull request #719 from pandamicro/develop
...
Fix anysdk qa issues
2017-07-24 15:14:37 +08:00
pandamicro
11110c07e0
Fix anysdk missing bindings
2017-07-24 15:08:28 +08:00
pandamicro
63264bf21d
Fix jsval_to_long issue (not compatible anymore with string value)
2017-07-24 15:08:03 +08:00
pandamicro
f35d7c8246
Replace JSString with JS::RootedString
2017-07-24 15:06:50 +08:00
pandamicro
b837d7bde8
Merge pull request #718 from pandamicro/develop
...
Fix callFunc creation issue with primitive data parameter
2017-07-23 11:58:06 +08:00
pandamicro
f0a6acc6c5
Fix callFunc creation issue with primitive data parameter
2017-07-22 14:29:00 +08:00
Wang Nan
023cefe126
Merge pull request #717 from dumganhar/fix/srwebsocket
...
Fix potential crash after WebSocket.close and send onclose event after onerror is received
2017-07-20 17:43:20 +08:00
James Chen
5aa4d68cab
updates external
2017-07-20 16:44:59 +08:00
James Chen
68be4dbbaf
Fix potential crash after WebSocket.close.
...
Since the finalize function will get a invalid pointer of WebSocket, invoking ws->closeAysnc() will generate unknown result, probably crash.
HOW TO FIX:
WebSocket and JSB_WebSocketDelegate inhert from Ref. After websocket is initialized successfully, retain websocket instance and delegate, they will both have 2 reference count.
release their reference both in onClose callback and finalize function. The reason is that the order of invoking onClose and finalize function will be unpredictable, ref count technique help to handle this.
Another fix is sending onclose event after onerror is received.
2017-07-20 16:43:24 +08:00
pandamicro
5889f6f0fa
Merge pull request #716 from pandamicro/develop
...
Fix reverted modifications during merge
2017-07-20 15:23:33 +08:00
pandamicro
bd6c45abf2
Fix reverted modifications during merge
2017-07-20 15:22:52 +08:00
Wang Nan
f2b5cbe8cf
Merge pull request #712 from dumganhar/fix/sync-x-audio-ios
...
Sync bug fix: Fix AudioEngine thread concurrency crash
2017-07-20 10:11:08 +08:00
pandamicro
93539682a9
Merge pull request #715 from pandamicro/develop
...
Fix reversed code
2017-07-19 18:09:45 +08:00
pandamicro
a3039798cf
Fix reversed code
2017-07-19 18:09:15 +08:00
pandamicro
d67ef36f36
Merge pull request #714 from pandamicro/develop
...
Improve iOS project in templates
2017-07-19 18:07:59 +08:00
pandamicro
2c7e127539
Rearrange anysdk files in iOS project
2017-07-19 17:59:54 +08:00
pandamicro
7ac7251fee
Change iOS deployment target to iOS8
2017-07-19 17:49:27 +08:00
pandamicro
faa560fbde
Merge pull request #713 from knoxHuang/develop
...
fix evalString error for fireball/issues/6062
2017-07-19 16:32:45 +08:00
knoxHuang
1779f7a585
fix evalString error for fireball/issues/6062
2017-07-19 13:10:42 +08:00
knoxHuang
ae7232bf63
fix evalString error for fireball/issues/6062
2017-07-19 12:00:50 +08:00
James Chen
e026c60b4e
Sync bug fix: https://github.com/cocos2d/cocos2d-x/pull/18083
2017-07-19 10:37:06 +08:00
pandamicro
2cf6175ba4
Merge pull request #711 from pandamicro/develop
...
Fix new Uint8Array failure on iOS armv7
2017-07-18 23:23:38 +08:00
pandamicro
0c40e69d50
Fix new Uint8Array failure on iOS armv7
2017-07-18 23:22:12 +08:00
pandamicro
75efb10020
Merge pull request #710 from pandamicro/develop
...
Fix iOS mmap and TypedArray issue
2017-07-18 09:56:35 +08:00
pandamicro
ed103db2e3
Fix iOS mmap and TypedArray issue
2017-07-18 09:55:40 +08:00
Wang Nan
171c35292a
Merge pull request #709 from dumganhar/fix/binary-template-link-error
...
Fixes binary template compilation fairlure.
2017-07-14 17:43:13 +08:00
James Chen
070c1aabb7
Fixes binary template compilation fairlure.
...
https://github.com/cocos-creator/fireball/issues/6028
2017-07-14 17:36:26 +08:00
pandamicro
8241e37381
Merge pull request #708 from knoxHuang/develop
...
fix js_cocos2dx_TMXTiledMap_getPropertiesForGID error for fireball/i…
2017-07-14 17:13:42 +08:00
knoxHuang
dfb9e9fa9d
fix js_cocos2dx_TMXTiledMap_getPropertiesForGID error for fireball/issues/6035
2017-07-14 15:15:24 +08:00
Wang Nan
66e67e84de
Merge pull request #707 from 2youyou2/physics
...
fixed some physics jsb bugs
2017-07-13 09:40:10 +08:00
2youyouo2
e76f7837e3
fixed some physics jsb bugs
2017-07-12 17:36:53 +08:00
2youyouo2
373ee72e58
add const to getFixtures
2017-07-12 17:36:20 +08:00
pandamicro
71298100c0
Merge pull request #706 from pandamicro/develop
...
Remove SimpleAudioEngine dependency on android
2017-07-12 16:23:42 +08:00
pandamicro
807854ee7a
Remove SimpleAudioEngine dependency on android
2017-07-12 16:16:38 +08:00
pandamicro
3f535277b6
Merge pull request #705 from pandamicro/develop
...
Avoid restart crash in spidermonkey
2017-07-11 18:34:33 +08:00
pandamicro
856de64714
Avoid restart crash in spidermonkey
2017-07-11 18:33:39 +08:00
pandamicro
9234bdf0bc
Merge pull request #704 from pandamicro/develop
...
Small fixes
2017-07-11 15:36:37 +08:00
pandamicro
09cb88821b
Fix small issues in simulator win32 project
2017-07-11 15:36:04 +08:00
pandamicro
cbe4dc6f6d
Fix java oc reflection issue
2017-07-11 15:35:31 +08:00
Nan Wang
09d90d5dea
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
2017-07-11 10:05:21 +08:00
Nan Wang
9c118706d4
updated version to 1.6.0
2017-07-11 10:05:04 +08:00