From 5f1f9c14ff60b8ae26edbd6a819c5d159da0026d Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Sun, 10 Mar 2013 17:49:00 -0700 Subject: Retrieve solution. --- ajax/misc.ajax.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ajax/misc.ajax.php diff --git a/ajax/misc.ajax.php b/ajax/misc.ajax.php new file mode 100644 index 0000000..64eeccc --- /dev/null +++ b/ajax/misc.ajax.php @@ -0,0 +1,23 @@ + \ No newline at end of file -- cgit v1.2.3 From 805a8fc305b140bc47e95a6ce4e01de0315bfe8c Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Sun, 10 Mar 2013 22:41:14 -0700 Subject: Duplicate Solution issue. Amazed this came up just now! O_o! --- db updates.sql | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/db updates.sql b/db updates.sql index 2e04942..66da097 100644 --- a/db updates.sql +++ b/db updates.sql @@ -108,4 +108,10 @@ AND (maps.name IS NULL OR maps.name = ''); ALTER TABLE `solutions` CHANGE `solution` `solution` VARCHAR( 4095 ) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL; -- Fix Typo -UPDATE unlocks SET name = 'Light Diagonal Cover' WHERE name = 'Light Diagnol Cover' \ No newline at end of file +UPDATE unlocks SET name = 'Light Diagonal Cover' WHERE name = 'Light Diagnol Cover' + +-- Change index to a unique index +-- If any duplicates exist you can find them with this: +-- select mapID, count(*) from `solutions` group by mapID, userID HAVING count(*) > 1 +ALTER TABLE `solutions` DROP INDEX `userID` , +ADD UNIQUE `userIDmapID` ( `userID` , `mapID` ) -- cgit v1.2.3 From 3eaecf134d4b50c3155d3387a3a387e236e7afcb Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Sun, 10 Mar 2013 23:05:53 -0700 Subject: Chat mute-button click sound. --- css/chat.css | 5 +++++ css/maps.css | 5 +++++ js/mapspecs.js | 10 ++++++++-- pages/chat.php | 10 ++++++++-- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/css/chat.css b/css/chat.css index dda50eb..79354b1 100644 --- a/css/chat.css +++ b/css/chat.css @@ -24,6 +24,11 @@ top: 5px; margin-right: 5px; border-radius:5px; + + transition:background-color 0.6s ease-out; + -webkit-transition:background-color 0.6s ease-out; + -o-transition:background-color 0.6s ease-out; + -moz-transition:background-color 0.6s ease-out; } .chatMute_true { background-image: url(../images/Mute.png); diff --git a/css/maps.css b/css/maps.css index 085b273..0c18725 100644 --- a/css/maps.css +++ b/css/maps.css @@ -209,6 +209,11 @@ top: 5px; margin-right: 5px; border-radius:5px; + + transition:background-color 0.6s ease-out; + -webkit-transition:background-color 0.6s ease-out; + -o-transition:background-color 0.6s ease-out; + -moz-transition:background-color 0.6s ease-out; } .mapMute_true { background-image: url(../images/Mute.png); diff --git a/js/mapspecs.js b/js/mapspecs.js index 0f9be4a..688c9dc 100644 --- a/js/mapspecs.js +++ b/js/mapspecs.js @@ -985,8 +985,14 @@ function setMute(value) { var value = getCookie('pref_mute'); $('.mapMute').removeClass("mapMute_"+value); - if (value == 'true') value = 'false'; - else value = 'true'; + if (value == 'true') { + value = 'false'; + soundManager.setVolume('pit', 20); + soundManager.setPan('pit', -60) + soundManager.play('pit'); + } else { + value = 'true'; + } savePref('mute', value); $('.mapMute').addClass("mapMute_"+value); diff --git a/pages/chat.php b/pages/chat.php index c04f7b6..45a0700 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -244,8 +244,14 @@ function setChatMute() { var value = chatIsMuted; $('#chatMute').removeClass("chatMute_"+value); - if (value == 'true') value = 'false'; - else value = 'true'; + if (value == 'true') { + value = 'false'; + soundManager.setVolume('pit', 20); + soundManager.setPan('pit', -60) + soundManager.play('pit'); + } else { + value = 'true'; + } chatIsMuted = value; $('#chatMute').addClass("chatMute_"+value); savePref('chatMute', value); -- cgit v1.2.3 From 659de2e8017ab15c18254084608d984afd8d87a2 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Mon, 11 Mar 2013 13:37:16 -0700 Subject: Chat: No more spoilers in the title. --- pages/chat.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pages/chat.php b/pages/chat.php index 45a0700..5be6689 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -90,7 +90,12 @@ function getChatDone(data) { chat.message = chat.message.substring(9); isSpoiler = true; } - + + if (!isSpoiler) { + document.title = chat.displayName+': '+chat.message.substring(0, 20)+' | Pathery Chat'; + } else { + document.title = chat.displayName+': ~Spoiler~ | Pathery Chat'; + } //console.log("INSIDE BUILD START"); p = ''; @@ -140,7 +145,6 @@ function getChatDone(data) { $("#chatContainer").scrollTop($("#chatContainer")[0].scrollHeight); firstGetChat = false; } - document.title = lastDisplay+': '+lastMessage.substring(0, 10)+'... Pathery Chat'; if (chatIsMuted == 'false') { soundManager.setVolume('charm', 20); soundManager.setPan('charm', -60) -- cgit v1.2.3 From c78e44eeab13be5a23fe9836303a4d6da2df4e2a Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Tue, 12 Mar 2013 17:32:11 -0700 Subject: Track unsubscribed status with mixpanel for future use. --- pages/cp.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pages/cp.php b/pages/cp.php index 97b715d..4f7b112 100644 --- a/pages/cp.php +++ b/pages/cp.php @@ -80,9 +80,11 @@ if (isset($_POST['updateSettings']) AND $_POST['updateSettings'] == 'true') { if ($_POST['emailOptOut'] == 'true') { setOptedOutOfEmails($userID, true); $r .= "
You are opted out of emails"; + $r .= ''; } else { setOptedOutOfEmails($userID, false); $r .= "
You are accepting emails"; + $r .= ''; } DoRedirect($r); exit; @@ -107,9 +109,9 @@ $displayName = $_SESSION['displayName']; Settings: Display Name: -

- > - Opt out of emails? We'll only send you important feature updates! I Promise! +

We'll only send you important feature updates! +
> + Opt out of emails?

-- cgit v1.2.3 From 204718e6c644373cf876bdb2afbf18cffbb2bf60 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Tue, 12 Mar 2013 17:32:53 -0700 Subject: pit.mp3 for clicking on a mute button. --- sounds/pit.mp3 | Bin 0 -> 1569 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 sounds/pit.mp3 diff --git a/sounds/pit.mp3 b/sounds/pit.mp3 new file mode 100644 index 0000000..72373e0 Binary files /dev/null and b/sounds/pit.mp3 differ -- cgit v1.2.3 From d9958bde9c3feddf15eced5c786c164db21b1efe Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Tue, 12 Mar 2013 17:57:07 -0700 Subject: hehe phpinfo ^^. --- images/marks/.htaccess | 1 + phpinfo.php | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 images/marks/.htaccess create mode 100644 phpinfo.php diff --git a/images/marks/.htaccess b/images/marks/.htaccess new file mode 100644 index 0000000..04bc913 --- /dev/null +++ b/images/marks/.htaccess @@ -0,0 +1 @@ +DirectoryIndex blank.png \ No newline at end of file diff --git a/phpinfo.php b/phpinfo.php new file mode 100644 index 0000000..d1df170 --- /dev/null +++ b/phpinfo.php @@ -0,0 +1,11 @@ +Really I do. +
I'd make a heart right now but it would mess up the HTML +
I think it's something like and lgt3... I forget. + Consider yourself hearted at though!"; + +?> \ No newline at end of file -- cgit v1.2.3