Lexxie9952 · kommado · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022
diff --git a/.gitignore b/.gitignore
@@ -388,3 +388,4 @@ freeciv-web/valhallabuild.sh
 freeciv-web/vdebug-remake.sh
 publite2/supercows.txt
 publite2/supercows.txt
+publite2/init-freeciv-web.sh
diff --git a/README.md b/README.md
@@ -12,6 +12,7 @@ under the GNU Affero General Public License. See [License](LICENSE.txt) for the
 
 Currently known servers based on Freeciv-web:
 - [Freecivweb.org](https://www.freecivweb.org) - Full Freeciv-web
+- [Freeciv TnT](https://www.tacticsandtriumph.com) - Freeciv-web Games & Mods (no PBEM)
 - [moving borders](https://fcw.movingborders.es) (Everything except longturn and real-Earth)
 
 ![Freeciv-web](https://raw.githubusercontent.com/Lexxie9952/fcw.org-server/master/fcw-2021.png "Freeciv-web screenshot")
@@ -193,20 +194,19 @@ Developers interested in Freeciv-web
 
 If you want to contibute to Freeciv-web, see the [issues](https://github.com/freeciv/freeciv-web/issues) on GibHub and the [TODO file](TODO.md) for 
 some tasks you can work on. Pull requests on Github is welcome! 
+
+Freeciv WebGL
+-------------
+Freeciv WebGL is the 3D version, which uses the Three.js 3D engine. More info about the WebGL 3D version can be found for [developers](https://github.com/freeciv/freeciv-web/tree/develop/freeciv-web/src/main/webapp/javascript/webgl) and [3D artists](https://github.com/freeciv/freeciv-web/wiki/Contributing-Blender-models-for-Freeciv-WebGL).
 
 
 Contributors to Freeciv-web
 ---------------------------
-Lexxie9952 [@lexxie9952](https://discordapp.com/users/Lexxie9952)
+Lexxie9952 [@lexxie9952](https://discordapp.com/users/Lexxie9952)  
 Andreas Røsdal  [@andreasrosdal](https://github.com/andreasrosdal)  
 Marko Lindqvist [@cazfi](https://github.com/cazfi)  
 Sveinung Kvilhaugsvik [@kvilhaugsvik](https://github.com/kvilhaugsvik) 
 Máximo Castañeda [@lonemadmax](https://github.com/lonemadmax)  
 Gerik Bonaert [@adaxi](https://github.com/adaxi)  
 and the [Freeciv.org project](http://freeciv.wikia.com/wiki/People)!
 
-About FCW and this repository
------------------------------
-HELP! We have a dispute against this repository!
-Licensing restrictions not contained in the (A)GPL have been legally threatened against this repository. They seek to restrict our repository- and user- policies from having content allowed by our licenses. Claiming additional restrictions not contained within a license, misrepresenting them as being within that license, and threatening legal enforcement of said restrictions, legally qualifies as a breach of the license by the parties making the claim. Please be patient. FCW has suspended its Repository Policy pending resolution of the licensing infractions against us.
-
diff --git a/blender/CREDITS b/blender/CREDITS
@@ -0,0 +1,8 @@
+Some of the models were borrowed from www.blendswap.com and then modified. Original model were in public domain.
+I want to thank the following people who made their work available under Public Domain licence:
+
+1. Joni Vvaris for low poly ak-47
+2. Edimar Dos Reis Silva aka Mutte for his Lot Angel rigged character -- huge help.
+3. Anonymous for hs Black Hawk helicopter model
+4. Praydude for C-5B airplane model
+5. Jeff2207 for a nice model of an elephant.
diff --git a/blender/README.md b/blender/README.md
@@ -0,0 +1,39 @@
+Blender 3d models created for Freeciv-web.
+==========================================
+
+![Freeciv-web](https://raw.githubusercontent.com/freeciv/freeciv-web/develop/freeciv-web/src/main/webapp/javascript/webgl/freeciv-webgl.png "Freeciv-web WebGL screenshot")
+
+These are the original Blender files for all 3D models in the WebGL version. 
+
+3D artists are welcome to improve these models!
+
+Export from Blender to glTF 2.0 .glb binary format
+============================================================
+
+Follow these steps to prepare the 3D models for usage in Freeciv-web:
+
+1. Install and activate the Blender glTF 2.0 exporter 
+https://github.com/KhronosGroup/glTF-Blender-Exporter
+
+2. Export the blender file from Blender: File -> Export -> glTF 2.0 (.glb)
+  - Don't export normals.
+  - Export to the .glb file to freeciv-web/src/main/webapp/gltf/
+  - Filename must match unit name from Freeciv ruleset.
+
+3. Rebuild Freeciv-web using freeciv-web/build.sh script.
+
+When creating new additional 3D-models they must also be added to preload.js in Freeciv-web so that they are preloaded correctly.
+
+Be sure to limit the file size and number of verticies, since the result
+will be rendered in a web browser. Check the file size of the generated .glb file! 
+
+Don't export any lights or cameras.
+
+3D Models with textures
+=======================
+
+See the citywalls.blend for an example of a 3D model with textures which works in Freeciv-web 3D. 
+
+
+The unit models come from here: http://opengameart.org/content/blender-models-for-freeciv-units
+
diff --git a/blender/blender_models_version_1/AEGIS Cruiser.blend b/blender/blender_models_version_1/AEGIS Cruiser.blend
diff --git a/blender/blender_models_version_1/AWACS.blend b/blender/blender_models_version_1/AWACS.blend
diff --git a/blender/blender_models_version_1/Airbase.blend b/blender/blender_models_version_1/Airbase.blend
diff --git a/blender/blender_models_version_1/Alpine Troops.blend b/blender/blender_models_version_1/Alpine Troops.blend
diff --git a/blender/blender_models_version_1/Archers.blend b/blender/blender_models_version_1/Archers.blend
diff --git a/blender/blender_models_version_1/Armor.blend b/blender/blender_models_version_1/Armor.blend
diff --git a/blender/blender_models_version_1/Artillery.blend b/blender/blender_models_version_1/Artillery.blend
diff --git a/blender/blender_models_version_1/Barbarian Leader.blend b/blender/blender_models_version_1/Barbarian Leader.blend
diff --git a/blender/blender_models_version_1/Battleship.blend b/blender/blender_models_version_1/Battleship.blend
diff --git a/blender/blender_models_version_1/Bomber.blend b/blender/blender_models_version_1/Bomber.blend
diff --git a/blender/blender_models_version_1/Cannon.blend b/blender/blender_models_version_1/Cannon.blend
diff --git a/blender/blender_models_version_1/Caravan.blend b/blender/blender_models_version_1/Caravan.blend
diff --git a/blender/blender_models_version_1/Caravel.blend b/blender/blender_models_version_1/Caravel.blend
diff --git a/blender/blender_models_version_1/Carrier.blend b/blender/blender_models_version_1/Carrier.blend
diff --git a/blender/blender_models_version_1/Catapult.blend b/blender/blender_models_version_1/Catapult.blend
diff --git a/blender/blender_models_version_1/Cavalry.blend b/blender/blender_models_version_1/Cavalry.blend
diff --git a/blender/blender_models_version_1/Chariot.blend b/blender/blender_models_version_1/Chariot.blend
diff --git a/blender/blender_models_version_1/Cruise Missile.blend b/blender/blender_models_version_1/Cruise Missile.blend
diff --git a/blender/blender_models_version_1/Cruiser.blend b/blender/blender_models_version_1/Cruiser.blend
diff --git a/blender/blender_models_version_1/Destroyer.blend b/blender/blender_models_version_1/Destroyer.blend
diff --git a/blender/blender_models_version_1/Diplomat.blend b/blender/blender_models_version_1/Diplomat.blend
diff --git a/blender/blender_models_version_1/Dragoons.blend b/blender/blender_models_version_1/Dragoons.blend
diff --git a/blender/blender_models_version_1/Engineers.blend b/blender/blender_models_version_1/Engineers.blend
diff --git a/blender/blender_models_version_1/Explorer.blend b/blender/blender_models_version_1/Explorer.blend
diff --git a/blender/blender_models_version_1/Fighter.blend b/blender/blender_models_version_1/Fighter.blend
diff --git a/blender/blender_models_version_1/Fish.blend b/blender/blender_models_version_1/Fish.blend
diff --git a/blender/blender_models_version_1/Fortress.blend b/blender/blender_models_version_1/Fortress.blend
diff --git a/blender/blender_models_version_1/Freight.blend b/blender/blender_models_version_1/Freight.blend
diff --git a/blender/blender_models_version_1/Frigate.blend b/blender/blender_models_version_1/Frigate.blend
diff --git a/blender/blender_models_version_1/Galleon.blend b/blender/blender_models_version_1/Galleon.blend
diff --git a/blender/blender_models_version_1/Helicopter.blend b/blender/blender_models_version_1/Helicopter.blend
diff --git a/blender/blender_models_version_1/Horsemen.blend b/blender/blender_models_version_1/Horsemen.blend
diff --git a/blender/blender_models_version_1/Howitzer.blend b/blender/blender_models_version_1/Howitzer.blend
diff --git a/blender/blender_models_version_1/Hut.blend b/blender/blender_models_version_1/Hut.blend
diff --git a/blender/blender_models_version_1/Ironclad.blend b/blender/blender_models_version_1/Ironclad.blend
diff --git a/blender/blender_models_version_1/Knights.blend b/blender/blender_models_version_1/Knights.blend
diff --git a/blender/blender_models_version_1/Legion.blend b/blender/blender_models_version_1/Legion.blend
diff --git a/blender/blender_models_version_1/Marines.blend b/blender/blender_models_version_1/Marines.blend
diff --git a/blender/blender_models_version_1/Mech. Inf..blend b/blender/blender_models_version_1/Mech. Inf..blend
diff --git a/blender/blender_models_version_1/Migrants.blend b/blender/blender_models_version_1/Migrants.blend
diff --git a/blender/blender_models_version_1/Mine.blend b/blender/blender_models_version_1/Mine.blend
diff --git a/blender/blender_models_version_1/Musketeers.blend b/blender/blender_models_version_1/Musketeers.blend
diff --git a/blender/blender_models_version_1/Nuclear.blend b/blender/blender_models_version_1/Nuclear.blend
diff --git a/blender/blender_models_version_1/Paratroopers.blend b/blender/blender_models_version_1/Paratroopers.blend
diff --git a/blender/blender_models_version_1/Partisan.blend b/blender/blender_models_version_1/Partisan.blend
diff --git a/blender/blender_models_version_1/Phalanx.blend b/blender/blender_models_version_1/Phalanx.blend
diff --git a/blender/blender_models_version_1/Pikemen.blend b/blender/blender_models_version_1/Pikemen.blend
diff --git a/blender/blender_models_version_1/Riflemen.blend b/blender/blender_models_version_1/Riflemen.blend
diff --git a/blender/blender_models_version_1/Ruins.blend b/blender/blender_models_version_1/Ruins.blend
diff --git a/blender/blender_models_version_1/Settlers.blend b/blender/blender_models_version_1/Settlers.blend
diff --git a/blender/blender_models_version_1/Spy.blend b/blender/blender_models_version_1/Spy.blend
diff --git a/blender/blender_models_version_1/Stealth Bomber.blend b/blender/blender_models_version_1/Stealth Bomber.blend
diff --git a/blender/blender_models_version_1/Stealth Fighter.blend b/blender/blender_models_version_1/Stealth Fighter.blend
diff --git a/blender/blender_models_version_1/Submarine.blend b/blender/blender_models_version_1/Submarine.blend
diff --git a/blender/blender_models_version_1/Transport.blend b/blender/blender_models_version_1/Transport.blend
diff --git a/blender/blender_models_version_1/Trireme.blend b/blender/blender_models_version_1/Trireme.blend
diff --git a/blender/blender_models_version_1/Warriors.blend b/blender/blender_models_version_1/Warriors.blend
diff --git a/blender/blender_models_version_1/Whales.blend b/blender/blender_models_version_1/Whales.blend
diff --git a/blender/blender_models_version_1/Workers.blend b/blender/blender_models_version_1/Workers.blend
diff --git a/blender/blender_models_version_1/blender-settlers-example.png b/blender/blender_models_version_1/blender-settlers-example.png
diff --git a/blender/blender_models_version_1/brick1.png b/blender/blender_models_version_1/brick1.png
diff --git a/blender/blender_models_version_1/city_classical_0.blend b/blender/blender_models_version_1/city_classical_0.blend
diff --git a/blender/blender_models_version_1/city_classical_1.blend b/blender/blender_models_version_1/city_classical_1.blend
diff --git a/blender/blender_models_version_1/city_classical_2.blend b/blender/blender_models_version_1/city_classical_2.blend
diff --git a/blender/blender_models_version_1/city_european_0.blend b/blender/blender_models_version_1/city_european_0.blend
diff --git a/blender/blender_models_version_1/city_european_1.blend b/blender/blender_models_version_1/city_european_1.blend
diff --git a/blender/blender_models_version_1/city_european_2.blend b/blender/blender_models_version_1/city_european_2.blend
diff --git a/blender/blender_models_version_1/citywalls.blend b/blender/blender_models_version_1/citywalls.blend
diff --git a/blender/blender_models_version_1/farmland.png b/blender/blender_models_version_1/farmland.png
diff --git a/blender/blender_models_version_2/BaseModel.blend b/blender/blender_models_version_2/BaseModel.blend
diff --git a/blender/blender_models_version_2/Buildings/EuropeanCity.blend b/blender/blender_models_version_2/Buildings/EuropeanCity.blend
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier1.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier1.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier2.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier2.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier3.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier3.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier4.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier4.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier5.glb b/blender/blender_models_version_2/Buildings/Export/EuropeanCity_Tier5.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier1.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier1.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier2.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier2.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier3.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier3.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier4.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier4.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5.glb
diff --git a/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5_pbr.glb b/blender/blender_models_version_2/Buildings/Export/ModernCity_Tier5_pbr.glb
diff --git a/blender/blender_models_version_2/Buildings/ModernCity.blend b/blender/blender_models_version_2/Buildings/ModernCity.blend
diff --git a/blender/blender_models_version_2/Buildings/Renders/CityPlates.psd b/blender/blender_models_version_2/Buildings/Renders/CityPlates.psd
diff --git a/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.jpg b/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.jpg
diff --git a/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.png b/blender/blender_models_version_2/Buildings/Renders/EuropeanCity.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/EuropeanCity1.png b/blender/blender_models_version_2/Buildings/Renders/EuropeanCity1.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity.jpg b/blender/blender_models_version_2/Buildings/Renders/ModernCity.jpg
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity.png b/blender/blender_models_version_2/Buildings/Renders/ModernCity.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity1.png b/blender/blender_models_version_2/Buildings/Renders/ModernCity1.png
diff --git a/blender/blender_models_version_2/Buildings/Renders/ModernCity2.png b/blender/blender_models_version_2/Buildings/Renders/ModernCity2.png
diff --git a/blender/blender_models_version_2/Buildings/Textures/CityTextures.psd b/blender/blender_models_version_2/Buildings/Textures/CityTextures.psd
diff --git a/blender/blender_models_version_2/Buildings/Textures/EuropeanCity.png b/blender/blender_models_version_2/Buildings/Textures/EuropeanCity.png
diff --git a/blender/blender_models_version_2/Buildings/Textures/ModernCity.png b/blender/blender_models_version_2/Buildings/Textures/ModernCity.png
diff --git a/blender/blender_models_version_2/Characters/Explorer.blend b/blender/blender_models_version_2/Characters/Explorer.blend
diff --git a/blender/blender_models_version_2/Characters/Export/Explorer.glb b/blender/blender_models_version_2/Characters/Export/Explorer.glb
diff --git a/blender/blender_models_version_2/Characters/Export/Settlers.glb b/blender/blender_models_version_2/Characters/Export/Settlers.glb
diff --git a/blender/blender_models_version_2/Characters/Renders/Explorer.png b/blender/blender_models_version_2/Characters/Renders/Explorer.png
diff --git a/blender/blender_models_version_2/Characters/Renders/Settler.png b/blender/blender_models_version_2/Characters/Renders/Settler.png
diff --git a/blender/blender_models_version_2/Characters/Settler.blend b/blender/blender_models_version_2/Characters/Settler.blend
diff --git a/blender/blender_models_version_2/Characters/Textures/Base.psd b/blender/blender_models_version_2/Characters/Textures/Base.psd
diff --git a/blender/blender_models_version_2/Characters/Textures/BaseTexture.png b/blender/blender_models_version_2/Characters/Textures/BaseTexture.png
diff --git a/blender/blender_models_version_2/Characters/Textures/Explorer.png b/blender/blender_models_version_2/Characters/Textures/Explorer.png
diff --git a/blender/blender_models_version_2/Characters/Textures/HorseBase.psd b/blender/blender_models_version_2/Characters/Textures/HorseBase.psd
diff --git a/blender/blender_models_version_2/Characters/Textures/Settler.png b/blender/blender_models_version_2/Characters/Textures/Settler.png
diff --git a/blender/blender_models_version_2/Characters/Textures/SettlerCart.png b/blender/blender_models_version_2/Characters/Textures/SettlerCart.png
diff --git a/blender/blender_models_version_2/CityWallBig.glb b/blender/blender_models_version_2/CityWallBig.glb
diff --git a/blender/blender_models_version_2/CityWallSmall.glb b/blender/blender_models_version_2/CityWallSmall.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier1.glb b/blender/blender_models_version_2/EuropeanCity_Tier1.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier2.glb b/blender/blender_models_version_2/EuropeanCity_Tier2.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier3.glb b/blender/blender_models_version_2/EuropeanCity_Tier3.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier4.glb b/blender/blender_models_version_2/EuropeanCity_Tier4.glb
diff --git a/blender/blender_models_version_2/EuropeanCity_Tier5.glb b/blender/blender_models_version_2/EuropeanCity_Tier5.glb
diff --git a/blender/blender_models_version_2/Explorer.glb b/blender/blender_models_version_2/Explorer.glb
diff --git a/blender/blender_models_version_2/Hut.glb b/blender/blender_models_version_2/Hut.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier1.glb b/blender/blender_models_version_2/ModernCity_Tier1.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier2.glb b/blender/blender_models_version_2/ModernCity_Tier2.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier3.glb b/blender/blender_models_version_2/ModernCity_Tier3.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier4.glb b/blender/blender_models_version_2/ModernCity_Tier4.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier5.glb b/blender/blender_models_version_2/ModernCity_Tier5.glb
diff --git a/blender/blender_models_version_2/ModernCity_Tier5_pbr.glb b/blender/blender_models_version_2/ModernCity_Tier5_pbr.glb
diff --git a/blender/blender_models_version_2/Settler.glb b/blender/blender_models_version_2/Settler.glb
diff --git a/blender/blender_models_version_2/Worker.glb b/blender/blender_models_version_2/Worker.glb
diff --git a/blender/blender_models_version_2/Worrior.glb b/blender/blender_models_version_2/Worrior.glb
diff --git a/fcw-2021.png b/fcw-2021.png
diff --git a/freeciv-proxy/civcom.py b/freeciv-proxy/civcom.py
@@ -59,6 +59,7 @@ def run(self):
             self.send_error_to_client(
                 "Proxy unable to connect to civserver. Error: %s" %
                 (reason))
+            self.close_connection()
             return
 
         # send initial login packet to civserver
@@ -126,8 +127,13 @@ def close_connection(self):
                 "Server connection closed. Removing civcom thread for " +
                 self.username)
 
-        if (hasattr(self.civwebserver, "civcoms") and self.key in list(self.civwebserver.civcoms.keys())):
-            del self.civwebserver.civcoms[self.key]
+        # Flush buffers
+        self.send_packets_to_client()
+        self.send_packets_to_civserver()
+
+        if self.civwebserver is not None:
+            conn = self.civwebserver
+            conn.io_loop.add_callback(lambda: conn.close())
 
         if (self.socket is not None):
             self.socket.close()
@@ -154,7 +160,8 @@ def send_packets_to_client(self):
         packet = self.get_client_result_string()
         if (packet is not None and self.civwebserver is not None):
             # Calls the write_message callback on the next Tornado I/O loop iteration (thread safely).
-            self.civwebserver.io_loop.add_callback(lambda: self.civwebserver.write_message(packet))
+            conn = self.civwebserver
+            conn.io_loop.add_callback(lambda: conn.write_message(packet))
 
     def get_client_result_string(self):
         result = ""

diff --git a/freeciv-proxy/freeciv-proxy.py b/freeciv-proxy/freeciv-proxy.py
@@ -159,17 +159,38 @@ def get_game_auth_method(self, cursor):
             return "password"
 
     def check_user_password(self, cursor, username, password):
-        query = ("select secure_hashed_password, activated from auth where lower(username)=lower(%(usr)s)")
-        cursor.execute(query, {'usr': username, 'pwd': password})
+        # Encryption method transition period code. Clear out first query and
+        # compat_encrypt use after the transition period.
+        query = ("select digest_pw from auth where lower(username) = lower(%(usr)s)")
+        cursor.execute(query, {'usr': username})
+        result = cursor.fetchall()
+        if len(result) == 0:
+            return True
+        compat_encrypt = not result[0][0]
+        if compat_encrypt:
+            query = ("select secure_hashed_password, CAST(ENCRYPT(%(pwd)s, secure_hashed_password) AS CHAR), activated, id from auth where lower(username)=lower(%(usr)s)")
+            cursor.execute(query, {'usr': username, 'pwd': password})
+        else:
+            query = ("select secure_hashed_password, activated from auth where lower(username)=lower(%(usr)s)")
+            cursor.execute(query, {'usr': username})
         result = cursor.fetchall()
 
         if len(result) == 0:
             # Unreserved user, no password needed
             return True
 
-        for secure_shashed_password, active in result:
-            if (active == 0): return False
-            if secure_shashed_password == hashlib.sha256(password.encode('utf-8')).hexdigest(): return True
+        if compat_encrypt:
+            for db_pass, encrypted_pass, active, uid in result:
+                if (active == 0): return False
+                if db_pass == encrypted_pass:
+                    new_hash = hashlib.sha256(password.encode('utf-8')).hexdigest()
+                    query = ("update auth set secure_hashed_password = %(pwd)s, digest_pw = TRUE where id = %(uid)s;")
+                    cursor.execute(query, {'pwd': new_hash, 'uid': uid})
+                    return True
+        else:
+            for secure_shashed_password, active in result:
+                if (active == 0): return False
+                if secure_shashed_password == hashlib.sha256(password.encode('utf-8')).hexdigest(): return True
 
         return False
 

diff --git a/freeciv-web/build-js.sh b/freeciv-web/build-js.sh
@@ -6,12 +6,14 @@ FCW_DEST=/var/lib/tomcat8/webapps/freeciv-web
 mvn compile && \
 echo "Copying target/javascript/webclient.* to ${FCW_DEST}/javascript" && \
   cp target/freeciv-web/javascript/webclient.* "${FCW_DEST}"/javascript/ && \
-echo target/freeciv-web/javascript/webgl/libs/webgl-client* "${FCW_DEST}"/javascript/webgl/libs && \
-  cp target/freeciv-web/javascript/webgl/libs/webgl-client* "${FCW_DEST}"/javascript/webgl/libs/
+echo target/freeciv-web/javascript/webgl-client* "${FCW_DEST}"/javascript/ && \
+  cp target/freeciv-web/javascript/webgl-client* "${FCW_DEST}"/javascript/
 
 # update timestamp to clear browser cache.
 sed -i.bak -e "s/ts=\"/ts=\"1/" -e "s/\?ts=/\?ts=1/" "${FCW_DEST}"/webclient/index.jsp
 
+# 3d webgl shaders
+cp src/main/webapp/javascript/webgl/shaders/*.* "${FCW_DEST}"/javascript/webgl/shaders/
 
 # let user know when it's finished
 echo $'\a'
diff --git a/freeciv-web/build-rules.sh b/freeciv-web/build-rules.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # builds Freeciv-web, copies the war file to Tomcat and builds the selected rulesets.
 
-RULESETS=(civ2civ3 classic multiplayer mpplus mp2 ag mp2-brava experimental mp2-caravel mp2-dragoon)
+RULESETS=(mp2-dragoon mp2-caravel mp2-brava mp2-ag mpplus classic civ2civ3 multiplayer civ1 civ2 mp2 sandbox webperimental experimental alien)
 TOPDIR="$( cd ../"$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
 
 printf "\n**********************************************************************\n"

diff --git a/freeciv-web/clean-rules.sh b/freeciv-web/clean-rules.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # builds Freeciv-web, copies the war file to Tomcat and builds the selected rulesets.
 
-RULESETS=(classic civ2civ3 maptest multiplayer mpplus mp2sandbox mp2 ag ag2 mp2-brava mp2-caravel mp2-dragoon)
+RULESETS=(classic civ2civ3 maptest multiplayer mpplus mp2sandbox mp2 ag mp2-ag mp2-brava mp2-caravel mp2-dragoon)
 TOPDIR="$( cd ../"$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
 
 printf "\n./clean-rules.sh: DEPLOYED SERVER VERSION. Use ./vclean-rules.sh for vagrant installations.\n"
@@ -16,6 +16,7 @@ printf "************************************************************************
 
 printf "\nOverwriting auto-generated manual with release-version: MP2-Avant Garde"
    cp  ~/freeciv-web/freeciv-web/src/derived/webapp/man/ag7.bak.html ~/freeciv-web/freeciv-web/src/derived/webapp/man/ag7.html
+   cp  ~/freeciv-web/freeciv-web/src/derived/webapp/man/ag7.bak.html ~/freeciv-web/freeciv-web/src/derived/webapp/man/mp2-ag7.html
 printf "\nOverwriting auto-generated manual with release-version: MP2-Brava"
    cp ~/freeciv-web/freeciv-web/src/derived/webapp/man/mp2-brava7.bak.html ~/freeciv-web/freeciv-web/src/derived/webapp/man/mp2-brava7.html
 printf "\nOverwriting auto-generated manual with release-version: MP2-Caravel"

diff --git a/freeciv-web/coredumpon.sh b/freeciv-web/coredumpon.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# builds javascript files Freeciv-web and copies the resulting file to tomcat.
+
+ulimit -c unlimited
diff --git a/freeciv-web/pom.xml b/freeciv-web/pom.xml
@@ -374,6 +374,7 @@ Rerun the sync-js-hand.js script.
 									<include>libs/*.js</include>
 									<include>2dcanvas/*.js</include>
 									<include>2dcanvas/tilespec-constants.js</include>
+									<include>webgl/*.js</include>
 								</includes>
 								<excludes>
 									<exclude>webclient.js</exclude>
@@ -387,6 +388,24 @@ Rerun the sync-js-hand.js script.
 								<goal>minify</goal>
 							</goals>
 						</execution>
+						<execution>
+							<id>webgl-minify</id>
+							<configuration>
+								<baseSourceDir>${project.build.directory}/${project.build.finalName}</baseSourceDir>
+								<sourceDir>javascript/webgl/libs</sourceDir>
+								<targetDir>javascript</targetDir>
+								<outputFilename>webgl-client.js</outputFilename>
+								<includes>
+									<include>*.js</include>
+								</includes>
+								<excludes>
+									<exclude>three.min.js</exclude>
+								</excludes>
+							</configuration>
+							<goals>
+								<goal>minify</goal>
+							</goals>
+						</execution>
 
 						<execution>
 							<id>index-minify</id>

diff --git a/freeciv-web/remake-nodebug.sh b/freeciv-web/remake-nodebug.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+# Does EVERY step to re-build C-server and restart freeciv-web.
+
+printf "\n**********************************************************************\n"
+printf "./remake.sh: DEPLOYED SERVER version. Re-builds server executables.\n"
+printf "Important: Use ./vremake.sh for vagrant installations.\n"
+printf "**********************************************************************\n"
+
+cd ~/freeciv-web/freeciv && ./prepare_freeciv.sh && cd build && make install && cd ../../scripts && ./stop-freeciv-web.sh && ./start-freeciv-web.sh
+
+# let user know when it's finished
+echo $'\a'
diff --git a/freeciv-web/remake.sh b/freeciv-web/remake.sh
@@ -6,6 +6,8 @@ printf "./remake.sh: DEPLOYED SERVER version. Re-builds server executables.\n"
 printf "Important: Use ./vremake.sh for vagrant installations.\n"
 printf "**********************************************************************\n"
 
+CFLAGS="-g"
+
 cd ~/freeciv-web/freeciv && ./prepare_freeciv.sh && cd build && make install && cd ../../scripts && ./stop-freeciv-web.sh && ./start-freeciv-web.sh
 
 # let user know when it's finished

diff --git a/freeciv-web/scenario-build.sh b/freeciv-web/scenario-build.sh
@@ -21,7 +21,7 @@ printf "\n**********************************************************************
 printf "This refreshes only the SCENARIOS marked for rebuild inside this script.\n"
 printf "****************************************************************************\n"
 
-SCENARIOS=(europe.sav europe-new-positions.sav tutorial.sav)
+SCENARIOS=(europe.sav europe-new-positions.sav tutorial.sav riverland.sav)
 TOPDIR="$( cd ../"$( dirname "${BASH_SOURCE[0]}" )" > /dev/null && pwd )"
 
 printf "\nUpdating scenarios...\n"

diff --git a/freeciv-web/src/derived/webapp/images/flags/abkhazia-web.png b/freeciv-web/src/derived/webapp/images/flags/abkhazia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/aborigines-web.png b/freeciv-web/src/derived/webapp/images/flags/aborigines-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/africa-web.png b/freeciv-web/src/derived/webapp/images/flags/africa-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/anishinaabe-web.png b/freeciv-web/src/derived/webapp/images/flags/anishinaabe-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/antarctica-web.png b/freeciv-web/src/derived/webapp/images/flags/antarctica-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/argentina-web.png b/freeciv-web/src/derived/webapp/images/flags/argentina-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/armenia-web.png b/freeciv-web/src/derived/webapp/images/flags/armenia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/assam-web.png b/freeciv-web/src/derived/webapp/images/flags/assam-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/assyria-web.png b/freeciv-web/src/derived/webapp/images/flags/assyria-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/australia-web.png b/freeciv-web/src/derived/webapp/images/flags/australia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/azerbaijan-web.png b/freeciv-web/src/derived/webapp/images/flags/azerbaijan-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/babylon-web.png b/freeciv-web/src/derived/webapp/images/flags/babylon-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/bahamas-web.png b/freeciv-web/src/derived/webapp/images/flags/bahamas-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/bangladesh-web.png b/freeciv-web/src/derived/webapp/images/flags/bangladesh-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/barbados-web.png b/freeciv-web/src/derived/webapp/images/flags/barbados-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/belarus-web.png b/freeciv-web/src/derived/webapp/images/flags/belarus-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/boii-web.png b/freeciv-web/src/derived/webapp/images/flags/boii-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/bosnia-web.png b/freeciv-web/src/derived/webapp/images/flags/bosnia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/brasil-web.png b/freeciv-web/src/derived/webapp/images/flags/brasil-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/britannia-web.png b/freeciv-web/src/derived/webapp/images/flags/britannia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/brunei-web.png b/freeciv-web/src/derived/webapp/images/flags/brunei-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/canada-web.png b/freeciv-web/src/derived/webapp/images/flags/canada-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/carantanian-web.png b/freeciv-web/src/derived/webapp/images/flags/carantanian-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/corsica-web.png b/freeciv-web/src/derived/webapp/images/flags/corsica-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/crimean_tatar-web.png b/freeciv-web/src/derived/webapp/images/flags/crimean_tatar-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/croatia-web.png b/freeciv-web/src/derived/webapp/images/flags/croatia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/cuba-web.png b/freeciv-web/src/derived/webapp/images/flags/cuba-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/czech-web.png b/freeciv-web/src/derived/webapp/images/flags/czech-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/czechoslovakia-web.png b/freeciv-web/src/derived/webapp/images/flags/czechoslovakia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/dacian-web.png b/freeciv-web/src/derived/webapp/images/flags/dacian-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/dominica-web.png b/freeciv-web/src/derived/webapp/images/flags/dominica-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/dryad-web.png b/freeciv-web/src/derived/webapp/images/flags/dryad-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/egypt_ancient-web.png b/freeciv-web/src/derived/webapp/images/flags/egypt_ancient-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/eritrea-web.png b/freeciv-web/src/derived/webapp/images/flags/eritrea-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/ethiopia-web.png b/freeciv-web/src/derived/webapp/images/flags/ethiopia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/etruscan-web.png b/freeciv-web/src/derived/webapp/images/flags/etruscan-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/europe-web.png b/freeciv-web/src/derived/webapp/images/flags/europe-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/fiji-web.png b/freeciv-web/src/derived/webapp/images/flags/fiji-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/finland-web.png b/freeciv-web/src/derived/webapp/images/flags/finland-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/florence-web.png b/freeciv-web/src/derived/webapp/images/flags/florence-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/france-web.png b/freeciv-web/src/derived/webapp/images/flags/france-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/gaul-web.png b/freeciv-web/src/derived/webapp/images/flags/gaul-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/germanic-web.png b/freeciv-web/src/derived/webapp/images/flags/germanic-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/germany-web.png b/freeciv-web/src/derived/webapp/images/flags/germany-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/ghaznavid-web.png b/freeciv-web/src/derived/webapp/images/flags/ghaznavid-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/gokturk-web.png b/freeciv-web/src/derived/webapp/images/flags/gokturk-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/golden_horde-web.png b/freeciv-web/src/derived/webapp/images/flags/golden_horde-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/guatemala-web.png b/freeciv-web/src/derived/webapp/images/flags/guatemala-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/guinea-bissau-web.png b/freeciv-web/src/derived/webapp/images/flags/guinea-bissau-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/hawaii-web.png b/freeciv-web/src/derived/webapp/images/flags/hawaii-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/honduras-web.png b/freeciv-web/src/derived/webapp/images/flags/honduras-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/hungary-web.png b/freeciv-web/src/derived/webapp/images/flags/hungary-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/iceland-web.png b/freeciv-web/src/derived/webapp/images/flags/iceland-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/illyria-web.png b/freeciv-web/src/derived/webapp/images/flags/illyria-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/indoeuropean-web.png b/freeciv-web/src/derived/webapp/images/flags/indoeuropean-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/ireland-web.png b/freeciv-web/src/derived/webapp/images/flags/ireland-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/israel-web.png b/freeciv-web/src/derived/webapp/images/flags/israel-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/israel_ancient-web.png b/freeciv-web/src/derived/webapp/images/flags/israel_ancient-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/jamaica-web.png b/freeciv-web/src/derived/webapp/images/flags/jamaica-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/japan-web.png b/freeciv-web/src/derived/webapp/images/flags/japan-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/jordan-web.png b/freeciv-web/src/derived/webapp/images/flags/jordan-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/kazakhstan-web.png b/freeciv-web/src/derived/webapp/images/flags/kazakhstan-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/khmer-web.png b/freeciv-web/src/derived/webapp/images/flags/khmer-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/kiribati-web.png b/freeciv-web/src/derived/webapp/images/flags/kiribati-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/kurd-web.png b/freeciv-web/src/derived/webapp/images/flags/kurd-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/kuwait-web.png b/freeciv-web/src/derived/webapp/images/flags/kuwait-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/latvia-web.png b/freeciv-web/src/derived/webapp/images/flags/latvia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/lebanon-web.png b/freeciv-web/src/derived/webapp/images/flags/lebanon-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/libya-web.png b/freeciv-web/src/derived/webapp/images/flags/libya-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/libya_old-web.png b/freeciv-web/src/derived/webapp/images/flags/libya_old-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/macedonia-web.png b/freeciv-web/src/derived/webapp/images/flags/macedonia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/malaysia-web.png b/freeciv-web/src/derived/webapp/images/flags/malaysia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/man-web.png b/freeciv-web/src/derived/webapp/images/flags/man-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/messapian-web.png b/freeciv-web/src/derived/webapp/images/flags/messapian-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/moldova-web.png b/freeciv-web/src/derived/webapp/images/flags/moldova-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/moluccas-web.png b/freeciv-web/src/derived/webapp/images/flags/moluccas-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/monaco_alternative-web.png b/freeciv-web/src/derived/webapp/images/flags/monaco_alternative-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/mongolia-web.png b/freeciv-web/src/derived/webapp/images/flags/mongolia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/montenegro-web.png b/freeciv-web/src/derived/webapp/images/flags/montenegro-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/nauru-web.png b/freeciv-web/src/derived/webapp/images/flags/nauru-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/nenetsia-web.png b/freeciv-web/src/derived/webapp/images/flags/nenetsia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/newzealand-web.png b/freeciv-web/src/derived/webapp/images/flags/newzealand-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/nigeria-web.png b/freeciv-web/src/derived/webapp/images/flags/nigeria-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/north_korea-web.png b/freeciv-web/src/derived/webapp/images/flags/north_korea-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/norway-web.png b/freeciv-web/src/derived/webapp/images/flags/norway-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/numidia-web.png b/freeciv-web/src/derived/webapp/images/flags/numidia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/ohlone-web.png b/freeciv-web/src/derived/webapp/images/flags/ohlone-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/oldenburg-web.png b/freeciv-web/src/derived/webapp/images/flags/oldenburg-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/palmyra-web.png b/freeciv-web/src/derived/webapp/images/flags/palmyra-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/philippines-web.png b/freeciv-web/src/derived/webapp/images/flags/philippines-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/poland-web.png b/freeciv-web/src/derived/webapp/images/flags/poland-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/russia-web.png b/freeciv-web/src/derived/webapp/images/flags/russia-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/scotland-web.png b/freeciv-web/src/derived/webapp/images/flags/scotland-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/scottishgaelic-web.png b/freeciv-web/src/derived/webapp/images/flags/scottishgaelic-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/seleucid-web.png b/freeciv-web/src/derived/webapp/images/flags/seleucid-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/spartan-web.png b/freeciv-web/src/derived/webapp/images/flags/spartan-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/sweden-web.png b/freeciv-web/src/derived/webapp/images/flags/sweden-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/switzerland-web.png b/freeciv-web/src/derived/webapp/images/flags/switzerland-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/templar-web.png b/freeciv-web/src/derived/webapp/images/flags/templar-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/tuareg-web.png b/freeciv-web/src/derived/webapp/images/flags/tuareg-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/vandal-web.png b/freeciv-web/src/derived/webapp/images/flags/vandal-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/visigoth-web.png b/freeciv-web/src/derived/webapp/images/flags/visigoth-web.png
diff --git a/freeciv-web/src/derived/webapp/images/flags/xiongnu-web.png b/freeciv-web/src/derived/webapp/images/flags/xiongnu-web.png