pandamicro
|
5daa540b12
|
Pure JS action system working in JSB
|
2017-03-29 18:42:28 +08:00 |
|
Nan Wang
|
d9b5cef497
|
merge v1.4
|
2017-03-29 18:16:41 +08:00 |
|
2youyouo2
|
b12914197c
|
refine camera
|
2017-03-27 10:34:35 +08:00 |
|
pandamicro
|
34cd3c30b7
|
Remove arguments usage in jsb
|
2017-03-12 15:25:36 +08:00 |
|
pandamicro
|
901fee770a
|
Fix cc.macro.REPEAT_FOREVER usage issue
|
2017-03-06 16:10:32 +08:00 |
|
pandamicro
|
a9ab402766
|
Merge part of cocos/scripting/js-bindings/scripts to engine/jsb
|
2017-02-24 17:41:57 +08:00 |
|
pandamicro
|
35e2bd8bf6
|
Do not retain/release actions in new memory model
|
2017-02-06 14:05:10 +08:00 |
|
pandamicro
|
57e4b44b91
|
Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS
|
2017-01-22 19:01:26 +08:00 |
|
pandamicro
|
3a254718e6
|
Add cc.macro.ENABLE_GC_FOR_NATIVE_OBJECTS to detect memory model
|
2017-01-22 17:34:22 +08:00 |
|
pandamicro
|
660382a7d7
|
Always use uuid for depend keys
f
|
2016-10-26 00:26:11 +08:00 |
|
pandamicro
|
d276e8eabb
|
Fix X5 touch issue by adding TOUCH_TIMEOUT
|
2016-10-24 02:42:11 +08:00 |
|
zhangbin
|
4f53640c0a
|
Solve the error in runtime environment.
|
2016-10-09 16:47:09 +08:00 |
|
VisualSJ
|
ee41bc2a38
|
audio compatibility
|
2016-09-29 12:04:07 +08:00 |
|
zhangbin
|
28fa0aab1b
|
Merge branch 'master' of github.com:cocos-creator/engine into issue3120
# Conflicts:
# cocos2d/tilemap/CCSGTMXObjectGroup.js
|
2016-09-09 16:58:21 +08:00 |
|
VisualSJ
|
c1f319721f
|
Merge branch 'master' of github.com:cocos-creator/engine into master_audioEngine
|
2016-09-05 18:47:32 +08:00 |
|
VisualSJ
|
bd1d89ae98
|
review code
|
2016-09-05 18:46:56 +08:00 |
|
pandamicro
|
a5a0e308a7
|
Upgrade API with v3.13
|
2016-09-01 10:53:03 +08:00 |
|
zhangbin
|
356e5590d6
|
Solve the error when rendering Object group in native.
|
2016-08-12 16:07:11 +08:00 |
|
knoxHuang
|
2e671e1d80
|
Uniform SocketIO emit interfaces parameter for fireball/issues/3872
|
2016-08-04 16:17:38 +08:00 |
|
knoxHuang
|
3bbecf49b5
|
fix JSB scheduleOnce will repeat for #fireball/issues/3768
|
2016-07-27 17:40:27 +08:00 |
|
zilongshanren
|
bcb269cfa4
|
Merge remote-tracking branch 'fireball/master' into add-webview-support
|
2016-07-25 10:49:34 +08:00 |
|
zilongshanren
|
a5deddc3b3
|
improve webivew
|
2016-07-25 10:49:17 +08:00 |
|
knoxHuang
|
9cb440197c
|
fix schedule bug for #fireball/issues/3686
|
2016-07-22 11:33:02 +08:00 |
|
2youyouo2
|
0ff5833fbb
|
add window.__errorHandler
|
2016-07-06 13:58:16 +08:00 |
|
Wang Nan
|
4c4fbce278
|
Merge pull request #715 from zilongshanren/addVideoSupport_v2
Add videoplayer component
|
2016-05-23 15:54:23 +08:00 |
|
zilongshanren
|
f02a9851fa
|
Add videoplayer component
Squashed commit of the following:
commit 7afbfa6e02df7408b11873947157085598051395
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 15:46:41 2016 +0800
minor tweak of the implementation
commit ddb885ef505bc9c7ed88d6977f01add391fb78b2
Merge: 9cebe78 a568ac9
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 15:13:53 2016 +0800
Merge branch 'master' into addVideoSupport
commit 9cebe789fa811e97b5c79186e23e33c9998e28b4
Merge: 806825e f765762
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 14:55:55 2016 +0800
Merge branch 'master' into addVideoSupport
commit 806825eced92003c6a06a31f202998a563cc09aa
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 23 14:51:59 2016 +0800
refactor video player component
commit 381de09ccba26817cbf29159497a1a7b0f41f994
Author: zilongshanren <guanghui8827@126.com>
Date: Fri May 20 16:51:50 2016 +0800
remove jsb-videoplayer.js
commit 82a1ef74cb1b9940cd6ff180796dcb91b5853bce
Author: zilongshanren <guanghui8827@126.com>
Date: Fri May 20 16:48:20 2016 +0800
add tooptip for video player component
commit 06a67ec425ca0713bee36d4189fb0b84e78bca57
Author: zilongshanren <guanghui8827@126.com>
Date: Fri May 20 14:08:48 2016 +0800
ios videoplayer works
commit 8e69bba2b692680737a940d926b1e4f7546a5a52
Author: zilongshanren <guanghui8827@126.com>
Date: Thu May 19 17:56:56 2016 +0800
add jsb video
commit e07fb5640cd5f4bae077923d11a2918cd8dc3b2e
Merge: a6dc10a 21fc4f7
Author: zilongshanren <guanghui8827@126.com>
Date: Wed May 18 18:12:56 2016 +0800
Merge branch 'master_video' of https://github.com/VisualSJ/engine-1 into addVideoSupport
commit 21fc4f7f17dcb2277b9c69a49bb5d66e205209bd
Author: ViusualSJ <itharbors@outlook.com>
Date: Tue May 17 11:05:05 2016 +0800
Add video click (play/pause)
commit 59040d4ea6165e1c53bb3c9d378dea696932b975
Merge: ad5b5e8 7976787
Author: ViusualSJ <itharbors@outlook.com>
Date: Tue May 17 10:46:20 2016 +0800
Merge branch 'master' of github.com:cocos-creator/engine into master_video
commit ad5b5e8587d5fd673501a5cf8c990d3ca6385a9c
Author: ViusualSJ <itharbors@outlook.com>
Date: Tue May 17 10:37:02 2016 +0800
Fixed a bug about video transform
commit 6b8e5ae2c3917ad182cf0e1bf922193ac66f17d0
Author: ViusualSJ <itharbors@outlook.com>
Date: Mon May 16 16:38:13 2016 +0800
Fixed a bug about comp can't play
commit a6dc10a314db915c12f7fd545da7d0f6f89281a9
Merge: 4e92fa8 a298738
Author: zilongshanren <guanghui8827@126.com>
Date: Mon May 16 14:45:22 2016 +0800
Merge branch 'master' into addVideoSupport
commit 4e92fa80f38544c14edce9a0a0424e4635829314
Author: ViusualSJ <itharbors@outlook.com>
Date: Fri May 13 10:22:10 2016 +0800
create videoplayer.html
commit cd0bd01df61deab6a285609f48593e478cfe44f0
Author: ViusualSJ <itharbors@outlook.com>
Date: Thu May 12 15:40:59 2016 +0800
init video player
|
2016-05-23 15:52:12 +08:00 |
|
pandamicro
|
c6c0231a6d
|
Improve WebGL detection logic
|
2016-05-20 17:09:36 +08:00 |
|
pandamicro
|
e86e846a74
|
Support auto rotate canvas when screen orientation isn't correct
|
2016-05-20 10:58:52 +08:00 |
|
Nan Wang
|
3e396e3080
|
merged v1.0
|
2016-05-11 17:29:17 +08:00 |
|
2youyouo2
|
168cbb0504
|
refine code
|
2016-05-10 11:53:38 +08:00 |
|
knoxHuang
|
99972b8380
|
transplant MotionStreak
|
2016-05-06 18:48:33 +08:00 |
|
knoxHuang
|
c29f8b6b8e
|
Repair sprite-frame can not be displayed
|
2016-04-14 09:46:37 +08:00 |
|
Jare Guo
|
79f4667636
|
formatStr should support type number as first argument
|
2016-04-08 14:58:46 +08:00 |
|
pandamicro
|
cf77995a94
|
Fix socket io variable name conflict in JSB
|
2016-03-25 20:49:10 +08:00 |
|
Jare Guo
|
51c5e1a2ba
|
add cc.loader.loadRes, remove "resources://" protocol
|
2016-03-22 15:40:50 +08:00 |
|
pandamicro
|
8beba0ea48
|
Fix clearInterval not working issue
|
2016-03-21 17:07:43 +08:00 |
|
pandamicro
|
34956900b1
|
Fix sprite frame can't be inited with a single texture in JSB
|
2016-03-19 00:38:32 +08:00 |
|
Jare Guo
|
965c0bffbd
|
fix removeSgNode on JSB
|
2016-03-18 11:07:35 +08:00 |
|
pandamicro
|
f1a066807f
|
Improve scheduler logic, avoid using key in web & native
|
2016-03-16 15:57:17 +08:00 |
|
Jare Guo
|
6b98138063
|
working on using resources:// instead of cc.url.raw in JSB
|
2016-03-09 09:58:10 +08:00 |
|
pandamicro
|
068bfa76fa
|
[JSB] Fix loadImg usage in cc.textureCache
|
2016-03-03 12:04:52 +08:00 |
|
zhangbin
|
2e8d9432ba
|
Bind the setter & getter of _ccsg.Node.arrivalOrder to the right method in native.
|
2016-03-02 17:32:11 +08:00 |
|
Nan Wang
|
3a70ae6060
|
update license file and source code header.
|
2016-03-01 11:04:12 +08:00 |
|
pandamicro
|
c18c728fbd
|
Fix properties synchronize issue in action (JSB)
|
2016-02-28 20:44:50 +08:00 |
|
zhangbin
|
16cbc4fb85
|
Implement component cc.TiledLayer
|
2016-02-22 18:28:38 +08:00 |
|
zhangbin
|
ff4584ebdc
|
Implement the component TMXTiledMap.
|
2016-02-19 10:10:45 +08:00 |
|
pandamicro
|
d79cd80b94
|
Fix JSB bugs
|
2016-02-18 23:19:00 +08:00 |
|
pandamicro
|
e5e8ade1bd
|
Fix JSB issues
|
2016-02-03 11:17:38 +08:00 |
|
pandamicro
|
2be250202a
|
Made ActionManager support cc.Node in JSB
|
2016-01-20 18:03:28 +08:00 |
|
pandamicro
|
e1cc3bebb7
|
Fix jsb replacer for repeat/easing
|
2016-01-11 17:52:49 +08:00 |
|