Skip to content

Commit c1a6e30

Browse files
committed
Merge branch 'Development'
2 parents 464e1ae + 9789d4e commit c1a6e30

File tree

8 files changed

+516
-3
lines changed

8 files changed

+516
-3
lines changed

app/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ CraftyGenerator.prototype.projectfiles = function projectfiles() {
5555

5656
this.copy('src/libs/crafty/_crafty.js', 'app/src/libs/crafty/crafty.js');
5757
this.copy('src/libs/crafty/_crafty.min.js', 'app/src/libs/crafty/crafty.min.js');
58+
59+
this.copy('src/libs/craftydebug/_craftyDebug.js', 'app/src/libs/craftydebug/craftyDebug.js');
60+
this.copy('src/libs/craftydebug/panels/_assets.js', 'app/src/libs/craftydebug/panels/assets.js');
61+
this.copy('src/libs/craftydebug/panels/_entities.js', 'app/src/libs/craftydebug/panels/entities.js');
5862
};
5963

6064
CraftyGenerator.prototype.gruntfileJSON = function gruntfile() {

app/templates/_index.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@
2525
<script src="src/bower_components/backbone/backbone.js"></script>
2626
<script src="src/bower_components/requirejs-jquery/parts/require.js"></script>
2727
<script src="src/game.js"></script>
28+
29+
<!-- These are debugging libraries and can be removed if you don't want the debugger. -->
30+
<script src="src/libs/CraftyDebug/craftyDebug.js"></script>
31+
<script src="src/libs/CraftyDebug/panels/assets.js"></script>
32+
<script src="src/libs/CraftyDebug/panels/entities.js"></script>
2833
<script type="text/javascript">
2934
gameContainer = {
3035
env : 'dev',
@@ -34,7 +39,7 @@
3439
sc = [], // container for backbone scene elements
3540
infc = [] // container for backbone interface elements
3641

37-
Crafty.modules({ 'crafty-debug-bar': 'DEV' }, function () {
42+
$(document).ready(function () {
3843
Crafty.debugBar.show();
3944
});
4045
</script>

app/templates/src/_sprites.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Sprites = Backbone.Model.extend({
2020
},
2121
/**
2222
* Create Crafty sprites from images object
23-
* Pass key if You want create only one choosen sprite.
23+
* Pass key if You want create only one chosen sprite.
2424
*
2525
* @param string key - sprite definition key
2626
*/

app/templates/src/libs/CraftyDebug/_craftyDebug.js

Lines changed: 149 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
(function(){
2+
3+
var styles = '#crafty-debug #assets-box{position: fixed;left: 110px;bottom: 35px;height: 200px;border: 1px solid #2F2F2F;display: none;background-color: white;border-bottom: 0px;padding-right: 10px;}\n'+
4+
'#crafty-debug #assets-box .list{height: 165px;width: 200px; float:left}\n'+
5+
'#crafty-debug #assets-box .list ul{color: #2F2F2F; height: 150px;width: 195px;overflow-y: scroll;padding-left: 5px;list-style-type: none;padding-right: 10px;font-size: 11px;margin-top: 0px;padding-top: 5px;}\n'+
6+
'#crafty-debug #assets-box .list ul li a{padding: 3px 0px 3px 0px;border-bottom: 1px dashed #BBB;color: #2F2F2F; display:block; text-decoration: none}\n'
7+
;
8+
var assetsBox = '<div id="assets-box" class="panel-box">'+
9+
'<div class="content">'+
10+
'<div class="list">'+
11+
'<div class="header">ASSETS<div class="separator"></div></div>'+
12+
'<ul id="assets-box-list"></ul>'+
13+
'</div>'+
14+
'</div>'+
15+
'</div>';
16+
17+
/*********** Renders ***********/
18+
19+
Crafty.debugBar.renders['renderAssetsList'] = function(e) {
20+
$('#crafty-debug #assets-box .list ul#assets-box-list').append('<li>'+e.key+'</li>');
21+
};
22+
23+
/*********** Events ***********/
24+
25+
$('#crafty-debug ul.menu li.assets').live('click',function(){
26+
if ($('#assets-box').is(':visible')) {
27+
$('#assets-box').hide();
28+
} else {
29+
$('.panel-box').hide();
30+
$('#assets-box').show();
31+
}
32+
});
33+
34+
Crafty.bind('NewAsset', function(e){
35+
Crafty.debugBar.renders['renderAssetsList'](e);
36+
});
37+
38+
/*********** Register Panel ***********/
39+
40+
Crafty.debugBar.registerPanel({
41+
'name' : 'Assets',
42+
'description' : 'Game assets',
43+
'styles': styles,
44+
'panelBox' : assetsBox,
45+
});
46+
47+
})();

app/templates/src/libs/CraftyDebug/panels/_entities.js

Lines changed: 303 additions & 0 deletions
Large diffs are not rendered by default.

changelog.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v0.2.0 - 02-06-2014
2+
3+
* Removing the use of Crafty.modules as the community module page has been sunsetted.
4+
* Referenced local copies of CraftyDebug.js.
5+
16
v0.1.3 - 10-18-2013
27

38
* Fixing typo in minification packaging.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-crafty",
3-
"version": "0.1.3",
3+
"version": "0.2.0",
44
"description": "A Crafty.js generator for Yeoman. Provides Craft.js scaffolding based on CraftyBoilerplate (https://github.com/ahilles107/CraftyBoilerplate)",
55
"keywords": [
66
"yeoman-generator",

0 commit comments

Comments
 (0)