Merge branch 'development' into MUSHclient

MUSHclient/lua/aard_requirements.lua

@@ -3,13 +3,22 @@ require "checkplugin"
 
 -- Guarantee various useful world file settings
 SetOption("omit_date_from_save_files", 1)  -- slightly less clutter in settings files
-SetOption("utf_8", 1)  -- needed for alternate maptypes in main output
 SetAlphaOption("terminal_identification", "MUSHclient-Aard") -- helps Lasher count for the 'clients' in-game command
 
-local aard_req_prefs_db = sqlite3.open(GetInfo(82))  -- open preferences
-aard_req_prefs_db:exec 'UPDATE prefs SET value = 0 WHERE name = "OpenActivityWindow"' -- stop opening the activity window
-aard_req_prefs_db:close()  -- close
-utils.reload_global_prefs()
+ -- Edit the preferences db to stop opening the activity window at startup
+local aard_req_prefs_db = sqlite3.open(GetInfo(82))
+local aard_req_pref_activity_window = 1
+for a in aard_req_prefs_db:nrows('SELECT value FROM prefs WHERE name = "OpenActivityWindow"') do
+   aard_req_pref_activity_window = a['value']
+end
+if tonumber(aard_req_pref_activity_window) ~= 0 then
+   aard_req_prefs_db:exec 'UPDATE prefs SET value = 0 WHERE name = "OpenActivityWindow"'
+   aard_req_prefs_db:close()
+   utils.reload_global_prefs()
+end
+if aard_req_prefs_db:isopen() then
+   aard_req_prefs_db:close()
+end
 
 -- Load plugins which are either necessary for the package to function or unobjectionably utile.
 do_plugin_check_now("162bba4a5ecef2bb32b5652f", "aard_package_update_checker") -- package update checker
@@ -18,5 +27,5 @@ do_plugin_check_now("3e7dedbe37e44942dd46d264", "aard_GMCP_handler")    -- GMCP
 do_plugin_check_now("462b665ecb569efbf261422f", "aard_miniwindow_z_order_monitor") -- z order manager
 do_plugin_check_now("55616ea13339bc68e963e1f8", "aard_chat_echo") -- gmcp channels in main display
 do_plugin_check_now("520bc4f29806f7af0017985f", "Hyperlink_URL2") -- make hyperlinks from urls
-
+do_plugin_check_now("04d9e64f835452b045b427a7", "aard_Copy_Colour_Codes") -- Ctrl+D to copy selected text with color codes
 

MUSHclient/worlds/plugins/aard_GMCP_handler.xml

@@ -217,7 +217,10 @@ function OnPluginTelnetRequest (msg_type, data)
    if msg_type == GMCP and data == "SENT_DO" then
       Note ("Enabling GMCP.")
       -- This hard-coded block may need to be made into a config table as we add more message types.
-      GMCP_send (string.format ('Core.Hello { "client": "MUSHclient", "version": "%s" }', Version().." r"..aard_extras.PackageVersion()))
+      GMCP_send (
+         string.format ('Core.Hello { "client": "MUSHclient", "version": "%s" }',
+                        Version().." r"..aard_extras.PackageVersion()..(aard_req_novisuals_mode and " VI" or ""))
+      )
       GMCP_send ('Core.Supports.Set [ "Char 1", "Comm 1", "Room 1" ]')
       return true
    end -- if GMCP login needed (just sent DO)

MUSHclient/worlds/plugins/aard_GMCP_mapper.xml

@@ -4631,6 +4631,9 @@ end
 
 function OnPluginListChanged ()
    dofile "lua/aard_requirements.lua"
+   if aard_req_novisuals_mode then
+      Execute("mapper hide")
+   end
 end
 
 function nilToStr(n)

appveyor.yml

@@ -0,0 +1,69 @@
+version: 1.0.{build}
+branches:
+  only:
+  - MUSHclient
+skip_tags: true
+skip_branch_with_pr: true
+image: Visual Studio 2015
+clone_depth: 1
+environment:
+  auth_token:
+    secure: /WceWguzAExHlMwJIOMl2MxPw+QmMne5MGQItu45rQ66xLoKLYGVQ8taqaLkrMYD
+install:
+- ps: >-
+    Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/aardmush_installer.nsi'
+
+    Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/get_version.nsi'
+
+    Start-FileDownload 'https://raw.githubusercontent.com/fiendish/aardwolfclientpackage-installer/master/hello.rtf'
+
+    & "C:\Program Files (x86)\NSIS\makensis.exe" aardmush_installer.nsi
+
+    Move-Item .\MUSHclient\worlds\Aardwolf_no_visuals.mcl .\MUSHclient\worlds\Aardwolf.mcl -force
+
+    $VIAPPOUT = 'OutFile "Aardwolf_MUSHclient_${PackageVersion}_VI.exe"'
+
+    (Get-Content aardmush_installer.nsi) | ForEach-Object { $_ -replace "OutFile.+" , "$VIAPPOUT" } | Set-Content aardmush_installer.nsi
+
+    & "C:\Program Files (x86)\NSIS\makensis.exe" aardmush_installer.nsi
+
+    Get-ChildItem .\Aardwolf_MUSHclient_r*.exe -Recurse | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
+build: off
+before_deploy:
+- ps: >-
+    $env:PACKAGE_VERSION=(Get-Content MUSHclient\AardwolfPackageChanges.txt)[2].split()[0]
+
+
+    git config --global credential.helper store
+
+    Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:auth_token):x-oauth-basic@github.com`n"
+
+    git config --global user.name "fiendish"
+
+    git config --global user.email "patcherton.fixesthings@gmail.com"
+
+
+    git remote set-branches --add origin 'gh-pages' 2>&1 | write-host
+
+    git fetch --depth 1 origin gh-pages 2>&1 | write-host
+
+    git checkout gh-pages 2>&1 | write-host
+
+    (Get-Content index.template).replace("%%REV%%", "$env:PACKAGE_VERSION") | Set-Content index.html
+
+    git add index.html 2>&1 | write-host
+
+    git commit -q -m "automatic rev update $env:PACKAGE_VERSION"
+
+    git push -q origin gh-pages
+deploy:
+- provider: GitHub
+  tag: $(PACKAGE_VERSION)
+  auth_token:
+    secure: /WceWguzAExHlMwJIOMl2MxPw+QmMne5MGQItu45rQ66xLoKLYGVQ8taqaLkrMYD
+  artifact: /Aardwolf_MUSHclient_r.*\.exe/
+  force_update: true
+  on:
+    branch: MUSHclient
+after_deploy:
+- cmd: