aboutsummaryrefslogtreecommitdiff
path: root/webAO
diff options
context:
space:
mode:
Diffstat (limited to 'webAO')
-rw-r--r--webAO/backgrounds.js2
-rw-r--r--webAO/client.html21
-rw-r--r--webAO/client.js12
-rw-r--r--webAO/favicon.icobin32038 -> 5694 bytes
-rw-r--r--webAO/images/favicon.icobin0 -> 5694 bytes
-rw-r--r--webAO/index.html5
6 files changed, 27 insertions, 13 deletions
diff --git a/webAO/backgrounds.js b/webAO/backgrounds.js
index 4d5a726..449f4b2 100644
--- a/webAO/backgrounds.js
+++ b/webAO/backgrounds.js
@@ -5,7 +5,7 @@ export default [
"CountyCourt",
"CruiseCourt",
"default",
- "DGDEnglishCourt",
+ "DGSEnglishCourt",
"DGSJapanCourt",
"DualDestinies",
"EnglishCourt",
diff --git a/webAO/client.html b/webAO/client.html
index 4637d69..7d23efd 100644
--- a/webAO/client.html
+++ b/webAO/client.html
@@ -5,6 +5,15 @@
<title>Attorney Online session</title>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+ <meta http-equiv="Content-Security-Policy" content="script-src-elem 'self' 'unsafe-inline' https://ajax.googleapis.com;
+ script-src 'self' 'unsafe-inline' 'unsafe-eval' https://ajax.googleapis.com;
+ style-src-elem 'self' 'unsafe-inline' https://golden-layout.com;
+ style-src 'self' 'unsafe-inline' https://golden-layout.com;
+ img-src 'self' data: https://webao.animatedchatroom.net https://s3.wasabisys.com;
+ connect-src 'self' ws: https://webao.animatedchatroom.net https://s3.wasabisys.com;
+ media-src 'self' https://webao.animatedchatroom.net https://s3.wasabisys.com;">
+
<link rel="stylesheet" type="text/css" href="styles/client.css?v=1.0.0" id="client_stylesheet">
<link rel="stylesheet" type="text/css" href="styles/default.css?v=1.0.0" id="client_theme">
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
@@ -14,7 +23,7 @@
<script src="lib/jdataview.min.js"></script>
<script src="lib/gify.min.js"></script>
<script src="ui.b.js"></script>
- <script src="client.b.js?v=1.0.0"></script>
+ <script src="client.b.js?v=1.0.1"></script>
</head>
<body>
@@ -48,9 +57,9 @@
<img id="client_pair_char" alt="Paired character" style="display: none;" onerror="charError(this);">
<img id="client_char" alt="Character" onerror="charError(this);">
<img id="client_bench">
- <img id="client_fg" alt="Various overlay" src="base/misc/placeholder.gif" onerror="imgError(this);">
+ <img id="client_fg" alt="Various overlay" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=" onerror="imgError(this);">
<img id="client_evi" src="" alt="Character Evidence" onerror="imgError(this);">
- <img id="client_shout" alt="Shout overlay" src="base/misc/placeholder.gif" onerror="imgError(this);">
+ <img id="client_shout" alt="Shout overlay" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=" onerror="imgError(this);">
<div id="client_chatcontainer">
<div id="client_name"></div>
<div id="client_chat">
@@ -200,7 +209,7 @@
<fieldset style="text-align: left">
<legend>Current Area Background</legend>
<span>
- <img id="bg_preview" src="base/misc/placeholder.gif" alt="Background Preview" onerror="imgError(this);">
+ <img id="bg_preview" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=" alt="Background Preview" onerror="imgError(this);">
</span>
<span style="display:inline-block">
<label for="bg_filename">Background:</label>
@@ -286,11 +295,11 @@
<audio id="client_musicaudio" onvolumechange="changeMusicVolume()" controls loop></audio>
<p>SFX</p>
- <input id="client_svolume" class="long" type="range" min="0" max="100" value="100"
+ <input id="client_svolume" class="long" type="range" min="0" max="1" value="1" step="0.01"
onchange="changeSFXVolume()">
<p>Blip</p>
- <input id="client_bvolume" class="long" type="range" min="0" max="100" value="100"
+ <input id="client_bvolume" class="long" type="range" min="0" max="1" value="1" step="0.01"
onchange="changeBlipVolume()">
<br>
<br>
diff --git a/webAO/client.js b/webAO/client.js
index 616d6f5..7e913a1 100644
--- a/webAO/client.js
+++ b/webAO/client.js
@@ -28,7 +28,7 @@ const serverIP = queryDict.ip;
let mode = queryDict.mode;
// Unless there is an asset URL specified, use the wasabi one
-const DEFAULT_HOST = location.hostname ? "http://s3.wasabisys.com/webao/base/" : "base/";
+const DEFAULT_HOST = location.hostname ? "https://s3.wasabisys.com/webao/base/" : "base/";
const AO_HOST = queryDict.asset || DEFAULT_HOST;
const THEME = queryDict.theme || "default";
const MUSIC_HOST = AO_HOST + "sounds/music/";
@@ -391,9 +391,9 @@ class Client extends EventEmitter {
document.getElementById("client_musicaudio").volume = getCookie("musicVolume") || 1;
changeMusicVolume();
- document.getElementById("client_svolume").value = getCookie("sfxVolume") || 100;
+ document.getElementById("client_svolume").value = getCookie("sfxVolume") || 1;
changeSFXVolume();
- document.getElementById("client_bvolume").value = getCookie("blipVolume") || 100;
+ document.getElementById("client_bvolume").value = getCookie("blipVolume") || 1;
changeBlipVolume();
document.getElementById("ic_chat_name").value = getCookie("ic_chat_name");
@@ -1992,8 +1992,8 @@ window.changeMusicVolume = changeMusicVolume;
* Triggered by the sound effect volume slider.
*/
export function changeSFXVolume() {
- viewport.sfxaudio.volume = document.getElementById("client_svolume").value / 100;
- viewport.shoutaudio.volume = document.getElementById("client_svolume").value / 100;
+ viewport.sfxaudio.volume = document.getElementById("client_svolume").value;
+ viewport.shoutaudio.volume = document.getElementById("client_svolume").value;
setCookie("sfxVolume", document.getElementById("client_svolume").value);
}
window.changeSFXVolume = changeSFXVolume;
@@ -2002,7 +2002,7 @@ window.changeSFXVolume = changeSFXVolume;
* Triggered by the blip volume slider.
*/
export function changeBlipVolume() {
- viewport.blipVolume = document.getElementById("client_bvolume").value / 100;
+ viewport.blipVolume = document.getElementById("client_bvolume").value;
setCookie("blipVolume", document.getElementById("client_bvolume").value);
}
window.changeBlipVolume = changeBlipVolume;
diff --git a/webAO/favicon.ico b/webAO/favicon.ico
index e0815c8..83b380d 100644
--- a/webAO/favicon.ico
+++ b/webAO/favicon.ico
Binary files differ
diff --git a/webAO/images/favicon.ico b/webAO/images/favicon.ico
new file mode 100644
index 0000000..83b380d
--- /dev/null
+++ b/webAO/images/favicon.ico
Binary files differ
diff --git a/webAO/index.html b/webAO/index.html
index fca9173..129cac6 100644
--- a/webAO/index.html
+++ b/webAO/index.html
@@ -6,6 +6,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="">
<meta name="author" content="">
+
+ <meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;">
+ <meta http-equiv="X-Content-Security-Policy" content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;">
+ <meta http-equiv="X-WebKit-CSP" content="default-src 'self' 'unsafe-inline' 'unsafe-eval' *.aceattorneyonline.com; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; connect-src 'self' ws:;">
+
<link href="https://fonts.googleapis.com/css?family=Poiret+One" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Oswald%7CRoboto+Condensed" rel="stylesheet">
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
generated by cgit (git 2.34.1) at 2026-04-23 19:03:47 +0000