James Chen
154bbd29ce
Removes code for debugging.
2018-03-01 13:49:47 +08:00
James Chen
b9f7b812fe
seval_to_EffectProperty and seval_to_std_vector_TechniqueParameter supports nullptr conversion.
2018-03-01 13:47:44 +08:00
James Chen
3af301306a
Rename Effect.setDefineValue to Effect.define.
2018-03-01 13:46:57 +08:00
James Chen
983e87e9a6
module cache works.
2018-03-01 10:31:27 +08:00
James Chen
3f88e14de9
require supports module.exports.
2018-02-27 17:03:28 +08:00
James Chen
f001d1135d
Adds swapBuffer to GLView, bunny test works again on Mac. ( #1129 )
2018-02-24 14:22:06 +08:00
James Chen
5453cbc99f
Updates jswrapper to the latest version. ( #1127 )
2018-02-24 11:48:08 +08:00
minggo
e575036b55
fix link template ( #1126 )
2018-02-24 11:47:02 +08:00
minggo
392f641cba
invoke applicationDidFinishLaunching before main loop ( #1125 )
2018-02-24 10:48:09 +08:00
minggo
93090fea87
can run js on iOS and Mac ( #1124 )
2018-02-24 10:27:31 +08:00
minggo
c01325313d
refactor ios gl context setting process ( #1123 )
2018-02-23 11:18:16 +08:00
minggo
fee7afc74a
mac main loop work ( #1112 )
...
* mac main loop work
* fix some issue
2018-02-11 14:25:14 +08:00
minggo
695c26695c
ios main loop work ( #1107 )
...
* ios main loop work
* fix compiling error
2018-02-09 16:44:46 +08:00
minggo
15b34c81dc
dispatch touch event on iOS ( #1101 )
2018-02-09 09:26:44 +08:00
minggo
802e48080e
New renderer ( #1097 )
...
* build work on mac
* build ok on iOS
* fix compiling error on android
* fix android link error
2018-02-08 10:40:29 +08:00
feijing566
70e7f38622
add some dragonbones function jsbinding ( #1086 )
...
* add dragonbones_Armature_getSlots jsbinding
* update
* add js_cocos2dx_dragonbones_Slot_get_name and js_cocos2dx_dragonbones_BaseFactory_replaceSlotDisplay jsbing
2018-02-01 17:03:43 +08:00
Jare Guo
d9bd3d763c
update license ( #1089 )
...
* updating license
* update license
2018-02-01 15:20:01 +08:00
CocosRobot
15efc6945c
[AUTO][ci skip]: updating cocos2dx_files.json ( #1084 )
2018-01-31 10:14:55 +08:00
James Chen
69798998db
Adds cc.sys.getBatteryLevel & cc.sys.getNetworkType APIs ( #1071 )
...
* Adds cc.Device.getBatteryLevel interface.
* Adds CCReachability.h/.cpp
* Adds CCReachability.h/.cpp
* Reachability supports macOS either.
* Adds cc.Device.getNetworkStatus interface.
* Removed debug log.
* cc.Device.NetworkStatus -> cc.Device.NetworkType
* API to sys namespace
* Update CCDevice-win32.cpp
2018-01-29 17:37:15 +08:00
CocosRobot
7a925d02b7
[ci skip][AUTO]: updating jsbinding automatically ( #1068 )
2018-01-16 14:02:35 +08:00
Knox
ab0a3d33d7
fix VideoPlayer code error ( #1069 )
2018-01-16 14:02:17 +08:00
Knox
7c81e99b67
add Volume and Mute to CCVideoPlayer for fireball/issues/6811 ( #1056 )
...
* add Volume and Mute to CCVideoPlayer for fireball/issues/6811
* refine code
2018-01-16 10:49:00 +08:00
Jare Guo
77d142f7d8
Merge pull request #1061 from cocos-creator/v1.8
...
sync branch
2018-01-09 22:11:12 +08:00
Jare Guo
861f1b4e98
Merge pull request #1060 from cocos-creator/v1.8-release
...
sync branch
2018-01-09 22:09:34 +08:00
James Chen
3fa48d4a11
Adds missing se::autoHandleScope. ( #1057 )
2018-01-08 15:31:20 +08:00
James Chen
c08c56c9d4
Fixes memory issue in TMXLayer ( #1054 )
2018-01-04 11:20:24 +08:00
James Chen
560cdff5b6
Binds tmxlayer.getTiles. ( #1053 )
2018-01-04 11:03:54 +08:00
CocosRobot
9aa2b05e85
[ci skip][AUTO]: updating jsbinding automatically ( #1052 )
2018-01-03 16:12:52 +08:00
Jare Guo
a548db62d1
refactor dragonbones asset managment ( #1048 )
2018-01-03 14:38:16 +08:00
James Chen
a942f6d83d
Merge pull request #1051 from cocos-creator/v1.7-release
...
Merge v1.7-release
2018-01-02 14:01:07 +08:00
James Chen
127d926847
[iOS] Updates cocosanalytics lib to 1.0.4 ( #1050 )
2018-01-02 13:58:17 +08:00
James Chen
cc40611944
fixed #1041 : Potential crash in invokeJSTouchOneByOneCallback. ( #1043 )
...
And fixed potential invalid se::Object after invoking cc.director.getScheduler/getActionManager/getEventDispatcher, cc.SpriteFrame/Sprite.getTexture.
Added hook functions in EventDispatcher, TextureCache to prevent using dangerous se::Object.
Stop propagation for TouchOneByOne event should only affect current Touch point.
Fixed updateListener may not be invoked.
2018-01-02 13:56:26 +08:00
James Chen
fcc3a34602
[iOS] Updates cocosanalytics lib to 1.0.4 ( #1049 )
2018-01-02 13:49:22 +08:00
James Chen
e8d11d07f7
Updates bindings-generator, adds missing se ns ( #1047 )
2017-12-29 11:19:43 +08:00
Jare Guo
07b1de9d2e
Merge pull request #1039 from cocos-creator/v1.7
...
sync branch
2017-12-21 15:48:53 +08:00
Jare Guo
449c67fafa
Merge pull request #1038 from cocos-creator/v1.7-release
...
sync branch
2017-12-21 15:46:44 +08:00
James Chen
3ec85199d5
Corrects the wrong logic of using delete to remove memory allocated by malloc. ( #1036 )
2017-12-19 16:07:16 +08:00
Jare Guo
c4d6e83254
allow TiledMap to read preloaded textures for creator ( #1034 )
2017-12-19 11:28:12 +08:00
Jare Guo
460ec62905
Merge pull request #1030 from cocos-creator/v1.7
...
sync branch
2017-12-13 14:08:20 +08:00
Jare Guo
9bd74a93af
Merge pull request #1029 from cocos-creator/v1.7-release
...
sync branch
2017-12-13 14:06:41 +08:00
James Chen
46ad6b1f38
Fixes ResizableBufferAdapter<Data>::resize doesn't consider the situation of new size which is lower than old size. ( #1028 )
2017-12-12 16:47:42 +08:00
James Chen
0cfbfd08f7
Kill process if Cocos2dxActivity.onDestroy is invoked to resolve crash if app goes to background for a long time and Activity is recycled by system. ( #1027 )
2017-12-12 11:10:51 +08:00
James Chen
8bb98375f7
Fixes missing return value of onWavClose function. ( #1025 )
2017-12-08 21:47:23 +08:00
James Chen
44813f4166
Sync PR: cocos2d-x #18299 : JNI ERROR (app bug): local reference table overflow (max=512) ( #1024 )
...
* Sync PR: cocos2d-x #18299 : JNI ERROR (app bug): local reference table overflow (max=512)
* Fixes potential memory leak if can't find class by jsb.reflection.callStaticMethod.
2017-12-08 18:25:04 +08:00
James Chen
5c763a6745
Merge pull request #1022 from dumganhar/v1.7
...
Merge v1.7-release
2017-12-07 17:40:29 +08:00
James Chen
4708131018
Merge pull request #1021 from dumganhar/v1.7-release
...
Merge v1.7
2017-12-07 17:36:24 +08:00
James Chen
df3a37655d
Merge branch 'v1.7' into v1.7-release
2017-12-07 17:33:28 +08:00
James Chen
0a0a177ee7
Fixes xhr.ontimeout isn't invoked and xhr.onerror is called instead while timeout is triggered. ( #1020 )
2017-12-07 17:20:44 +08:00
James Chen
d2dbc9a7ef
Workaround for socketio.emit without payload argument ( #1019 )
2017-12-07 17:10:18 +08:00
James Chen
4387a16096
Fixes xhr.ontimeout isn't invoked and xhr.onerror is called instead while timeout is triggered. ( #1018 )
2017-12-07 14:49:34 +08:00