Skip to content

Release Cocos2d-JS v3.5 #1639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 902 commits into from
Apr 1, 2015
Merged
Changes from 4 commits
Commits
Show all changes
902 commits
Select commit Hold shift + click to select a range
c23e391
Upgrade bindings code to SpiderMonkey v34
pandamicro Mar 17, 2015
4cf24b1
added samples solution for Windows 8.1 Universal Apps
stammen Mar 17, 2015
67f4787
updated release build properties
stammen Mar 17, 2015
f2473e0
added project files for Windows 8.1 Universal Apps
stammen Mar 17, 2015
d45d3e9
Ignore zip file created by download-deps.py if saved by user
stammen Mar 17, 2015
53d7ee2
added SpiderMonkey for Windows 8.1 Universal App
stammen Mar 17, 2015
a3cb96b
updated include paths
stammen Mar 17, 2015
8184f73
use wav file for WP8 and WINRT
stammen Mar 17, 2015
90c59e2
added Generated Files dir
stammen Mar 17, 2015
ede0934
added check for OS_WINRT
stammen Mar 17, 2015
d7e5dfe
Merge branch 'develop' into develop-winrt
stammen Mar 17, 2015
95118ef
added /Gy option for ARM error
stammen Mar 17, 2015
4cf34e1
added Windows 8.1 Universal App project files
stammen Mar 17, 2015
9f5fffc
added CC_PLATFORM_WINRT
stammen Mar 17, 2015
c043a71
added js-tests for Windows 8.1 Universal App
stammen Mar 17, 2015
f3e0c3f
Fix issue of enableDebugger
pandamicro Mar 18, 2015
bb11860
Closed #1554: added a testcase to test the blendFunc of Sprite
dingpinglv Mar 18, 2015
92995c5
Fixed a bug of template that it doesn't work when it doesn't add load…
dingpinglv Mar 18, 2015
b8ea3d6
Merge pull request #1557 from dingpinglv/develop
dingpinglv Mar 18, 2015
79547bb
Moved loading.js to res folder for Cocos console release mode.
dingpinglv Mar 18, 2015
7a570a5
Update the reference of cocos2d-html5
dingpinglv Mar 18, 2015
9392114
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
dingpinglv Mar 18, 2015
56e55c9
Merge pull request #1558 from dingpinglv/develop
dingpinglv Mar 18, 2015
d940196
Fixed a bug of Cocostudio parser that widget doesn't set layoutComponent
dingpinglv Mar 18, 2015
e584dbb
Merge pull request #1559 from dingpinglv/develop
dingpinglv Mar 18, 2015
45b0646
Refactor create_js_root_obj -> get_or_create_js_obj
pandamicro Mar 18, 2015
d3e98e0
Upgrade SpiderMonkey v34 and fix 32bit 64bit conflict
pandamicro Mar 18, 2015
afee3c1
Update submodules
pandamicro Mar 18, 2015
927f979
Ensure v33 v34 compatibility
pandamicro Mar 18, 2015
c4626e1
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 18, 2015
0bc8245
Merge branch 'develop' into develop-winrt
stammen Mar 18, 2015
ed11807
Merge pull request #1560 from pandamicro/ImproveBindings
pandamicro Mar 18, 2015
ab334da
Update engine version
pandamicro Mar 18, 2015
61dc239
Fix armature setBlendFunc parameter inconsistency
pandamicro Mar 18, 2015
44da257
Update submodules
pandamicro Mar 18, 2015
ab3e4ce
[AUTO] : updating jsbinding automatically
CocosRobot Mar 18, 2015
a6c7d82
added Windows 8.1 Universal App project template
stammen Mar 18, 2015
6edbae4
added CC_PLATFORM_WINRT
stammen Mar 18, 2015
272375b
added Windows 8.1 Universal App project template files
stammen Mar 18, 2015
1a858fc
don't auto update version number for app certification tests
stammen Mar 18, 2015
4b0b85c
removed TerminateProcess to pass Windows App Certification tests
stammen Mar 18, 2015
3cb952f
ignore AppPackages
stammen Mar 18, 2015
503ba76
ignore vcxproj.user files
stammen Mar 18, 2015
680aa0c
Merge pull request #1562 from CocosRobot/update_js_bindings_1426698251
pandamicro Mar 19, 2015
345be07
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
dingpinglv Mar 19, 2015
6b5e8bc
Merge pull request #1561 from pandamicro/develop
pandamicro Mar 19, 2015
288c390
Merge pull request #1551 from thomas-jablonski/develop
dingpinglv Mar 19, 2015
24128bb
Update authors
pandamicro Mar 19, 2015
514e42a
Fix long path issue for windows phone compilation
pandamicro Mar 19, 2015
a536f8f
Update Changelog
pandamicro Mar 19, 2015
671e8b8
fix checkbox addeventlistener crash in jsb,
Mar 19, 2015
e545cb1
Merge pull request #1564 from pandamicro/develop
pandamicro Mar 19, 2015
0bd737e
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 19, 2015
ca49888
Merge branch 'develop' into checkboxTest
Mar 19, 2015
cf97529
fix new test path
Mar 19, 2015
343d736
Add resource path for ccs.load. and modify path for ProjectNode.
VisualSJ Mar 20, 2015
a3d836a
Add resource path for ccs.load. and modify path for ProjectNode.
VisualSJ Mar 20, 2015
cf10ac6
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
VisualSJ Mar 20, 2015
f5efa36
Add release docs for v3.4 beta0
pandamicro Mar 20, 2015
af3d698
Merge pull request #1568 from pandamicro/develop
pandamicro Mar 20, 2015
ba2664c
Change logo
pandamicro Mar 20, 2015
8cfd5c6
Merge pull request #1569 from pandamicro/develop
pandamicro Mar 20, 2015
c9b2d0e
Fixed a bug that layoutComponent is undefined
VisualSJ Mar 20, 2015
3f7b314
Fixed a bug that layoutComponent is undefinedFixed a bug that layoutC…
VisualSJ Mar 20, 2015
621e014
Merge pull request #1572 from VisualSJ/develop-parser
dingpinglv Mar 20, 2015
dfe22c8
Reverse SpiderMonkey iOS build to v33
pandamicro Mar 20, 2015
01fabcb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 20, 2015
e8218ed
Merge branch 'develop' into develop-winrt
stammen Mar 22, 2015
545d8b5
Fixed #2753: Background color of panel from cocos studio 2 doesnt work
VisualSJ Mar 23, 2015
4d86c34
Merge pull request #1574 from VisualSJ/develop-parser
dingpinglv Mar 23, 2015
73e6cbc
Fixed punchbox #16651 Scale9sprite error(ccui parser)
VisualSJ Mar 23, 2015
b5af809
Merge pull request #1575 from VisualSJ/develop-parser
dingpinglv Mar 23, 2015
3c0965b
Merge pull request #1563 from dingpinglv/Iss1554_BlendFunc
pandamicro Mar 23, 2015
44afeed
Merge pull request #1566 from jianglong0156/checkboxTest
pandamicro Mar 23, 2015
a8f9590
Disable retina display by default
pandamicro Mar 23, 2015
772ec0a
Fix #1389 : Add enableStroke to cc.Label
pandamicro Mar 23, 2015
c73e2a0
Move 3D modules to jsb namespace
pandamicro Mar 23, 2015
66981b8
Fix issues of 3d module scripts (jsb namespace) and refactor test cases
pandamicro Mar 23, 2015
87f3b7f
Merge pull request #1577 from pandamicro/develop
pandamicro Mar 23, 2015
18265fe
Merge pull request #1578 from pandamicro/button
pandamicro Mar 23, 2015
32d03db
Merge branch 'develop' into develop-winrt
stammen Mar 23, 2015
3e2045e
Refactor cc.XXXLight to jsb.XXXLight
pandamicro Mar 23, 2015
146b0cb
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 23, 2015
b282b57
Merge pull request #1541 from andot/develop
pandamicro Mar 23, 2015
0426345
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 23, 2015
746de8a
Update cocos2d_specifics.cpp
zhaijialong Mar 23, 2015
0923f9f
Merge pull request #1555 from MSOpenTech/develop-winrt
pandamicro Mar 23, 2015
df6f7d9
Merge pull request #1580 from joshuastray/label_createWithTTF
pandamicro Mar 24, 2015
83d77ce
Merge pull request #1579 from pandamicro/develop
pandamicro Mar 24, 2015
88a3d5a
[AUTO] : updating jsbinding automatically
CocosRobot Mar 24, 2015
961f37d
Merge pull request #1581 from CocosRobot/update_js_bindings_1427166878
pandamicro Mar 24, 2015
9b75f34
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 24, 2015
40dee67
Fixed #1217: make remote image loading fully asynchonous
pandamicro Mar 24, 2015
9b130dc
Merge pull request #1582 from pandamicro/develop
pandamicro Mar 24, 2015
fe30993
Fix Sprite3D issues
pandamicro Mar 24, 2015
89940e9
Sync Cocos2d-x 3.5
pandamicro Mar 24, 2015
0fa6120
Merge pull request #1583 from pandamicro/develop
pandamicro Mar 25, 2015
bdfbf1c
Add security.framework for mac build
pandamicro Mar 25, 2015
3f5737c
#1217: Improved jsb.loadRemoteImg implementation
pandamicro Mar 25, 2015
240f829
Merge pull request #1584 from pandamicro/develop
pandamicro Mar 25, 2015
2cbcec3
[AUTO] : updating jsbinding automatically
CocosRobot Mar 25, 2015
7802cc3
Merge pull request #1585 from pandamicro/develop
pandamicro Mar 25, 2015
a1d307b
Merge pull request #1587 from CocosRobot/update_js_bindings_1427250870
pandamicro Mar 25, 2015
b0e2d6b
Fix Node_init empty implementation issue
pandamicro Mar 25, 2015
05781a1
Merge pull request #1567 from VisualSJ/develop-loading
pandamicro Mar 25, 2015
044eb57
Merge pull request #1590 from pandamicro/develop
pandamicro Mar 25, 2015
0e6dd60
Support compile js projects on platform wp8-xaml & win8.1-universal.
Mar 25, 2015
6004d08
Merge pull request #1591 from natural-law/develop
pandamicro Mar 25, 2015
049d087
Closed #1570: Added Spine FFD testcases. It doesn't work on Web.
dingpinglv Mar 25, 2015
194c792
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
dingpinglv Mar 25, 2015
85c3cd0
Closed #1570: modified cc.log in SpineTest.js
dingpinglv Mar 25, 2015
2963433
Merge pull request #1592 from dingpinglv/Iss1570_SpineFFD
dingpinglv Mar 25, 2015
fbf6331
Move Facebook SDK to avoid long path issue
pandamicro Mar 25, 2015
6a05df3
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 25, 2015
642ae82
particle can be created from a map
Mar 25, 2015
5b9cd8d
Merge pull request #1593 from pandamicro/develop
pandamicro Mar 25, 2015
af96314
Sync the latest OS info
pandamicro Mar 25, 2015
7db31af
Merge pull request #1595 from pandamicro/develop
pandamicro Mar 25, 2015
1ea620f
Fix ClippingNode init issue
pandamicro Mar 25, 2015
a2f68f0
Improved bindings register
pandamicro Mar 25, 2015
a05a3fd
Merge pull request #1596 from pandamicro/develop
pandamicro Mar 25, 2015
9787d9b
Support to set custom scheduler & actionmanager for node.
Mar 25, 2015
1102350
Adds retain & release for Scheduler & ActionManager
Mar 25, 2015
9edd508
Revert changes to jsb.loadRemoteImg and use multi thread for downloading
pandamicro Mar 25, 2015
f366d74
Merge pull request #1597 from pandamicro/develop
pandamicro Mar 25, 2015
fc20458
Fix #1589: Avoid rebinding js object with the same texture
pandamicro Mar 25, 2015
e46f448
Fix a small mistake
pandamicro Mar 25, 2015
c909230
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 25, 2015
b9c7f86
Merge pull request #1598 from dumganhar/scheduler-fix
pandamicro Mar 25, 2015
342753c
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 25, 2015
0461754
Add SchedulerTimeScale test into the test list
pandamicro Mar 25, 2015
67da9a1
[AUTO] : updating jsbinding automatically
CocosRobot Mar 25, 2015
b45a750
Fix #1332 ccui.TextBMFont's renderer API inconsistency
pandamicro Mar 26, 2015
b1acbe1
Merge pull request #1599 from pandamicro/develop
pandamicro Mar 26, 2015
a7abde2
Issue #1565: TTF font haven't been set when parser Label
VisualSJ Mar 26, 2015
a3bd795
Merge pull request #1602 from VisualSJ/develop-1565
pandamicro Mar 26, 2015
28e7280
Merge pull request #1601 from pandamicro/develop
pandamicro Mar 26, 2015
3475bde
Merge pull request #1600 from CocosRobot/update_js_bindings_1427304776
pandamicro Mar 26, 2015
8acf09f
disable "SDL Check"
Mar 26, 2015
eef10da
Merge remote-tracking branch 'upstream/develop' into develop
Mar 26, 2015
2817330
fix EGL_PLATFORM_ANGLE_USE_WARP_ANGLE undefine error after upgrade v3…
Mar 26, 2015
c476eea
fix incorrect path
Mar 26, 2015
4b58472
Sync Cocos2d-x
pandamicro Mar 26, 2015
dd6628e
Merge pull request #1606 from pandamicro/develop
pandamicro Mar 26, 2015
95edb69
Add 3d extension bindings for Particle3D
pandamicro Mar 26, 2015
347f94d
Add 3d extension bindings to projects (mac/ios/android/linux)
pandamicro Mar 26, 2015
838b527
Add 3d extension bindings to template projects
pandamicro Mar 26, 2015
c198de4
Merge pull request #1605 from joshuastray/develop
pandamicro Mar 26, 2015
0b8d6bb
[AUTO] : updating jsbinding automatically
CocosRobot Mar 26, 2015
670d18b
fix moonwarrior and jstests win32 project
Mar 26, 2015
10a1cac
Add security.framework for mac in templates
pandamicro Mar 26, 2015
88720b0
Merge pull request #1607 from pandamicro/develop
pandamicro Mar 26, 2015
fdc0d70
Merge pull request #1608 from CocosRobot/update_js_bindings_1427362374
pandamicro Mar 26, 2015
1be6ff5
fix win32 template
Mar 26, 2015
e50dc5f
fix template working directory
Mar 26, 2015
f02af74
ActionTimeData was converted to ObjectExtensionData
VisualSJ Mar 26, 2015
df7ff12
ActionTimeData was converted to ObjectExtensionData
VisualSJ Mar 26, 2015
6e7d53a
[AUTO] : updating jsbinding automatically
CocosRobot Mar 26, 2015
87bdf66
Merge pull request #1609 from joshuastray/fix-win-proj
pandamicro Mar 26, 2015
a9d2798
Merge pull request #1611 from CocosRobot/update_js_bindings_1427375421
pandamicro Mar 26, 2015
09cd153
Merge pull request #1610 from VisualSJ/develop-3.4final
pandamicro Mar 26, 2015
3e78664
[AUTO] : updating jsbinding automatically
CocosRobot Mar 26, 2015
cc96c6f
Merge pull request #1612 from CocosRobot/update_js_bindings_1427376779
pandamicro Mar 26, 2015
2c43586
Fix Cocos 2.2 animation parse issue
pandamicro Mar 26, 2015
39d01c6
Support new constructor for ccs.ObjectExtensionData
pandamicro Mar 26, 2015
cb8d377
Merge pull request #1613 from pandamicro/develop
pandamicro Mar 26, 2015
6e07d89
[AUTO] : updating jsbinding automatically
CocosRobot Mar 26, 2015
d20ef25
update cocos2d-html5
Mar 27, 2015
f8877ec
Merge remote-tracking branch 'upstream/develop' into particle
Mar 27, 2015
0497966
fix setBlendFunc
Mar 27, 2015
98b6cda
Merge pull request #1614 from CocosRobot/update_js_bindings_1427394602
pandamicro Mar 27, 2015
9387600
Merge pull request #1594 from joshuastray/particle
pandamicro Mar 27, 2015
f51c648
add files to windows projects
Mar 27, 2015
abac2be
Merge pull request #1617 from joshuastray/fixwin
pandamicro Mar 27, 2015
ea00f4b
Merge pull request #1616 from joshuastray/blendfunc
pandamicro Mar 27, 2015
1f9ee8c
add 3d parser
xiaofeng11 Mar 27, 2015
2efd068
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
xiaofeng11 Mar 27, 2015
99e3db5
Repair the problem that speed error of nested animation.
VisualSJ Mar 27, 2015
c074805
Fix 3d sprite parse errors
xiaofeng11 Mar 27, 2015
a2243b1
Repair the problem that speed error of nested animation.
VisualSJ Mar 27, 2015
ef01ec9
Fix compare logic
xiaofeng11 Mar 27, 2015
a6af1ff
updated to support cocos2d-x v3.5
stammen Mar 27, 2015
34deb44
Merge pull request #1618 from VisualSJ/develop-3.4final
pandamicro Mar 28, 2015
d72d308
Update submodules
pandamicro Mar 28, 2015
44f6038
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 28, 2015
7589e31
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
xiaofeng11 Mar 28, 2015
fcc9be6
fix linux compilation
Mar 28, 2015
cc23d38
fix wp8/winrt judgement
Mar 28, 2015
e4f2d9c
cc to jsb
Mar 28, 2015
bcae6a8
setTrackStartListener not supported now
Mar 28, 2015
e8a9a86
update cocos2d-x
Mar 28, 2015
f495fa6
turn off SDL check
Mar 28, 2015
bbb4000
Merge pull request #1620 from joshuastray/fixlinux
pandamicro Mar 28, 2015
72a833b
fix copy failed
Mar 28, 2015
7d09d59
Merge pull request #1621 from joshuastray/develop-2
pandamicro Mar 28, 2015
38cbdb7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
xiaofeng11 Mar 28, 2015
c245237
Fix uncertainty compare statements
xiaofeng11 Mar 28, 2015
695cb2b
Merge pull request #1619 from xiaofeng11/develop
pandamicro Mar 28, 2015
0d401c4
[AUTO] : updating jsbinding automatically
CocosRobot Mar 28, 2015
17a1d51
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 29, 2015
af97c46
Merge pull request #1623 from CocosRobot/update_js_bindings_1427549672
pandamicro Mar 29, 2015
67a4cff
deleted old project files
stammen Mar 29, 2015
0148efa
updated to cocos2d-x v3.5
stammen Mar 29, 2015
93cdb3a
updated to cocos2d-x v3.5
stammen Mar 29, 2015
2e7d56f
Merge branch 'develop' into winrt
stammen Mar 29, 2015
4af6d73
removed solution files
stammen Mar 29, 2015
2ab06ac
updated projects to use cocos2d-x v3.5
stammen Mar 29, 2015
712feb5
Merge pull request #1624 from MSOpenTech/winrt
pandamicro Mar 30, 2015
3df2dad
add cc.sys.openURL
Mar 30, 2015
96f4c12
Merge pull request #1626 from joshuastray/url
pandamicro Mar 30, 2015
2b7813f
updated ignore warnings properties
stammen Mar 30, 2015
bd01672
diasbled LTCG for release builds
stammen Mar 30, 2015
63fb4c3
Remove 1.6 actionTimeLine tests
VisualSJ Mar 30, 2015
9042000
Merge pull request #1627 from VisualSJ/develop-3.4final
pandamicro Mar 30, 2015
ce8f1d2
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 30, 2015
a8beb8f
Fix relocation overflow
pandamicro Mar 30, 2015
ffe7e00
Update engine version and submodule
pandamicro Mar 30, 2015
6383714
Merge branch 'wp8-fix' of github.com:MSOpenTech/cocos2d-js into wp8-fix
stammen Mar 30, 2015
9eb683b
updated WP8 SpiderMonkey DLLs to pass Windows App Certification tests
stammen Mar 30, 2015
9e7fa74
use SHOW_ALL resolution policy for WP8 and WINRT
stammen Mar 30, 2015
a161acd
deleted .user file
stammen Mar 31, 2015
a3a72c6
added new universal app files to fix home button crash
stammen Mar 31, 2015
d6d5d4d
added new universal app files to fix home button crash
stammen Mar 31, 2015
3f3d72c
added new universal app files to fix home button crash
stammen Mar 31, 2015
cc7ca26
Merge pull request #1630 from MSOpenTech/wp8-fix
pandamicro Mar 31, 2015
d8fb242
Merge branches 'develop' and 'develop' of https://github.com/cocos2d/…
pandamicro Mar 31, 2015
0b3f468
Add scheduler tests
VisualSJ Mar 31, 2015
42cea73
Add scheduler tests
VisualSJ Mar 31, 2015
f97e752
Merge pull request #1631 from VisualSJ/develop-3.4final
dingpinglv Mar 31, 2015
ca4fb40
Fix runtime bindings issue
pandamicro Mar 31, 2015
e2e1298
Merge branches 'develop' and 'develop' of https://github.com/cocos2d/…
pandamicro Mar 31, 2015
3e35188
make camera.unproject accept one argument
Mar 31, 2015
08d5b98
Merge pull request #1632 from pandamicro/develop
pandamicro Mar 31, 2015
5820cd1
fix winrt chinese label test
Mar 31, 2015
236f309
remove unwanted code
Mar 31, 2015
de4fb85
Update runtime
pandamicro Mar 31, 2015
7147391
Remove Framework search path in js-tests iOS proj to avoid potential …
pandamicro Mar 31, 2015
a95612b
Merge pull request #1633 from joshuastray/unproject
pandamicro Mar 31, 2015
06d3e26
Merge pull request #1634 from joshuastray/winrtfont
pandamicro Mar 31, 2015
d28f5fa
Update Engine version
pandamicro Mar 31, 2015
7252910
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Mar 31, 2015
a474d6a
Merge pull request #1635 from pandamicro/develop
pandamicro Mar 31, 2015
3732bc2
added back button support. Check if rendering thread has been cancelled
stammen Mar 31, 2015
cf54fde
Merge pull request #1636 from MSOpenTech/winrt-fix
pandamicro Apr 1, 2015
2fc54d0
change moveTo to moveBy
Apr 1, 2015
18e197b
Merge pull request #1637 from joshuastray/move
pandamicro Apr 1, 2015
4c195e5
[Cocos2d-JS v3.5] Added docs
pandamicro Apr 1, 2015
1dbc700
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into …
pandamicro Apr 1, 2015
21f6df6
Update h5 engine
pandamicro Apr 1, 2015
0300f81
Merge pull request #1638 from pandamicro/develop
pandamicro Apr 1, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion samples/js-tests/src/SchedulerTest/SchedulerTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -658,6 +658,39 @@ var SchedulerTimeScale = SchedulerTestLayer.extend({
}
});

var unScheduleAndRepeatTest = SchedulerTestLayer.extend({

onEnter: function(){
this._super();
cc.log("start schedule 'repeat': run once and repeat 4 times");
this.schedule(this.repeat, 0.5, 4);
cc.log("start schedule 'forever': repeat forever (stop in 8s)");
this.schedule(this.forever, 0.5);
this.schedule(function(){
cc.log("stop the 'forever'");
this.unschedule(this.forever);
}, 8);
},

_times: 5,

repeat: function(){
cc.log("Repeat - the remaining number: " + this._times--);
},

forever: function(){
cc.log("Repeat Forever...");
},

title: function(){
return "Repeat And unschedule Test";
},

subtitle: function(){
return "Repeat will print 5 times\nForever will stop in 8 seconds.";
}
});

/*
main entry
*/
Expand Down Expand Up @@ -686,7 +719,8 @@ var arrayOfSchedulerTest = [
SchedulerUpdateAndCustom,
SchedulerUpdateFromCustom,
RescheduleCallback,
ScheduleUsingSchedulerTest
ScheduleUsingSchedulerTest,
unScheduleAndRepeatTest
];

var nextSchedulerTest = function () {
Expand Down