From d319173110c18ec9c541bac57d030de03a031770 Mon Sep 17 00:00:00 2001
From: Zeno Rogue <zeno@attnam.com>
Date: Sun, 27 Mar 2022 22:42:56 +0200
Subject: [PATCH] 12.0m

---
 changelog.txt | 28 ++++++++++++++++++++++++++++
 hyper.h       |  4 ++--
 mapeditor.cpp |  2 +-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index d3a9fb76..e6474ce7 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -4593,3 +4593,31 @@ Geometry:
 Other:
 - fixed Crossroads wiki links
 - fixed some settings incorrectly showing a warning on editing (this also brings back the 'play music when out of focus' option)
+
+2022-03-27 20:51 Update 12.0m:
+
+Improvements to multiplayer:
+- "split screen mode" can now be set explicitly (don't lose the other player, and don't tell the other player to go right, holonomy matters ;)
+- an option to automatically adjust dual-focus projections to focus on both players (try it with inverted Joukowsky, two-point equidistant/azimuthal and band projections)
+- an option to toggle friendly fire and self-hits in wrapped spaces
+- an option to toggle player-vs-player (this disables limited lives)
+- fixed the radar and cool fog in splitscreen
+
+New options thanks to lottieratworld:
+- idle animation option
+- extra canvas-specific options (map editor->settings)
+
+Other new features:
+- mouse snapping feature in shape editor -- can be used to precisely measure distances and angles (press 'o' to select the point to measure from)
+- when the player is hidden (e.g. in RogueViz visualizations) and the user tries to use WASD, display a hint that they should be using arrow keys instead
+- prevent a crash when entering '(0,0)' in Archimedean
+
+Rendering fixes:
+- fixed levellines in hyperbolic
+- in non-fake 2.5D the raycaster is now disabled by default
+- fixed scale_at for cylindrical projections
+- fixed the orientation of two-point azimuthal and two-point hybrid
+
+Gameplay fixes:
+- fixed the Orb of Safety not disappearing upon use in shmup+OSM
+- fixed the displayed unlock rule for Crossroads III in Casual
diff --git a/hyper.h b/hyper.h
index f0902e50..dfd8baeb 100644
--- a/hyper.h
+++ b/hyper.h
@@ -13,8 +13,8 @@
 #define _HYPER_H_
 
 // version numbers
-#define VER "12.0l"
-#define VERNUM_HEX 0xA90C
+#define VER "12.0m"
+#define VERNUM_HEX 0xA90D
 
 #include "sysconfig.h"
 
diff --git a/mapeditor.cpp b/mapeditor.cpp
index a1217232..8363a499 100644
--- a/mapeditor.cpp
+++ b/mapeditor.cpp
@@ -889,7 +889,7 @@ EX namespace mapstream {
         f.read(canvas_default_wall);
       f.read(mapeditor::drawplayer);
       if(patterns::whichCanvas == 'f') f.read(patterns::color_formula);
-      if(f.vernum >= 0xA90C) { // TODO Please replace this with the next version this pull request is included in
+      if(f.vernum >= 0xA90D) {
         f.read(canvasfloor);
         f.read(canvasdark);
         }