Skip to content
Permalink
Browse files

Merge branch 'develop'

  • Loading branch information...
rtsan committed Jan 4, 2016
2 parents 3a371f2 + 593ab7c commit 1606e5f46d3bb5127a8d90aa3f9da37114c05daa
@@ -97,7 +97,7 @@ module.exports = (grunt) ->
* <%= pkg.name %> v<%= pkg.version %>
* <%= pkg.homepage %>
*
* Copyright Ubiquitous Entertainment Inc.
* Copyright UEI Corporation
* Released under the MIT license.
*/\n\n
"""
@@ -107,7 +107,7 @@ module.exports = (grunt) ->
files:
'enchant.min.js': [ 'dev/enchant.js' ]
options:
banner: "/* <%= pkg.name %> v<%= pkg.version %> <%= pkg.homepage %> Copyright (c) Ubiquitous Entertainment Inc. Released Under the MIT license. */\n"
banner: "/* <%= pkg.name %> v<%= pkg.version %> <%= pkg.homepage %> Copyright (c) UEI Corporation Released Under the MIT license. */\n"

qunit:
files: [ 'tests/qunit/*/*.html' ]
@@ -1,4 +1,4 @@
Copyright (c) 2011-2012 Ubiquitous Entertainment Inc.
Copyright (c) 2011-2012 UEI Corporation

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -3,7 +3,7 @@
* avatar.enchant.js
* @version 0.2 (2012/08/09)
* @requires enchant.js v0.4.0 or later
* @author shi3z/Ubiquitous Entertainment Inc.
* @author shi3z/UEI Corporation
*
* @description
* enchant.js extension for 9leap.net
@@ -4,7 +4,7 @@
* @version v0.4.1
* @require enchant.js v0.6.3+
* @require gl.enchant.js v0.3.5+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
[lang:ja]
* @description
@@ -4,7 +4,7 @@
* @version 0.3.7
* @require enchant.js v0.4.5+
* @require gl-matrix.js 1.3.7+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
[lang:ja]
@@ -4,7 +4,7 @@
* @version 0.2.3 (2013/04/3)
* @requires enchant.js v0.6.0 or later
* @requires nineleap.enchant.js v0.2.2 or later
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
* enchant.js extention for 9leap.net
@@ -40,7 +40,7 @@
* @require enchant.js v0.6+
*
* @version 0.1
* @author Ubiquitous Entertainment Inc. (Kevin Kratzer)
* @author UEI Corporation (Kevin Kratzer)
**/

if (enchant !== undefined) {
@@ -4,7 +4,7 @@
* @version 0.2.2
* @require enchant.js v0.6.3+
* @require gl.enchant.js v0.3.7+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
[lang:ja]
@@ -6,7 +6,7 @@
* @require gl.enchant.js v0.3.6+
* @require primitive.gl.enchant.js v0.3.5+
* @require gl-matrix.js 1.3.7+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
[lang:ja]
@@ -3,7 +3,7 @@
* primitive.gl.enchant.js
* @version 0.3.5
* @require gl.enchant.js v0.3.5+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
[lang:ja]
@@ -3,7 +3,7 @@
* socket.enchant.js
* @version beta (2011/12/03)
* @require enchant.js v0.4.1+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
* enchant.js extension for online game
@@ -3,7 +3,7 @@
* telepathy.enchant.js
* @version 0.1.0
* @require enchant.js v0.8.0+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*/
(function() {
/**
@@ -3,7 +3,7 @@
* widget.enchant.js
* @version 0.2.0
* @require enchant.js v0.6.0+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
[lang:ja]
@@ -3,7 +3,7 @@
* wiiu.enchant.js
* @version 0.1.0
* @require enchant.js v0.6.0+
* @author Ubiquitous Entertainment Inc.
* @author UEI Corporation
*
* @description
* Library for making game for Nintendo wii U
@@ -162,13 +162,13 @@ enchant.WebAudioSound = enchant.Class.create(enchant.EventTarget, {
},
/**
[lang:ja]
* 現在の再生位置 (秒).
* ボリューム. 0 (無音) ~ 1 (フルボリューム).
[/lang]
[lang:en]
* Current playback position (seconds).
* Volume. 0 (muted) ~ 1 (full volume).
[/lang]
[lang:de]
* Aktuelle Wiedergabeposition (seconds).
* Lautstärke. 0 (stumm) ~ 1 (volle Lautstärke).
[/lang]
* @type Number
*/
@@ -186,13 +186,13 @@ enchant.WebAudioSound = enchant.Class.create(enchant.EventTarget, {
},
/**
[lang:ja]
* ボリューム. 0 (無音) ~ 1 (フルボリューム).
* 現在の再生位置 (秒).
[/lang]
[lang:en]
* Volume. 0 (muted) ~ 1 (full volume).
* Current playback position (seconds).
[/lang]
[lang:de]
* Lautstärke. 0 (stumm) ~ 1 (volle Lautstärke).
* Aktuelle Wiedergabeposition (seconds).
[/lang]
* @type Number
*/
@@ -2,12 +2,11 @@
<html>
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<title>enchant</title>
<script type="text/javascript" src="../../../build/enchant.js"></script>
<script type="text/javascript" src="../../../build/plugins/tl.enchant.js"></script>
<script type="text/javascript" src="main.js"></script>
<style type="text/css">
body {
@@ -17,7 +17,6 @@ window.onload = function(){

sprites[0].addEventListener("touchstart", function(){
this.tl.moveBy(200, 0, 60, enchant.Easing.LINEAR);
console.log(this.tl);
});
sprites[1].addEventListener("touchstart", function(){
this.tl.moveBy(200, 0, 60, enchant.Easing.QUINT_EASEOUT);

0 comments on commit 1606e5f

Please sign in to comment.
You can’t perform that action at this time.