Skip to content

Commit

Permalink
webkit fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Continuities committed Aug 21, 2014
1 parent 907f048 commit 81d73e8
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 11 deletions.
18 changes: 17 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,25 @@
/>
</target>

<target name="publish">
<target name="publish-all">
<scp keyfile="${publish.key}" todir="${publish.user}@${publish.server}:${publish.path}" trust="true">
<fileset dir="${deploy.path}" />
</scp>
</target>

<target name="publish-script">
<scp keyfile="${publish.key}" todir="${publish.user}@${publish.server}:${publish.path}" trust="true">
<fileset dir="${deploy.path}" >
<include name="**/*.js" />
</fileset>
</scp>
</target>

<target name="publish-style">
<scp keyfile="${publish.key}" todir="${publish.user}@${publish.server}:${publish.path}" trust="true">
<fileset dir="${deploy.path}" >
<include name="**/*.css" />
</fileset>
</scp>
</target>
</project>
4 changes: 2 additions & 2 deletions www/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ body.night {
-ms-transition: background-color 1400ms linear, border-color 1400ms linear, opacity 200ms linear, -ms-transform 200ms linear !important;
-o-transition: background-color 1400ms linear, border-color 1400ms linear, opacity 200ms linear, -o-transform 200ms linear !important;
transform: translateY(400px);
-wwebkit-transform: translateY(400px);
-webkit-transform: translateY(400px);
-moz-transform: translateY(400px);
-ms-transform: translateY(400px);
-o-transform: translateY(400px);
Expand Down Expand Up @@ -406,7 +406,7 @@ body.night {
z-index: 102;
border-top: 2px solid;
transform: translateY(0px);
-wwebkit-transform: translateY(0px);
-webkit-transform: translateY(0px);
-moz-transform: translateY(0px);
-ms-transform: translateY(0px);
-o-transform: translateY(0px);
Expand Down
21 changes: 13 additions & 8 deletions www/js/app/audio/audio.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,16 +213,21 @@ define(['app/eventmanager', 'app/audio/webaudioprovider', 'app/audio/htmlaudiopr
init: function(options) {
options = options || {};
if(!provider) {
provider = getProvider();
format = chooseFormat();
if(provider != null && format != null) {
toLoad = 0;
for(s in sounds) {
if(!options.nomusic || !sounds[s].music) {
loadSound(sounds[s]);
try {
provider = getProvider();
format = chooseFormat();
if(provider != null && format != null) {
toLoad = 0;
for(s in sounds) {
if(!options.nomusic || !sounds[s].music) {
loadSound(sounds[s]);
}
}
E.bind('dayBreak', startMusic);
}
E.bind('dayBreak', startMusic);
} catch(e) {
console.error('Failed to init audio. Your browser sucks.');
return;
}
} else {
crossFade(playingBossMusic ? 'BossMusic' : 'NightMusic', 'DayMusic', 700);
Expand Down
13 changes: 13 additions & 0 deletions www/js/app/graphics/graphics.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ define(['jquery', 'app/eventmanager', 'app/textStore', 'app/gameoptions',
var currentScale = null;
var heartInfo = { total: 0, big: 0 };
var imageLoaded = false;

// I hate that I have to do this.
var requestAnimationFrame = (function() {
return window.requestAnimationFrame ||
window.webkitRequestAnimationFrame ||
window.mozRequestAnimationFrame ||
window.onRequestAnimationFrame ||
window.msRequestAnimationFrame ||
function(callback, element) {
window.setTimeout(callback, 1000 / 60);
};
})();

var lastTime = null;
var animations = {};
Expand All @@ -28,6 +40,7 @@ define(['jquery', 'app/eventmanager', 'app/textStore', 'app/gameoptions',
*/
function doEntityAnimation(timestamp) {
requestAnimationFrame(doEntityAnimation);
timestamp = timestamp || Date.now();
if(!lastTime) {
lastTime = timestamp;
return;
Expand Down

0 comments on commit 81d73e8

Please sign in to comment.