Merge remote-tracking branch 'origin/master' into develop

2021-06-08 18:21:40 +01:00 · 2021-06-08 18:21:40 +01:00 · 9e8d59c2d1
commit 9e8d59c2d1
parent 7138c51134 e47c55a560
46 changed files with 515 additions and 154 deletions
--- a/docs/codox/Game_Play.html
+++ b/docs/codox/Game_Play.html
--- a/docs/codox/Gossip_scripted_plot_and_Johnny_Silverhand.html
+++ b/docs/codox/Gossip_scripted_plot_and_Johnny_Silverhand.html
--- a/docs/codox/NewCh1.html
+++ b/docs/codox/NewCh1.html
--- a/docs/codox/Organic_Quests.html
+++ b/docs/codox/Organic_Quests.html
--- a/docs/codox/Populating-a-game-world.html
+++ b/docs/codox/Populating-a-game-world.html
--- a/docs/codox/Settling-a-game-world.html
+++ b/docs/codox/Settling-a-game-world.html
--- a/docs/codox/Simulation-layers.html
+++ b/docs/codox/Simulation-layers.html
--- a/docs/codox/The-spread-of-knowledge-in-a-large-game-world.html
+++ b/docs/codox/The-spread-of-knowledge-in-a-large-game-world.html
--- a/docs/codox/Uncanny_dialogue.html
+++ b/docs/codox/Uncanny_dialogue.html
--- a/docs/codox/Voice-acting-considered-harmful.html
+++ b/docs/codox/Voice-acting-considered-harmful.html
--- a/docs/codox/on-dying.html
+++ b/docs/codox/on-dying.html
--- a/docs/codox/sandbox.html
+++ b/docs/codox/sandbox.html
--- a/docs/codox/sexual-dimorphism.html
+++ b/docs/codox/sexual-dimorphism.html
--- a/docs/codox/the-great-game.gossip.gossip.html
+++ b/docs/codox/the-great-game.gossip.gossip.html
--- a/docs/codox/the-great-game.gossip.news-items.html
+++ b/docs/codox/the-great-game.gossip.news-items.html
--- a/docs/codox/the-great-game.merchants.markets.html
+++ b/docs/codox/the-great-game.merchants.markets.html
--- a/docs/codox/the-great-game.merchants.merchants.html
+++ b/docs/codox/the-great-game.merchants.merchants.html
--- a/docs/codox/the-great-game.merchants.planning.html
+++ b/docs/codox/the-great-game.merchants.planning.html
--- a/docs/codox/the-great-game.merchants.strategies.simple.html
+++ b/docs/codox/the-great-game.merchants.strategies.simple.html
--- a/docs/codox/the-great-game.time.html
+++ b/docs/codox/the-great-game.time.html
--- a/docs/codox/the-great-game.utils.html
+++ b/docs/codox/the-great-game.utils.html
--- a/docs/codox/the-great-game.world.location.html
+++ b/docs/codox/the-great-game.world.location.html
--- a/docs/codox/the-great-game.world.routes.html
+++ b/docs/codox/the-great-game.world.routes.html
--- a/docs/codox/the-great-game.world.run.html
+++ b/docs/codox/the-great-game.world.run.html
--- a/docs/codox/the-great-game.world.world.html
+++ b/docs/codox/the-great-game.world.world.html