From 7d1ea2721d51aad05ffc1a01b510d86e9864f92a Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Thu, 7 Mar 2013 02:35:37 -0800 Subject: Click and drag for the mapeditor. --- pages/mapeditor.php | 42 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) (limited to 'pages') diff --git a/pages/mapeditor.php b/pages/mapeditor.php index 87fef32..0d6cf94 100644 --- a/pages/mapeditor.php +++ b/pages/mapeditor.php @@ -51,13 +51,28 @@ testMap.name = 'Testmap'; testMap.walls = 5; setTimeout("reloadMap();", 500); +setTimeout("start();", 500); function start() { - $('#testMapDisplay').html(mapAsHTML(testMap)); + //$('#testMapDisplay').html(mapAsHTML(testMap)); + + $(window).mousedown(function(){ + mouseIsDown = true; + + }); + + $(window).mouseup(function(){ + mouseIsDown = false; + }); + } +var mouseIsDown = false; -var grid_clickOverride = true; -function mapClick(obj) { +var mapHasChanged = false; +function mapEditOver(obj) { + if (mouseIsDown == true) mapEditClick(obj); +} +function mapEditClick(obj) { console.log("Map Click"); tmp = obj.id.split(','); @@ -69,9 +84,19 @@ function mapClick(obj) { testMap.tiles[y][x] = Array(palleteType, palleteValue); y++; $(obj).attr('class', 'mapcell '+palleteType+palleteValue); - loadPlayableMap(); + mapHasChanged = true; +} + +getMapTimer(); +function getMapTimer() { + setTimeout("getMapTimer()", 3000); + if (mapHasChanged) { + loadPlayableMap(); + mapHasChanged = false; + } } + var palleteType = 's'; var palleteValue = ''; function paletteSelect(type, value) { @@ -120,8 +145,12 @@ function reloadMap() { loadPlayableMap(); } +var isLoadingMap = false; function loadPlayableMap() { + if (isLoadingMap == true) return; + isLoadingMap = true; + var URLString = 'mapeditor?mapByMap='+JSON.stringify(testMap); $.ajax({ type: "GET", @@ -135,6 +164,7 @@ function loadPlayableMap() { playableMap.ID = -1; $('#playableMapDisplay').html(mapAsHTML(playableMap, 960)); $('#playableMapCodeDisplay').val(playableMap.code); + isLoadingMap = false; } }); } @@ -268,10 +298,10 @@ function constructTiles(width, height, baseMap) {
-
+
Playable Map
- + MapCode:
Returned map goes here. -- cgit v1.2.3 From 6074cb08fd7297c36302baa4bf55a286dc1f4824 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Thu, 7 Mar 2013 02:38:05 -0800 Subject: Chat mute icon and smileys --- images/Mute.png | Bin 0 -> 9317 bytes images/Sound.png | Bin 0 -> 11881 bytes images/smileys/Angel.png | Bin 0 -> 3467 bytes images/smileys/Angry.png | Bin 0 -> 3449 bytes images/smileys/Aww.png | Bin 0 -> 3352 bytes images/smileys/Aww_2.png | Bin 0 -> 3402 bytes images/smileys/Blushing.png | Bin 0 -> 3403 bytes images/smileys/Childish.png | Bin 0 -> 3411 bytes images/smileys/Confused.png | Bin 0 -> 3392 bytes images/smileys/Creepy.png | Bin 0 -> 3417 bytes images/smileys/Crying.png | Bin 0 -> 3434 bytes images/smileys/Cthulhu.png | Bin 0 -> 775 bytes images/smileys/Cute.png | Bin 0 -> 3369 bytes images/smileys/Cute_Winking.png | Bin 0 -> 3380 bytes images/smileys/Devil.png | Bin 0 -> 3478 bytes images/smileys/Gah.png | Bin 0 -> 3415 bytes images/smileys/Gah_2.png | Bin 0 -> 3401 bytes images/smileys/Gasping.png | Bin 0 -> 3384 bytes images/smileys/Greedy.png | Bin 0 -> 3456 bytes images/smileys/Grinning.png | Bin 0 -> 3381 bytes images/smileys/Grinning_Winking.png | Bin 0 -> 3394 bytes images/smileys/Happy.png | Bin 0 -> 3413 bytes images/smileys/Happy_2.png | Bin 0 -> 3433 bytes images/smileys/Happy_3.png | Bin 0 -> 3408 bytes images/smileys/Heart.png | Bin 0 -> 3209 bytes images/smileys/Huh.png | Bin 0 -> 3417 bytes images/smileys/Huh_2.png | Bin 0 -> 3429 bytes images/smileys/Laughing.png | Bin 0 -> 3450 bytes images/smileys/Lips_Sealed.png | Bin 0 -> 3368 bytes images/smileys/Madness.png | Bin 0 -> 3418 bytes images/smileys/Malicious.png | Bin 0 -> 751 bytes images/smileys/Sick.png | Bin 0 -> 3439 bytes images/smileys/Smiling.png | Bin 0 -> 3390 bytes images/smileys/Speechless.png | Bin 0 -> 3352 bytes images/smileys/Spiteful.png | Bin 0 -> 3417 bytes images/smileys/Stupid.png | Bin 0 -> 3422 bytes images/smileys/Sunglasses.png | Bin 0 -> 3433 bytes images/smileys/Terrified.png | Bin 0 -> 3382 bytes images/smileys/Thumb_Down.png | Bin 0 -> 572 bytes images/smileys/Thumb_Up.png | Bin 0 -> 530 bytes images/smileys/Tired.png | Bin 0 -> 3338 bytes images/smileys/Tongue_Out.png | Bin 0 -> 3403 bytes images/smileys/Tongue_Out_Laughing.png | Bin 0 -> 3468 bytes images/smileys/Tongue_Out_Left.png | Bin 0 -> 3387 bytes images/smileys/Tongue_Out_Up.png | Bin 0 -> 3362 bytes images/smileys/Tongue_Out_Up_Left.png | Bin 0 -> 704 bytes images/smileys/Tongue_Out_Winking.png | Bin 0 -> 3416 bytes images/smileys/Uncertain.png | Bin 0 -> 3390 bytes images/smileys/Uncertain_2.png | Bin 0 -> 3378 bytes images/smileys/Unhappy.png | Bin 0 -> 3408 bytes images/smileys/Winking.png | Bin 0 -> 3404 bytes pages/chat.php | 32 +++++++++++++++++++++++++++----- 52 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 images/Mute.png create mode 100644 images/Sound.png create mode 100644 images/smileys/Angel.png create mode 100644 images/smileys/Angry.png create mode 100644 images/smileys/Aww.png create mode 100644 images/smileys/Aww_2.png create mode 100644 images/smileys/Blushing.png create mode 100644 images/smileys/Childish.png create mode 100644 images/smileys/Confused.png create mode 100644 images/smileys/Creepy.png create mode 100644 images/smileys/Crying.png create mode 100644 images/smileys/Cthulhu.png create mode 100644 images/smileys/Cute.png create mode 100644 images/smileys/Cute_Winking.png create mode 100644 images/smileys/Devil.png create mode 100644 images/smileys/Gah.png create mode 100644 images/smileys/Gah_2.png create mode 100644 images/smileys/Gasping.png create mode 100644 images/smileys/Greedy.png create mode 100644 images/smileys/Grinning.png create mode 100644 images/smileys/Grinning_Winking.png create mode 100644 images/smileys/Happy.png create mode 100644 images/smileys/Happy_2.png create mode 100644 images/smileys/Happy_3.png create mode 100644 images/smileys/Heart.png create mode 100644 images/smileys/Huh.png create mode 100644 images/smileys/Huh_2.png create mode 100644 images/smileys/Laughing.png create mode 100644 images/smileys/Lips_Sealed.png create mode 100644 images/smileys/Madness.png create mode 100644 images/smileys/Malicious.png create mode 100644 images/smileys/Sick.png create mode 100644 images/smileys/Smiling.png create mode 100644 images/smileys/Speechless.png create mode 100644 images/smileys/Spiteful.png create mode 100644 images/smileys/Stupid.png create mode 100644 images/smileys/Sunglasses.png create mode 100644 images/smileys/Terrified.png create mode 100644 images/smileys/Thumb_Down.png create mode 100644 images/smileys/Thumb_Up.png create mode 100644 images/smileys/Tired.png create mode 100644 images/smileys/Tongue_Out.png create mode 100644 images/smileys/Tongue_Out_Laughing.png create mode 100644 images/smileys/Tongue_Out_Left.png create mode 100644 images/smileys/Tongue_Out_Up.png create mode 100644 images/smileys/Tongue_Out_Up_Left.png create mode 100644 images/smileys/Tongue_Out_Winking.png create mode 100644 images/smileys/Uncertain.png create mode 100644 images/smileys/Uncertain_2.png create mode 100644 images/smileys/Unhappy.png create mode 100644 images/smileys/Winking.png (limited to 'pages') diff --git a/images/Mute.png b/images/Mute.png new file mode 100644 index 0000000..8210033 Binary files /dev/null and b/images/Mute.png differ diff --git a/images/Sound.png b/images/Sound.png new file mode 100644 index 0000000..992d944 Binary files /dev/null and b/images/Sound.png differ diff --git a/images/smileys/Angel.png b/images/smileys/Angel.png new file mode 100644 index 0000000..0cf707b Binary files /dev/null and b/images/smileys/Angel.png differ diff --git a/images/smileys/Angry.png b/images/smileys/Angry.png new file mode 100644 index 0000000..9ae5d18 Binary files /dev/null and b/images/smileys/Angry.png differ diff --git a/images/smileys/Aww.png b/images/smileys/Aww.png new file mode 100644 index 0000000..3512863 Binary files /dev/null and b/images/smileys/Aww.png differ diff --git a/images/smileys/Aww_2.png b/images/smileys/Aww_2.png new file mode 100644 index 0000000..60510bb Binary files /dev/null and b/images/smileys/Aww_2.png differ diff --git a/images/smileys/Blushing.png b/images/smileys/Blushing.png new file mode 100644 index 0000000..ab03ee8 Binary files /dev/null and b/images/smileys/Blushing.png differ diff --git a/images/smileys/Childish.png b/images/smileys/Childish.png new file mode 100644 index 0000000..1a31c50 Binary files /dev/null and b/images/smileys/Childish.png differ diff --git a/images/smileys/Confused.png b/images/smileys/Confused.png new file mode 100644 index 0000000..08ba7d3 Binary files /dev/null and b/images/smileys/Confused.png differ diff --git a/images/smileys/Creepy.png b/images/smileys/Creepy.png new file mode 100644 index 0000000..5615058 Binary files /dev/null and b/images/smileys/Creepy.png differ diff --git a/images/smileys/Crying.png b/images/smileys/Crying.png new file mode 100644 index 0000000..2532976 Binary files /dev/null and b/images/smileys/Crying.png differ diff --git a/images/smileys/Cthulhu.png b/images/smileys/Cthulhu.png new file mode 100644 index 0000000..fafc4b3 Binary files /dev/null and b/images/smileys/Cthulhu.png differ diff --git a/images/smileys/Cute.png b/images/smileys/Cute.png new file mode 100644 index 0000000..a883ac3 Binary files /dev/null and b/images/smileys/Cute.png differ diff --git a/images/smileys/Cute_Winking.png b/images/smileys/Cute_Winking.png new file mode 100644 index 0000000..ad3383d Binary files /dev/null and b/images/smileys/Cute_Winking.png differ diff --git a/images/smileys/Devil.png b/images/smileys/Devil.png new file mode 100644 index 0000000..afc5c2c Binary files /dev/null and b/images/smileys/Devil.png differ diff --git a/images/smileys/Gah.png b/images/smileys/Gah.png new file mode 100644 index 0000000..b03ee1b Binary files /dev/null and b/images/smileys/Gah.png differ diff --git a/images/smileys/Gah_2.png b/images/smileys/Gah_2.png new file mode 100644 index 0000000..b682458 Binary files /dev/null and b/images/smileys/Gah_2.png differ diff --git a/images/smileys/Gasping.png b/images/smileys/Gasping.png new file mode 100644 index 0000000..b6655ce Binary files /dev/null and b/images/smileys/Gasping.png differ diff --git a/images/smileys/Greedy.png b/images/smileys/Greedy.png new file mode 100644 index 0000000..a179638 Binary files /dev/null and b/images/smileys/Greedy.png differ diff --git a/images/smileys/Grinning.png b/images/smileys/Grinning.png new file mode 100644 index 0000000..85ff915 Binary files /dev/null and b/images/smileys/Grinning.png differ diff --git a/images/smileys/Grinning_Winking.png b/images/smileys/Grinning_Winking.png new file mode 100644 index 0000000..5b1d5b7 Binary files /dev/null and b/images/smileys/Grinning_Winking.png differ diff --git a/images/smileys/Happy.png b/images/smileys/Happy.png new file mode 100644 index 0000000..51cf1a2 Binary files /dev/null and b/images/smileys/Happy.png differ diff --git a/images/smileys/Happy_2.png b/images/smileys/Happy_2.png new file mode 100644 index 0000000..1332686 Binary files /dev/null and b/images/smileys/Happy_2.png differ diff --git a/images/smileys/Happy_3.png b/images/smileys/Happy_3.png new file mode 100644 index 0000000..be79df0 Binary files /dev/null and b/images/smileys/Happy_3.png differ diff --git a/images/smileys/Heart.png b/images/smileys/Heart.png new file mode 100644 index 0000000..dcd28b9 Binary files /dev/null and b/images/smileys/Heart.png differ diff --git a/images/smileys/Huh.png b/images/smileys/Huh.png new file mode 100644 index 0000000..241f50f Binary files /dev/null and b/images/smileys/Huh.png differ diff --git a/images/smileys/Huh_2.png b/images/smileys/Huh_2.png new file mode 100644 index 0000000..a1a54e4 Binary files /dev/null and b/images/smileys/Huh_2.png differ diff --git a/images/smileys/Laughing.png b/images/smileys/Laughing.png new file mode 100644 index 0000000..edefc95 Binary files /dev/null and b/images/smileys/Laughing.png differ diff --git a/images/smileys/Lips_Sealed.png b/images/smileys/Lips_Sealed.png new file mode 100644 index 0000000..46e4701 Binary files /dev/null and b/images/smileys/Lips_Sealed.png differ diff --git a/images/smileys/Madness.png b/images/smileys/Madness.png new file mode 100644 index 0000000..1c0946c Binary files /dev/null and b/images/smileys/Madness.png differ diff --git a/images/smileys/Malicious.png b/images/smileys/Malicious.png new file mode 100644 index 0000000..23f2579 Binary files /dev/null and b/images/smileys/Malicious.png differ diff --git a/images/smileys/Sick.png b/images/smileys/Sick.png new file mode 100644 index 0000000..6f73e2f Binary files /dev/null and b/images/smileys/Sick.png differ diff --git a/images/smileys/Smiling.png b/images/smileys/Smiling.png new file mode 100644 index 0000000..725eef5 Binary files /dev/null and b/images/smileys/Smiling.png differ diff --git a/images/smileys/Speechless.png b/images/smileys/Speechless.png new file mode 100644 index 0000000..4fc4246 Binary files /dev/null and b/images/smileys/Speechless.png differ diff --git a/images/smileys/Spiteful.png b/images/smileys/Spiteful.png new file mode 100644 index 0000000..195ced8 Binary files /dev/null and b/images/smileys/Spiteful.png differ diff --git a/images/smileys/Stupid.png b/images/smileys/Stupid.png new file mode 100644 index 0000000..3fcea49 Binary files /dev/null and b/images/smileys/Stupid.png differ diff --git a/images/smileys/Sunglasses.png b/images/smileys/Sunglasses.png new file mode 100644 index 0000000..cad8379 Binary files /dev/null and b/images/smileys/Sunglasses.png differ diff --git a/images/smileys/Terrified.png b/images/smileys/Terrified.png new file mode 100644 index 0000000..fad2e06 Binary files /dev/null and b/images/smileys/Terrified.png differ diff --git a/images/smileys/Thumb_Down.png b/images/smileys/Thumb_Down.png new file mode 100644 index 0000000..4f70696 Binary files /dev/null and b/images/smileys/Thumb_Down.png differ diff --git a/images/smileys/Thumb_Up.png b/images/smileys/Thumb_Up.png new file mode 100644 index 0000000..2ca0e0d Binary files /dev/null and b/images/smileys/Thumb_Up.png differ diff --git a/images/smileys/Tired.png b/images/smileys/Tired.png new file mode 100644 index 0000000..13f7d12 Binary files /dev/null and b/images/smileys/Tired.png differ diff --git a/images/smileys/Tongue_Out.png b/images/smileys/Tongue_Out.png new file mode 100644 index 0000000..3d154f9 Binary files /dev/null and b/images/smileys/Tongue_Out.png differ diff --git a/images/smileys/Tongue_Out_Laughing.png b/images/smileys/Tongue_Out_Laughing.png new file mode 100644 index 0000000..fba5d75 Binary files /dev/null and b/images/smileys/Tongue_Out_Laughing.png differ diff --git a/images/smileys/Tongue_Out_Left.png b/images/smileys/Tongue_Out_Left.png new file mode 100644 index 0000000..8015de7 Binary files /dev/null and b/images/smileys/Tongue_Out_Left.png differ diff --git a/images/smileys/Tongue_Out_Up.png b/images/smileys/Tongue_Out_Up.png new file mode 100644 index 0000000..46328fb Binary files /dev/null and b/images/smileys/Tongue_Out_Up.png differ diff --git a/images/smileys/Tongue_Out_Up_Left.png b/images/smileys/Tongue_Out_Up_Left.png new file mode 100644 index 0000000..b67b69f Binary files /dev/null and b/images/smileys/Tongue_Out_Up_Left.png differ diff --git a/images/smileys/Tongue_Out_Winking.png b/images/smileys/Tongue_Out_Winking.png new file mode 100644 index 0000000..2a22cf6 Binary files /dev/null and b/images/smileys/Tongue_Out_Winking.png differ diff --git a/images/smileys/Uncertain.png b/images/smileys/Uncertain.png new file mode 100644 index 0000000..7176856 Binary files /dev/null and b/images/smileys/Uncertain.png differ diff --git a/images/smileys/Uncertain_2.png b/images/smileys/Uncertain_2.png new file mode 100644 index 0000000..a7f5370 Binary files /dev/null and b/images/smileys/Uncertain_2.png differ diff --git a/images/smileys/Unhappy.png b/images/smileys/Unhappy.png new file mode 100644 index 0000000..79fc0c0 Binary files /dev/null and b/images/smileys/Unhappy.png differ diff --git a/images/smileys/Winking.png b/images/smileys/Winking.png new file mode 100644 index 0000000..1e01f94 Binary files /dev/null and b/images/smileys/Winking.png differ diff --git a/pages/chat.php b/pages/chat.php index d2198c7..ee36262 100644 --- a/pages/chat.php +++ b/pages/chat.php @@ -141,7 +141,7 @@ function getChatDone(data) { firstGetChat = false; } document.title = lastDisplay+': '+lastMessage.substring(0, 10)+'... Pathery Chat'; - if (!document.getElementById('chatMute').checked) { + if (chatIsMuted == 'true') { soundManager.setVolume('charm', 20); soundManager.setPan('charm', -60) soundManager.setPosition('charm',150); @@ -156,6 +156,8 @@ function chatReplaceAndEncode(chat) { chat = chat.replace(/\~\~(\S(.*?\S)?)\~\~/gm, "$1"); chat = chat.replace(/\*(\S(.*?\S)?)\*/gm, "$1"); + chat = replaceSmileys(chat); + //Surround all URLs with a link var URLexp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig; chat = chat.replace(URLexp, "$1"); @@ -169,6 +171,15 @@ function chatReplaceAndEncode(chat) { return chat; } +function replaceSmileys(chat) { + chat = chat.replace(/:\)/g, ''); + chat = chat.replace(/\(:/g, ''); + //chat = chat.replace(/:\//g, ''); + chat = chat.replace(/:\(/g, ''); + chat = chat.replace(/\<3/g, ''); + return chat; +} + function prepChat(chat) { chat = chat.join('|:|'); chat = chat.replace(/\&/g,'%26') @@ -223,7 +234,20 @@ function htmlEncode(value){ } } -function setChatMute(value) { + + +var chatIsMuted = ''; +function setChatMute() { + var value = chatIsMuted; + + $('#chatMute').removeClass("chatMute_"+value); + if (value == 'true') value = 'false'; + else value = 'true'; + chatIsMuted = value; + $('#chatMute').addClass("chatMute_"+value); savePref('chatMute', value); } @@ -240,10 +264,8 @@ function setChatMute(value) { "; + "; ?> -- cgit v1.2.3