Skip to content

Issue #2803: add a sample game link to index.html #1144

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 2 commits into from
Sep 17, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Cocos2d-html5-v2.1.6 @ Sep.19, 2013
* Improved Sprite, Node, LabelTTF class define from separated code to combined code for maintainability, now it is clean and clear
* added a new sample game "Fruit attack" which works great on PC browsers, mobile browsers, and can even be run natively as an android and iOS app with JSB
* cc.Sprite and its subClasses's texture has been replaced from DOM element to cc.Texture2D on Canvas mode
* Improved cc.Texture2d for direct using without pre-loading image resources, you don't need to wait resources loading when create a new scene or layers
* Migrated CCBReader and GUI to Cocos2d-x 2.1.4
Expand Down
1 change: 1 addition & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ <h1><a href="index.html"><img src="samples/tests/res/Images/cocos2dbanner.png"/>
<li><a href="samples/tests/index.html">Test cases</a> <span class="comment"> - Engine Testcases</span></li>
<li><a href="template/index.html">Template</a> <span class="comment"> - Cocos2d-html5 Template</span></li>
<li><a href="samples/games/MoonWarriors/index.html">MoonWarriors</a> <span class="comment"> - Game</span></li>
<li><a href="samples/games/FruitAttack/index.html">Fruit Attack</a> <span class="comment"> - Game</span></li>
<li><a href="samples/games/WatermelonWithMe/index.html">Watermelon with Me</a> <span class="comment"> - Game</span></li>
<li><a href="samples/games/CocosDragonJS/Published files HTML5/index.html">CocosDragon</a> <span class="comment"> - Game</span></li>
<li><a href="samples/games/CrystalCraze/Published-HTML5/index.html">Crystal Craze</a> <span class="comment"> - Game</span></li>
Expand Down
2 changes: 1 addition & 1 deletion samples
Submodule samples updated 41 files
+ games/FruitAttack/audio/effect_bombPattern.mp3
+ games/FruitAttack/audio/effect_bombPattern.ogg
+ games/FruitAttack/audio/effect_buttonClick.mp3
+ games/FruitAttack/audio/effect_buttonClick.ogg
+ games/FruitAttack/audio/effect_clearPattern.mp3
+ games/FruitAttack/audio/effect_clearPattern.ogg
+ games/FruitAttack/audio/effect_game_fail.mp3
+ games/FruitAttack/audio/effect_game_fail.ogg
+ games/FruitAttack/audio/effect_game_pass.mp3
+ games/FruitAttack/audio/effect_game_pass.ogg
+ games/FruitAttack/audio/effect_ice.mp3
+ games/FruitAttack/audio/effect_ice.ogg
+ games/FruitAttack/audio/effect_noclear.mp3
+ games/FruitAttack/audio/effect_noclear.ogg
+ games/FruitAttack/audio/effect_timewarning.mp3
+ games/FruitAttack/audio/effect_timewarning.ogg
+ games/FruitAttack/audio/effect_unswap.mp3
+ games/FruitAttack/audio/effect_unswap.ogg
+ games/FruitAttack/audio/musicByFoxSynergy.mp3
+ games/FruitAttack/audio/musicByFoxSynergy.ogg
+81 −0 games/FruitAttack/cocos2d.js
+28 −0 games/FruitAttack/index.html
+60 −0 games/FruitAttack/main.js
+ games/FruitAttack/res/PatternBg.png
+ games/FruitAttack/res/ProgressBarBack.png
+ games/FruitAttack/res/ProgressBarFront.png
+ games/FruitAttack/res/background.jpg
+633 −0 games/FruitAttack/res/baseResource.plist
+ games/FruitAttack/res/baseResource.png
+ games/FruitAttack/res/btn/btnStartGameDown.png
+ games/FruitAttack/res/btn/btnStartGameNor.png
+ games/FruitAttack/res/logo.png
+ games/FruitAttack/resultLayer/btnResultRestart.png
+ games/FruitAttack/resultLayer/btnResultRestartDown.png
+ games/FruitAttack/resultLayer/star.png
+187 −0 games/FruitAttack/src/CCNotificationCenter.js
+75 −0 games/FruitAttack/src/GameData.js
+198 −0 games/FruitAttack/src/Pattern.js
+1,085 −0 games/FruitAttack/src/PatternMatrix.js
+107 −0 games/FruitAttack/src/ResultLayer.js
+61 −0 games/FruitAttack/src/WelcomeLayer.js