Skip to content

gh-pages-merge #13

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.

Sign up for GitHub

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

Open
ryj1023 wants to merge 6 commits into
base: master
Choose a base branch
from
Open

gh-pages-merge #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bf8d62
initial commit
ryj1023 Apr 24, 2016
646d465
second commit
ryj1023 Apr 24, 2016
7adf2cd
second commit
ryj1023 Apr 24, 2016
04c0308
second commit
ryj1023 Apr 25, 2016
4598f43
final commit
ryj1023 Apr 26, 2016
182c681
commit
ryj1023 Jul 16, 2017
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
Empty file added .gitignore
View file
Open in desktop
Empty file.
64 changes: 64 additions & 0 deletions css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
body{
background-color: black;
}

.container .main {
background-color: white;
margin-top: 110px;
padding-left: 100px;
min-width: 1200px;
height: 500px;
position: relative;
z-index: 1;
}
.p-one p{
float: center;
min-width: 1200px;
padding-left: 620px;

}
.ryu {
width: 659px;
height: 494px;
float: left;
}

.ryu-ready, .ryu-still, .ryu-throwing, .ryu-cool {
width: 659px;
height: 494px;
}

.ryu-ready, .ryu-throwing, .ryu-cool {
display: none;
}

.ryu-ready {
background-image: url('../images/ryu-ready-position.gif');
}

.ryu-still {
background-image: url('../images/ryu-standing-still.png');
}

.ryu-throwing {
background-image: url('../images/ryu-throwing-hadouken.png');
}

.ryu-cool {
background-image: url('../images/ryu-cool.gif');
}

.hadouken {
background-image: url('../images/hadouken.gif');
width: 156px;
height: 90px;
display: none;
position: absolute;
z-index: 10;
top: 160px;
left:600px;
float: left;
}
.hadouken, .ryu-ready, .ryu-still, .ryu-throwing, .ryu-cool {
background-repeat: no-repeat;
}
71 changes: 71 additions & 0 deletions css/main2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
body {
background-color: black;
}

.main {
background-color: white;
margin-top: 110px;
padding-left: 100px;
min-width: 1200px;
height: 500px;
position: relative;
z-index: 1;
}

.ryu {
float: left;
width: 659px;
height: 494px;
}

.ryu-ready, .ryu-still, .ryu-throwing, .ryu-cool {
width: 659px;
height: 494px;
}

.ryu-ready, .ryu-throwing, .ryu-cool {
display: none;
}

.ryu-ready {
background-image: url("../images/ryu-ready-position.gif");
}

.ryu-still {
background-image: url("../images/ryu-standing-still.png");
}

.ryu-throwing {
background-image: url("../images/ryu-throwing-hadouken.png");
}

.ryu-cool {
background-image: url("../images/ryu-cool.gif");
}

.hadouken, .ryu-ready, .ryu-still, .ryu-throwing, .ryu-cool {
background-repeat: no-repeat;
}

.hadouken {
background-image: url(../images/hadouken.gif);
width: 156px;
height: 90px;
display: none;
position: absolute;
top: 160px;
left: 550px;
z-index: 10;
}

.instructions {
position: absolute;
font-style: italic;
font-size: 2em;
height: 10em;
width: 15em;
top: 2em;
left: 22em;


}
48 changes: 48 additions & 0 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
$(document).ready(function(){
$('.ryu').mouseenter(function(){
$('.ryu-still').hide();
$('.ryu-ready').show();
})
.mouseleave(function(){
$('.ryu-still').show();
$('.ryu-ready').hide();
})
.mousedown(function() {
playHadouken();
$('.ryu-ready').hide();
$('.ryu-throwing').show();
$('.hadouken').finish().show().animate(
{'left': '1020px'}, 500,
function(){
$(this).hide();
$(this).css('left','600px');

});

})
// show hadouken and animate it to the right of the screen
.mouseup(function() {
$('ryu-throwing').hide();
$('.ryu-ready').show();
// ryu goes back to his ready position
});
$(document).keydown(function(e){
if (e.keyCode == 88){
$('.ryu-ready').hide();
$('.ryu-throwing').hide();
$('.ryu-cool').show();
}
}).keyup(function(e){
if (e.keyCode == 88){
$('.ryu-cool').hide();
$('.ryu-ready').show();
}
})

});

function playHadouken (){
$('#hadouken-sound')[0].volume = 0.5;
$('#hadouken-sound')[0].load();
$('#hadouken-sound')[0].play();
}
55 changes: 55 additions & 0 deletions js/app2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
$(document).ready(function() {
$('.ryu').mouseenter(function() {
hideRyu();
$('.ryu-ready').show();
})
.mouseleave(function() {
hideRyu();
$('.ryu-still').show();
})
.mousedown(function() {
playHadouken();
hideRyu();
$('.ryu-throwing').show();
$('.hadouken').finish().show()
.animate(
{'left': '1020px'},
500,
function() {
$(this).hide();
$(this).css('left', '520px');
}
);
})
.mouseup(function() {
hideRyu();
$('.ryu-ready').show();
});
});

$(document).keydown(function(keyPress) {
if (keyPress.keyCode === 88) {
hideRyu();
$('.ryu-cool').show();
$('.main').addClass("ryu-pose");
console.log("key pressed")
}
});
$(document).keyup(function() {
hideRyu();
$(".ryu-ready").show();
$(".main").removeClass('ryu-pose');
console.log('key up')
});

function playHadouken() {
$('#hadouken-sound')[0].volume = 0.5;
$('#hadouken-sound')[0].load();
$('#hadouken-sound')[0].play();
}
function hideRyu() {
$('.ryu-ready').hide();
$('.ryu-throwing').hide();
$('.ryu-still').hide();
$('.ryu-cool').hide();
}
22 changes: 21 additions & 1 deletion main.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,28 @@
<link rel="stylesheet" href="css/main.css">
</head>
<body>
<div class="container">
<div class="main">
<div class= "p-one">
<p>Press and hold 'X' to make Ryu strike a pose.
</p>
</div>

<div class="ryu">
<div class="ryu-still"></div>
<div class="ryu-ready"></div>
<div class="ryu-throwing"></div>
<div class="ryu-cool"></div>
</div>
<div class="hadouken"></div>
</div>
</div>



<audio id="hadouken-sound" src="sound/hadouken.mp3">

<script src="http://code.jquery.com/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery.min.js"></script>
<script src="js/app.js"></script>
</body>
</html>
71 changes: 71 additions & 0 deletions main2.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
body {
background-color: black;
}

.main {
background-color: white;
margin-top: 110px;
padding-left: 100px;
min-width: 1200px;
height: 500px;
position: relative;
z-index: 1;
}

.ryu {
float: left;
width: 659px;
height: 494px;
}

.ryu-ready, .ryu-still, .ryu-throwing, .ryu-cool {
width: 659px;
height: 494px;
}

.ryu-ready, .ryu-throwing, .ryu-cool {
display: none;
}

.ryu-ready {
background-image: url("../images/ryu-ready-position.gif");
}

.ryu-still {
background-image: url("../images/ryu-standing-still.png");
}

.ryu-throwing {
background-image: url("../images/ryu-throwing-hadouken.png");
}

.ryu-cool {
background-image: url("../images/ryu-cool.gif");
}

.hadouken, .ryu-ready, .ryu-still, .ryu-throwing, .ryu-cool {
background-repeat: no-repeat;
}

.hadouken {
background-image: url(../images/hadouken.gif);
width: 156px;
height: 90px;
display: none;
position: absolute;
top: 160px;
left: 550px;
z-index: 10;
}

.instructions {
position: absolute;
font-style: italic;
font-size: 2em;
height: 10em;
width: 15em;
top: 2em;
left: 22em;


}
27 changes: 27 additions & 0 deletions main2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Streetfighter</title>
<link rel="stylesheet" href="css/normalize.css">
<link rel="stylesheet" href="css/main2.css">
<script src="http://code.jquery.com/jquery.min.js"></script>
<script src="js/app2.js"></script>
</head>
<body>
<div class="main">
<audio id="hadouken-sound" src="sound/hadouken.mp3"></audio>
<div class="ryu">
<div class="ryu-still"></div>
<div class="ryu-ready"></div>
<div class="ryu-throwing"></div>
<div class="ryu-cool"></div>
</div>
<div class="instructions">
<p>Click on Ryu to throw a hadouken.</p>
<p>Press and hold X to make Ryu strike a pose!</p>
</div>
<div class="hadouken"></div>
</div>
</body>
</html>