Merge branch 'develop' into feature/ascension_7_8

# Conflicts:
#	impostor.inc
#	inc/decision/decision.have_a_coffee.lua
#	inc/decision/decision.sumphore_discussion.lua
#	inc/screen/screen.mysterious_man.lua
#	inc/screen/screen.walking_to_home.lua
#	inc/screen/screen.walking_to_office.lua
#	inc/window/window.menu.lua

inc/window/window.menu.lua

@@ -102,17 +102,13 @@ function MenuWindow.update()
   end
 end
 
---- Starts a new game from the menu.
+--- Opens player name entry then starts a new game.
 --- @within MenuWindow
 function MenuWindow.new_game()
-  Context.new_game()
-end
-
---- Loads a game from the menu.
---- @within MenuWindow
-function MenuWindow.load_game()
-  Context.load_game()
-  GameWindow.set_state("game")
+  PlayerNameWindow.init(function()
+    Context.new_game()
+  end)
+  Window.set_current("player_name")
 end
 
 --- Saves the current game from the menu.
@@ -139,6 +135,20 @@ function MenuWindow.controls()
   Window.set_current("controls")
 end
 
+--- Opens the player name entry screen (test mode shortcut).
+--- @within MenuWindow
+function MenuWindow.player_name()
+  PlayerNameWindow.init()
+  Window.set_current("player_name")
+end
+
+--- Opens the credits screen.
+--- @within MenuWindow
+function MenuWindow.credits()
+  CreditsWindow.init()
+  Window.set_current("credits")
+end
+
 --- Opens the audio test menu.
 --- @within MenuWindow
 function MenuWindow.audio_test()
@@ -153,6 +163,14 @@ function MenuWindow.continued()
   GameWindow.set_state("continued")
 end
 
+--- Opens the end screen for testing.
+--- @within MenuWindow
+function MenuWindow.end_screen()
+  Context._end.state     = "ending"
+  Context._end.selection = 1
+  GameWindow.set_state("end")
+end
+
 --- Opens the DDR minigame test.
 --- @within MenuWindow
 function MenuWindow.ddr_test()
@@ -178,14 +196,16 @@ function MenuWindow.refresh_menu_items()
   end
 
   table.insert(_menu_items, {label = "New Game",  decision = MenuWindow.new_game})
-  table.insert(_menu_items, {label = "Load Game", decision = MenuWindow.load_game})
   table.insert(_menu_items, {label = "Controls",  decision = MenuWindow.controls})
+  table.insert(_menu_items, {label = "Credits",   decision = MenuWindow.credits})
 
   if Context.test_mode then
     table.insert(_menu_items, {label = "Audio Test",         decision = MenuWindow.audio_test})
     table.insert(_menu_items, {label = "To Be Continued...", decision = MenuWindow.continued})
     table.insert(_menu_items, {label = "DDR Test",           decision = MenuWindow.ddr_test})
     table.insert(_menu_items, {label = "Start at ASCEND N",  decision = MenuWindow.ascend_debug})
+    table.insert(_menu_items, {label = "End Screen",         decision = MenuWindow.end_screen})
+    table.insert(_menu_items, {label = "Player Name",        decision = MenuWindow.player_name})
   end
 
   table.insert(_menu_items, {label = "Exit", decision = MenuWindow.exit})