ucsd-cse125-sp24 · Tyler-Lentz · Jun 8, 2024 · May 31, 2024 · May 31, 2024 · May 31, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -26,11 +26,17 @@ IF (NOT WIN32)
     )
 ENDIF()
 
+# fix issues on gh action where object files are too large
+if (WIN32)
+  add_compile_options(/bigobj)
+endif ()
+
 # Add google test to CMake
 add_subdirectory(dependencies/google-test) 
 
+
 # If we need any compiler / linker flags, add them here
-SET(GCC_COMPILE_FLAGS "")
+  SET(GCC_COMPILE_FLAGS "")
 SET(GCC_LINK_FLAGS    "")
 
 SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
@@ -52,7 +58,7 @@ add_subdirectory(dependencies/glm) # include glm library
 add_subdirectory(src/shared) # define game_shared_lib
 add_subdirectory(src/client) # create client executable
 add_subdirectory(src/server) # create server executable
-add_subdirectory(src/debugger) # create debugger executable
+#add_subdirectory(src/debugger) # create debugger executable
 
 find_program(CPPCHECK "cppcheck")
 add_custom_target(lint

diff --git a/assets/.DS_Store b/assets/.DS_Store
diff --git a/assets/imgs/arrowtrap.png b/assets/imgs/arrowtrap.png
diff --git a/assets/imgs/blade.png b/assets/imgs/blade.png
diff --git a/assets/imgs/blank.png b/assets/imgs/blank.png
diff --git a/assets/imgs/compass.png b/assets/imgs/compass.png
diff --git a/assets/imgs/compasses/compass_0.png b/assets/imgs/compasses/compass_0.png
diff --git a/assets/imgs/compasses/compass_120.png b/assets/imgs/compasses/compass_120.png
diff --git a/assets/imgs/compasses/compass_150.png b/assets/imgs/compasses/compass_150.png
diff --git a/assets/imgs/compasses/compass_180.png b/assets/imgs/compasses/compass_180.png
diff --git a/assets/imgs/compasses/compass_210.png b/assets/imgs/compasses/compass_210.png
diff --git a/assets/imgs/compasses/compass_240.png b/assets/imgs/compasses/compass_240.png
diff --git a/assets/imgs/compasses/compass_270.png b/assets/imgs/compasses/compass_270.png
diff --git a/assets/imgs/compasses/compass_30.png b/assets/imgs/compasses/compass_30.png
diff --git a/assets/imgs/compasses/compass_300.png b/assets/imgs/compasses/compass_300.png
diff --git a/assets/imgs/compasses/compass_330.png b/assets/imgs/compasses/compass_330.png
diff --git a/assets/imgs/compasses/compass_60.png b/assets/imgs/compasses/compass_60.png
diff --git a/assets/imgs/compasses/compass_90.png b/assets/imgs/compasses/compass_90.png
diff --git a/assets/imgs/deathCountBG.png b/assets/imgs/deathCountBG.png
diff --git a/assets/imgs/defeat.png b/assets/imgs/defeat.png
diff --git a/assets/imgs/destroyedSkull.png b/assets/imgs/destroyedSkull.png
diff --git a/assets/imgs/died.png b/assets/imgs/died.png
diff --git a/assets/imgs/dmBackground.png b/assets/imgs/dmBackground.png
diff --git a/assets/imgs/dmEventBG.png b/assets/imgs/dmEventBG.png
diff --git a/assets/imgs/dm_cooldown.png b/assets/imgs/dm_cooldown.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_1.png b/assets/imgs/dm_cooldown/dm_cooldown_1.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_10.png b/assets/imgs/dm_cooldown/dm_cooldown_10.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_2.png b/assets/imgs/dm_cooldown/dm_cooldown_2.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_3.png b/assets/imgs/dm_cooldown/dm_cooldown_3.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_4.png b/assets/imgs/dm_cooldown/dm_cooldown_4.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_5.png b/assets/imgs/dm_cooldown/dm_cooldown_5.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_6.png b/assets/imgs/dm_cooldown/dm_cooldown_6.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_7.png b/assets/imgs/dm_cooldown/dm_cooldown_7.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_8.png b/assets/imgs/dm_cooldown/dm_cooldown_8.png
diff --git a/assets/imgs/dm_cooldown/dm_cooldown_9.png b/assets/imgs/dm_cooldown/dm_cooldown_9.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_1.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_1.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_10.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_10.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_2.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_2.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_3.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_3.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_4.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_4.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_5.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_5.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_6.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_6.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_7.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_7.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_8.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_8.png
diff --git a/assets/imgs/dm_cooldown/dm_selected_cooldown_9.png b/assets/imgs/dm_cooldown/dm_selected_cooldown_9.png
diff --git a/assets/imgs/dm_left.png b/assets/imgs/dm_left.png
diff --git a/assets/imgs/dm_middle.png b/assets/imgs/dm_middle.png
diff --git a/assets/imgs/dm_right.png b/assets/imgs/dm_right.png
diff --git a/assets/imgs/dm_selected.png b/assets/imgs/dm_selected.png
diff --git a/assets/imgs/eventBG.png b/assets/imgs/eventBG.png
diff --git a/assets/imgs/exit.png b/assets/imgs/exit.png
diff --git a/assets/imgs/exitBG.png b/assets/imgs/exitBG.png
diff --git a/assets/imgs/exitBGSelected.png b/assets/imgs/exitBGSelected.png
diff --git a/assets/imgs/exitDMBG.png b/assets/imgs/exitDMBG.png
diff --git a/assets/imgs/exitDMBGSelected.png b/assets/imgs/exitDMBGSelected.png
diff --git a/assets/imgs/exitSelected.png b/assets/imgs/exitSelected.png
diff --git a/assets/imgs/fire_wand.png b/assets/imgs/fire_wand.png
diff --git a/assets/imgs/floorspiketrap.png b/assets/imgs/floorspiketrap.png
diff --git a/assets/imgs/frame.png b/assets/imgs/frame.png
diff --git a/assets/imgs/heal_wand.png b/assets/imgs/heal_wand.png
diff --git a/assets/imgs/healthbar.png b/assets/imgs/healthbar.png
diff --git a/assets/imgs/healthtick_empty.png b/assets/imgs/healthtick_empty.png
diff --git a/assets/imgs/healthtick_full.png b/assets/imgs/healthtick_full.png
diff --git a/assets/imgs/helpBG.png b/assets/imgs/helpBG.png
diff --git a/assets/imgs/helpDMBG.png b/assets/imgs/helpDMBG.png
diff --git a/assets/imgs/itemBackground.png b/assets/imgs/itemBackground.png
diff --git a/assets/imgs/left.png b/assets/imgs/left.png
diff --git a/assets/imgs/lightcut.png b/assets/imgs/lightcut.png
diff --git a/assets/imgs/lightning.png b/assets/imgs/lightning.png
diff --git a/assets/imgs/lobbyButton.png b/assets/imgs/lobbyButton.png
diff --git a/assets/imgs/logo_animation/frame_1.png b/assets/imgs/logo_animation/frame_1.png
diff --git a/assets/imgs/logo_animation/frame_10.png b/assets/imgs/logo_animation/frame_10.png
diff --git a/assets/imgs/logo_animation/frame_100.png b/assets/imgs/logo_animation/frame_100.png
diff --git a/assets/imgs/logo_animation/frame_101.png b/assets/imgs/logo_animation/frame_101.png
diff --git a/assets/imgs/logo_animation/frame_102.png b/assets/imgs/logo_animation/frame_102.png
diff --git a/assets/imgs/logo_animation/frame_103.png b/assets/imgs/logo_animation/frame_103.png
diff --git a/assets/imgs/logo_animation/frame_104.png b/assets/imgs/logo_animation/frame_104.png
diff --git a/assets/imgs/logo_animation/frame_105.png b/assets/imgs/logo_animation/frame_105.png
diff --git a/assets/imgs/logo_animation/frame_106.png b/assets/imgs/logo_animation/frame_106.png
diff --git a/assets/imgs/logo_animation/frame_107.png b/assets/imgs/logo_animation/frame_107.png
diff --git a/assets/imgs/logo_animation/frame_108.png b/assets/imgs/logo_animation/frame_108.png
diff --git a/assets/imgs/logo_animation/frame_109.png b/assets/imgs/logo_animation/frame_109.png
diff --git a/assets/imgs/logo_animation/frame_11.png b/assets/imgs/logo_animation/frame_11.png
diff --git a/assets/imgs/logo_animation/frame_110.png b/assets/imgs/logo_animation/frame_110.png
diff --git a/assets/imgs/logo_animation/frame_111.png b/assets/imgs/logo_animation/frame_111.png
diff --git a/assets/imgs/logo_animation/frame_112.png b/assets/imgs/logo_animation/frame_112.png
diff --git a/assets/imgs/logo_animation/frame_113.png b/assets/imgs/logo_animation/frame_113.png
diff --git a/assets/imgs/logo_animation/frame_114.png b/assets/imgs/logo_animation/frame_114.png
diff --git a/assets/imgs/logo_animation/frame_115.png b/assets/imgs/logo_animation/frame_115.png
diff --git a/assets/imgs/logo_animation/frame_116.png b/assets/imgs/logo_animation/frame_116.png
diff --git a/assets/imgs/logo_animation/frame_117.png b/assets/imgs/logo_animation/frame_117.png
diff --git a/assets/imgs/logo_animation/frame_118.png b/assets/imgs/logo_animation/frame_118.png
diff --git a/assets/imgs/logo_animation/frame_119.png b/assets/imgs/logo_animation/frame_119.png
diff --git a/assets/imgs/logo_animation/frame_12.png b/assets/imgs/logo_animation/frame_12.png
diff --git a/assets/imgs/logo_animation/frame_120.png b/assets/imgs/logo_animation/frame_120.png
diff --git a/assets/imgs/logo_animation/frame_121.png b/assets/imgs/logo_animation/frame_121.png
diff --git a/assets/imgs/logo_animation/frame_122.png b/assets/imgs/logo_animation/frame_122.png
diff --git a/assets/imgs/logo_animation/frame_123.png b/assets/imgs/logo_animation/frame_123.png
diff --git a/assets/imgs/logo_animation/frame_124.png b/assets/imgs/logo_animation/frame_124.png
diff --git a/assets/imgs/logo_animation/frame_125.png b/assets/imgs/logo_animation/frame_125.png
diff --git a/assets/imgs/logo_animation/frame_126.png b/assets/imgs/logo_animation/frame_126.png
diff --git a/assets/imgs/logo_animation/frame_127.png b/assets/imgs/logo_animation/frame_127.png
diff --git a/assets/imgs/logo_animation/frame_128.png b/assets/imgs/logo_animation/frame_128.png
diff --git a/assets/imgs/logo_animation/frame_129.png b/assets/imgs/logo_animation/frame_129.png
diff --git a/assets/imgs/logo_animation/frame_13.png b/assets/imgs/logo_animation/frame_13.png
diff --git a/assets/imgs/logo_animation/frame_130.png b/assets/imgs/logo_animation/frame_130.png
diff --git a/assets/imgs/logo_animation/frame_131.png b/assets/imgs/logo_animation/frame_131.png
diff --git a/assets/imgs/logo_animation/frame_132.png b/assets/imgs/logo_animation/frame_132.png
diff --git a/assets/imgs/logo_animation/frame_133.png b/assets/imgs/logo_animation/frame_133.png
diff --git a/assets/imgs/logo_animation/frame_134.png b/assets/imgs/logo_animation/frame_134.png
diff --git a/assets/imgs/logo_animation/frame_135.png b/assets/imgs/logo_animation/frame_135.png
diff --git a/assets/imgs/logo_animation/frame_136.png b/assets/imgs/logo_animation/frame_136.png
diff --git a/assets/imgs/logo_animation/frame_137.png b/assets/imgs/logo_animation/frame_137.png
diff --git a/assets/imgs/logo_animation/frame_138.png b/assets/imgs/logo_animation/frame_138.png
diff --git a/assets/imgs/logo_animation/frame_139.png b/assets/imgs/logo_animation/frame_139.png
diff --git a/assets/imgs/logo_animation/frame_14.png b/assets/imgs/logo_animation/frame_14.png
diff --git a/assets/imgs/logo_animation/frame_140.png b/assets/imgs/logo_animation/frame_140.png
diff --git a/assets/imgs/logo_animation/frame_141.png b/assets/imgs/logo_animation/frame_141.png
diff --git a/assets/imgs/logo_animation/frame_142.png b/assets/imgs/logo_animation/frame_142.png
diff --git a/assets/imgs/logo_animation/frame_143.png b/assets/imgs/logo_animation/frame_143.png
diff --git a/assets/imgs/logo_animation/frame_144.png b/assets/imgs/logo_animation/frame_144.png
diff --git a/assets/imgs/logo_animation/frame_145.png b/assets/imgs/logo_animation/frame_145.png
diff --git a/assets/imgs/logo_animation/frame_146.png b/assets/imgs/logo_animation/frame_146.png
diff --git a/assets/imgs/logo_animation/frame_147.png b/assets/imgs/logo_animation/frame_147.png
diff --git a/assets/imgs/logo_animation/frame_148.png b/assets/imgs/logo_animation/frame_148.png
diff --git a/assets/imgs/logo_animation/frame_149.png b/assets/imgs/logo_animation/frame_149.png
diff --git a/assets/imgs/logo_animation/frame_15.png b/assets/imgs/logo_animation/frame_15.png
diff --git a/assets/imgs/logo_animation/frame_150.png b/assets/imgs/logo_animation/frame_150.png
diff --git a/assets/imgs/logo_animation/frame_151.png b/assets/imgs/logo_animation/frame_151.png
diff --git a/assets/imgs/logo_animation/frame_152.png b/assets/imgs/logo_animation/frame_152.png
diff --git a/assets/imgs/logo_animation/frame_153.png b/assets/imgs/logo_animation/frame_153.png
diff --git a/assets/imgs/logo_animation/frame_154.png b/assets/imgs/logo_animation/frame_154.png
diff --git a/assets/imgs/logo_animation/frame_155.png b/assets/imgs/logo_animation/frame_155.png
diff --git a/assets/imgs/logo_animation/frame_156.png b/assets/imgs/logo_animation/frame_156.png
diff --git a/assets/imgs/logo_animation/frame_16.png b/assets/imgs/logo_animation/frame_16.png
diff --git a/assets/imgs/logo_animation/frame_17.png b/assets/imgs/logo_animation/frame_17.png
diff --git a/assets/imgs/logo_animation/frame_18.png b/assets/imgs/logo_animation/frame_18.png
diff --git a/assets/imgs/logo_animation/frame_19.png b/assets/imgs/logo_animation/frame_19.png
diff --git a/assets/imgs/logo_animation/frame_2.png b/assets/imgs/logo_animation/frame_2.png
diff --git a/assets/imgs/logo_animation/frame_20.png b/assets/imgs/logo_animation/frame_20.png
diff --git a/assets/imgs/logo_animation/frame_21.png b/assets/imgs/logo_animation/frame_21.png
diff --git a/assets/imgs/logo_animation/frame_22.png b/assets/imgs/logo_animation/frame_22.png
diff --git a/assets/imgs/logo_animation/frame_23.png b/assets/imgs/logo_animation/frame_23.png
diff --git a/assets/imgs/logo_animation/frame_24.png b/assets/imgs/logo_animation/frame_24.png
diff --git a/assets/imgs/logo_animation/frame_25.png b/assets/imgs/logo_animation/frame_25.png
diff --git a/assets/imgs/logo_animation/frame_26.png b/assets/imgs/logo_animation/frame_26.png
diff --git a/assets/imgs/logo_animation/frame_27.png b/assets/imgs/logo_animation/frame_27.png
diff --git a/assets/imgs/logo_animation/frame_28.png b/assets/imgs/logo_animation/frame_28.png
diff --git a/assets/imgs/logo_animation/frame_29.png b/assets/imgs/logo_animation/frame_29.png
diff --git a/assets/imgs/logo_animation/frame_3.png b/assets/imgs/logo_animation/frame_3.png
diff --git a/assets/imgs/logo_animation/frame_30.png b/assets/imgs/logo_animation/frame_30.png
diff --git a/assets/imgs/logo_animation/frame_31.png b/assets/imgs/logo_animation/frame_31.png
diff --git a/assets/imgs/logo_animation/frame_32.png b/assets/imgs/logo_animation/frame_32.png
diff --git a/assets/imgs/logo_animation/frame_33.png b/assets/imgs/logo_animation/frame_33.png
diff --git a/assets/imgs/logo_animation/frame_34.png b/assets/imgs/logo_animation/frame_34.png
diff --git a/assets/imgs/logo_animation/frame_35.png b/assets/imgs/logo_animation/frame_35.png
diff --git a/assets/imgs/logo_animation/frame_36.png b/assets/imgs/logo_animation/frame_36.png
diff --git a/assets/imgs/logo_animation/frame_37.png b/assets/imgs/logo_animation/frame_37.png
diff --git a/assets/imgs/logo_animation/frame_38.png b/assets/imgs/logo_animation/frame_38.png
diff --git a/assets/imgs/logo_animation/frame_39.png b/assets/imgs/logo_animation/frame_39.png
diff --git a/assets/imgs/logo_animation/frame_4.png b/assets/imgs/logo_animation/frame_4.png
diff --git a/assets/imgs/logo_animation/frame_40.png b/assets/imgs/logo_animation/frame_40.png
diff --git a/assets/imgs/logo_animation/frame_41.png b/assets/imgs/logo_animation/frame_41.png
diff --git a/assets/imgs/logo_animation/frame_42.png b/assets/imgs/logo_animation/frame_42.png
diff --git a/assets/imgs/logo_animation/frame_43.png b/assets/imgs/logo_animation/frame_43.png
diff --git a/assets/imgs/logo_animation/frame_44.png b/assets/imgs/logo_animation/frame_44.png
diff --git a/assets/imgs/logo_animation/frame_45.png b/assets/imgs/logo_animation/frame_45.png
diff --git a/assets/imgs/logo_animation/frame_46.png b/assets/imgs/logo_animation/frame_46.png
diff --git a/assets/imgs/logo_animation/frame_47.png b/assets/imgs/logo_animation/frame_47.png
diff --git a/assets/imgs/logo_animation/frame_48.png b/assets/imgs/logo_animation/frame_48.png
diff --git a/assets/imgs/logo_animation/frame_49.png b/assets/imgs/logo_animation/frame_49.png
diff --git a/assets/imgs/logo_animation/frame_5.png b/assets/imgs/logo_animation/frame_5.png
diff --git a/assets/imgs/logo_animation/frame_50.png b/assets/imgs/logo_animation/frame_50.png
diff --git a/assets/imgs/logo_animation/frame_51.png b/assets/imgs/logo_animation/frame_51.png
diff --git a/assets/imgs/logo_animation/frame_52.png b/assets/imgs/logo_animation/frame_52.png
diff --git a/assets/imgs/logo_animation/frame_53.png b/assets/imgs/logo_animation/frame_53.png
diff --git a/assets/imgs/logo_animation/frame_54.png b/assets/imgs/logo_animation/frame_54.png
diff --git a/assets/imgs/logo_animation/frame_55.png b/assets/imgs/logo_animation/frame_55.png
diff --git a/assets/imgs/logo_animation/frame_56.png b/assets/imgs/logo_animation/frame_56.png
diff --git a/assets/imgs/logo_animation/frame_57.png b/assets/imgs/logo_animation/frame_57.png
diff --git a/assets/imgs/logo_animation/frame_58.png b/assets/imgs/logo_animation/frame_58.png
diff --git a/assets/imgs/logo_animation/frame_59.png b/assets/imgs/logo_animation/frame_59.png
diff --git a/assets/imgs/logo_animation/frame_6.png b/assets/imgs/logo_animation/frame_6.png
diff --git a/assets/imgs/logo_animation/frame_60.png b/assets/imgs/logo_animation/frame_60.png
diff --git a/assets/imgs/logo_animation/frame_61.png b/assets/imgs/logo_animation/frame_61.png
diff --git a/assets/imgs/logo_animation/frame_62.png b/assets/imgs/logo_animation/frame_62.png
diff --git a/assets/imgs/logo_animation/frame_63.png b/assets/imgs/logo_animation/frame_63.png
diff --git a/assets/imgs/logo_animation/frame_64.png b/assets/imgs/logo_animation/frame_64.png
diff --git a/assets/imgs/logo_animation/frame_65.png b/assets/imgs/logo_animation/frame_65.png
diff --git a/assets/imgs/logo_animation/frame_66.png b/assets/imgs/logo_animation/frame_66.png
diff --git a/assets/imgs/logo_animation/frame_67.png b/assets/imgs/logo_animation/frame_67.png
diff --git a/assets/imgs/logo_animation/frame_68.png b/assets/imgs/logo_animation/frame_68.png
diff --git a/assets/imgs/logo_animation/frame_69.png b/assets/imgs/logo_animation/frame_69.png
diff --git a/assets/imgs/logo_animation/frame_7.png b/assets/imgs/logo_animation/frame_7.png
diff --git a/assets/imgs/logo_animation/frame_70.png b/assets/imgs/logo_animation/frame_70.png
diff --git a/assets/imgs/logo_animation/frame_71.png b/assets/imgs/logo_animation/frame_71.png
diff --git a/assets/imgs/logo_animation/frame_72.png b/assets/imgs/logo_animation/frame_72.png
diff --git a/assets/imgs/logo_animation/frame_73.png b/assets/imgs/logo_animation/frame_73.png
diff --git a/assets/imgs/logo_animation/frame_74.png b/assets/imgs/logo_animation/frame_74.png
diff --git a/assets/imgs/logo_animation/frame_75.png b/assets/imgs/logo_animation/frame_75.png
diff --git a/assets/imgs/logo_animation/frame_76.png b/assets/imgs/logo_animation/frame_76.png
diff --git a/assets/imgs/logo_animation/frame_77.png b/assets/imgs/logo_animation/frame_77.png
diff --git a/assets/imgs/logo_animation/frame_78.png b/assets/imgs/logo_animation/frame_78.png
diff --git a/assets/imgs/logo_animation/frame_79.png b/assets/imgs/logo_animation/frame_79.png
diff --git a/assets/imgs/logo_animation/frame_8.png b/assets/imgs/logo_animation/frame_8.png
diff --git a/assets/imgs/logo_animation/frame_80.png b/assets/imgs/logo_animation/frame_80.png
diff --git a/assets/imgs/logo_animation/frame_81.png b/assets/imgs/logo_animation/frame_81.png
diff --git a/assets/imgs/logo_animation/frame_82.png b/assets/imgs/logo_animation/frame_82.png
diff --git a/assets/imgs/logo_animation/frame_83.png b/assets/imgs/logo_animation/frame_83.png
diff --git a/assets/imgs/logo_animation/frame_84.png b/assets/imgs/logo_animation/frame_84.png
diff --git a/assets/imgs/logo_animation/frame_85.png b/assets/imgs/logo_animation/frame_85.png
diff --git a/assets/imgs/logo_animation/frame_86.png b/assets/imgs/logo_animation/frame_86.png
diff --git a/assets/imgs/logo_animation/frame_87.png b/assets/imgs/logo_animation/frame_87.png
diff --git a/assets/imgs/logo_animation/frame_88.png b/assets/imgs/logo_animation/frame_88.png
diff --git a/assets/imgs/logo_animation/frame_89.png b/assets/imgs/logo_animation/frame_89.png
diff --git a/assets/imgs/logo_animation/frame_9.png b/assets/imgs/logo_animation/frame_9.png
diff --git a/assets/imgs/logo_animation/frame_90.png b/assets/imgs/logo_animation/frame_90.png
diff --git a/assets/imgs/logo_animation/frame_91.png b/assets/imgs/logo_animation/frame_91.png
diff --git a/assets/imgs/logo_animation/frame_92.png b/assets/imgs/logo_animation/frame_92.png
diff --git a/assets/imgs/logo_animation/frame_93.png b/assets/imgs/logo_animation/frame_93.png
diff --git a/assets/imgs/logo_animation/frame_94.png b/assets/imgs/logo_animation/frame_94.png
diff --git a/assets/imgs/logo_animation/frame_95.png b/assets/imgs/logo_animation/frame_95.png
diff --git a/assets/imgs/logo_animation/frame_96.png b/assets/imgs/logo_animation/frame_96.png
diff --git a/assets/imgs/logo_animation/frame_97.png b/assets/imgs/logo_animation/frame_97.png
diff --git a/assets/imgs/logo_animation/frame_98.png b/assets/imgs/logo_animation/frame_98.png
diff --git a/assets/imgs/logo_animation/frame_99.png b/assets/imgs/logo_animation/frame_99.png
diff --git a/assets/imgs/manabar.png b/assets/imgs/manabar.png
diff --git a/assets/imgs/manatick_empty.png b/assets/imgs/manatick_empty.png
diff --git a/assets/imgs/manatick_full.png b/assets/imgs/manatick_full.png
diff --git a/assets/imgs/middle.png b/assets/imgs/middle.png
diff --git a/assets/imgs/mirror.png b/assets/imgs/mirror.png
diff --git a/assets/imgs/needle.png b/assets/imgs/needle.png
diff --git a/assets/imgs/normalSkull.png b/assets/imgs/normalSkull.png
diff --git a/assets/imgs/orb.png b/assets/imgs/orb.png
diff --git a/assets/imgs/player.png b/assets/imgs/player.png
diff --git a/assets/imgs/playerSelected.png b/assets/imgs/playerSelected.png
diff --git a/assets/imgs/pot_health.png b/assets/imgs/pot_health.png
diff --git a/assets/imgs/pot_invisibility.png b/assets/imgs/pot_invisibility.png
diff --git a/assets/imgs/pot_unknown.png b/assets/imgs/pot_unknown.png
diff --git a/assets/imgs/readyPlayer.png b/assets/imgs/readyPlayer.png
diff --git a/assets/imgs/readyPlayerSelected.png b/assets/imgs/readyPlayerSelected.png
diff --git a/assets/imgs/readyZeus.png b/assets/imgs/readyZeus.png
diff --git a/assets/imgs/readyZeusSelected.png b/assets/imgs/readyZeusSelected.png
diff --git a/assets/imgs/respawn.png b/assets/imgs/respawn.png
diff --git a/assets/imgs/right.png b/assets/imgs/right.png
diff --git a/assets/imgs/rowBG.png b/assets/imgs/rowBG.png
diff --git a/assets/imgs/scroll.png b/assets/imgs/scroll.png
diff --git a/assets/imgs/selected_frame.png b/assets/imgs/selected_frame.png
diff --git a/assets/imgs/selected_middle.png b/assets/imgs/selected_middle.png
diff --git a/assets/imgs/spiketrap.png b/assets/imgs/spiketrap.png
diff --git a/assets/imgs/start.png b/assets/imgs/start.png
diff --git a/assets/imgs/startBG.png b/assets/imgs/startBG.png
diff --git a/assets/imgs/startHover.png b/assets/imgs/startHover.png
diff --git a/assets/imgs/sungod.png b/assets/imgs/sungod.png
diff --git a/assets/imgs/teleporter.png b/assets/imgs/teleporter.png
diff --git a/assets/imgs/title.png b/assets/imgs/title.png
diff --git a/assets/imgs/victory.png b/assets/imgs/victory.png
diff --git a/assets/imgs/weapon_dagger.png b/assets/imgs/weapon_dagger.png
diff --git a/assets/imgs/weapon_hammer.png b/assets/imgs/weapon_hammer.png
diff --git a/assets/imgs/weapon_sword.png b/assets/imgs/weapon_sword.png
diff --git a/assets/imgs/zeus.png b/assets/imgs/zeus.png
diff --git a/assets/imgs/zeusSelected.png b/assets/imgs/zeusSelected.png
diff --git a/assets/sounds/client_music/maze_exploration_dm.flac b/assets/sounds/client_music/maze_exploration_dm.flac
diff --git a/assets/sounds/client_music/maze_exploration_dm.mp3 b/assets/sounds/client_music/maze_exploration_dm.mp3
diff --git a/assets/sounds/client_music/maze_exploration_players.flac b/assets/sounds/client_music/maze_exploration_players.flac
diff --git a/assets/sounds/client_music/maze_exploration_players.mp3 b/assets/sounds/client_music/maze_exploration_players.mp3
diff --git a/assets/sounds/client_music/menu.flac b/assets/sounds/client_music/menu.flac
diff --git a/assets/sounds/client_music/menu.mp3 b/assets/sounds/client_music/menu.mp3
diff --git a/assets/sounds/client_music/mono-retrowave.mp3 b/assets/sounds/client_music/mono-retrowave.mp3
diff --git a/assets/sounds/client_music/relay_race_dm.flac b/assets/sounds/client_music/relay_race_dm.flac
diff --git a/assets/sounds/client_music/relay_race_dm.mp3 b/assets/sounds/client_music/relay_race_dm.mp3
diff --git a/assets/sounds/client_music/piano.wav → ...unds/client_music/relay_race_players.flac b/assets/sounds/client_music/piano.wav → ...unds/client_music/relay_race_players.flac
diff --git a/assets/sounds/client_music/relay_race_players.mp3 b/assets/sounds/client_music/relay_race_players.mp3
diff --git a/assets/sounds/client_sfx/victory_dm.flac b/assets/sounds/client_sfx/victory_dm.flac
diff --git a/assets/sounds/client_sfx/victory_dm.mp3 b/assets/sounds/client_sfx/victory_dm.mp3
diff --git a/assets/sounds/client_sfx/victory_players.flac b/assets/sounds/client_sfx/victory_players.flac
diff --git a/assets/sounds/client_sfx/victory_players.mp3 b/assets/sounds/client_sfx/victory_players.mp3
diff --git a/assets/sounds/client_sfx/vine-boom-mono.mp3 b/assets/sounds/client_sfx/vine-boom-mono.mp3
diff --git a/assets/sounds/server_sfx/cutscene_gate_open.wav b/assets/sounds/server_sfx/cutscene_gate_open.wav
diff --git a/assets/sounds/server_sfx/dagger.wav b/assets/sounds/server_sfx/dagger.wav
diff --git a/assets/sounds/server_sfx/electric_hum.wav b/assets/sounds/server_sfx/electric_hum.wav
diff --git a/assets/sounds/server_sfx/hammer.wav b/assets/sounds/server_sfx/hammer.wav
diff --git a/assets/sounds/server_sfx/itemdrop.wav b/assets/sounds/server_sfx/itemdrop.wav
diff --git a/assets/sounds/server_sfx/itempickup.wav b/assets/sounds/server_sfx/itempickup.wav
diff --git a/assets/sounds/server_sfx/minotaur.wav b/assets/sounds/server_sfx/minotaur.wav
diff --git a/assets/sounds/server_sfx/minotaur_death.wav b/assets/sounds/server_sfx/minotaur_death.wav
diff --git a/assets/sounds/server_sfx/mirror_shatter.mp3 b/assets/sounds/server_sfx/mirror_shatter.mp3
diff --git a/assets/sounds/server_sfx/players_start_theme.mp3 b/assets/sounds/server_sfx/players_start_theme.mp3
diff --git a/assets/sounds/server_sfx/players_start_theme_old.mp3 b/assets/sounds/server_sfx/players_start_theme_old.mp3
diff --git a/assets/sounds/server_sfx/potion.wav b/assets/sounds/server_sfx/potion.wav
diff --git a/assets/sounds/server_sfx/python.wav b/assets/sounds/server_sfx/python.wav
diff --git a/assets/sounds/server_sfx/spell.wav b/assets/sounds/server_sfx/spell.wav
diff --git a/assets/sounds/server_sfx/start_game_dm.flac b/assets/sounds/server_sfx/start_game_dm.flac
diff --git a/assets/sounds/server_sfx/start_game_dm.mp3 b/assets/sounds/server_sfx/start_game_dm.mp3
diff --git a/assets/sounds/server_sfx/sword.wav b/assets/sounds/server_sfx/sword.wav
diff --git a/assets/sounds/server_sfx/teleport.wav b/assets/sounds/server_sfx/teleport.wav
diff --git a/assets/sounds/server_sfx/thunder.wav b/assets/sounds/server_sfx/thunder.wav
diff --git a/assets/sounds/server_sfx/wind.wav b/assets/sounds/server_sfx/wind.wav
diff --git a/assets/sounds/server_sfx/zeus_start_theme.mp3 b/assets/sounds/server_sfx/zeus_start_theme.mp3
diff --git a/config.json b/config.json
@@ -1,25 +1,30 @@
 {
-    "game": {
-      "maze": {
-        "directory": "maps",
-        "procedural": true,
-        "maze_file": "test/itemRoom.maze"
-      }
+  "game": {
+    "maze": {
+      "directory": "maps",
+      "procedural": false,
+      "maze_file": "demo/game1_player_pov.maze"
     },
-    "network": {
-        "server_ip": "localhost",
-        "server_port": 2355
-    },
-    "server": {
-        "lobby_name": "Hope you're doing well!",
-        "lobby_broadcast": true,
-        "max_players": 1
-    },
-    "client": {
-        "default_name": "Conan O'Brien",
-        "lobby_discovery": true,
-        "window_width": 2000,
-        "draw_bboxes": false,
-        "fps_counter": true
-    }
+    "disable_enemies": false
+  },
+  "network": {
+    "server_ip": "localhost",
+    "server_port": 2355
+  },
+  "server": {
+    "lobby_name": "Funny Lobby Name Here",
+    "lobby_broadcast": true,
+    "max_players": 4,
+    "disable_dm": false,
+    "skip_intro": false 
+  },
+  "client": {
+    "default_name": "Conan O'Brien",
+    "lobby_discovery": true,
+    "fullscreen": true,
+    "draw_bboxes": false,
+    "fps_counter": true,
+    "presentation": false,
+    "render": 80
+  }
 }