diff --git a/data/ui/background.jpg b/data/ui/background.jpg deleted file mode 100644 index fdde4fbd..00000000 Binary files a/data/ui/background.jpg and /dev/null differ diff --git a/data/ui/crosshair.png b/data/ui/crosshair.png deleted file mode 100644 index 6a5af504..00000000 Binary files a/data/ui/crosshair.png and /dev/null differ diff --git a/data/ui/gglogo150.png b/data/ui/gglogo150.png deleted file mode 100644 index b6e4d4a0..00000000 Binary files a/data/ui/gglogo150.png and /dev/null differ diff --git a/data/ui/help/help_gui.png b/data/ui/help/help_gui.png deleted file mode 100644 index 64d6fb0d..00000000 Binary files a/data/ui/help/help_gui.png and /dev/null differ diff --git a/data/ui/help/help_window.png b/data/ui/help/help_window.png deleted file mode 100644 index d801171a..00000000 Binary files a/data/ui/help/help_window.png and /dev/null differ diff --git a/data/ui/home/exit_d.png b/data/ui/home/exit_d.png deleted file mode 100644 index 7dd6ee0f..00000000 Binary files a/data/ui/home/exit_d.png and /dev/null differ diff --git a/data/ui/home/exit_h.png b/data/ui/home/exit_h.png deleted file mode 100644 index 42bd9a6b..00000000 Binary files a/data/ui/home/exit_h.png and /dev/null differ diff --git a/data/ui/home/exit_n.png b/data/ui/home/exit_n.png deleted file mode 100644 index 92a0a40a..00000000 Binary files a/data/ui/home/exit_n.png and /dev/null differ diff --git a/data/ui/home/help_d.png b/data/ui/home/help_d.png deleted file mode 100644 index c514f1b7..00000000 Binary files a/data/ui/home/help_d.png and /dev/null differ diff --git a/data/ui/home/help_h.png b/data/ui/home/help_h.png deleted file mode 100644 index cbae4a37..00000000 Binary files a/data/ui/home/help_h.png and /dev/null differ diff --git a/data/ui/home/help_n.png b/data/ui/home/help_n.png deleted file mode 100644 index d1e3ba08..00000000 Binary files a/data/ui/home/help_n.png and /dev/null differ diff --git a/data/ui/home/homegui.png b/data/ui/home/homegui.png deleted file mode 100644 index 3469131b..00000000 Binary files a/data/ui/home/homegui.png and /dev/null differ diff --git a/data/ui/home/options_d.png b/data/ui/home/options_d.png deleted file mode 100644 index b83e1805..00000000 Binary files a/data/ui/home/options_d.png and /dev/null differ diff --git a/data/ui/home/options_h.png b/data/ui/home/options_h.png deleted file mode 100644 index 9683813d..00000000 Binary files a/data/ui/home/options_h.png and /dev/null differ diff --git a/data/ui/home/options_n.png b/data/ui/home/options_n.png deleted file mode 100644 index 1252e8f8..00000000 Binary files a/data/ui/home/options_n.png and /dev/null differ diff --git a/data/ui/home/play_d.png b/data/ui/home/play_d.png deleted file mode 100644 index 14a5b84a..00000000 Binary files a/data/ui/home/play_d.png and /dev/null differ diff --git a/data/ui/home/play_h.png b/data/ui/home/play_h.png deleted file mode 100644 index 5a193aae..00000000 Binary files a/data/ui/home/play_h.png and /dev/null differ diff --git a/data/ui/home/play_n.png b/data/ui/home/play_n.png deleted file mode 100644 index 6d54d4a0..00000000 Binary files a/data/ui/home/play_n.png and /dev/null differ diff --git a/data/ui/hudfill.png b/data/ui/hudfill.png deleted file mode 100644 index e435854d..00000000 Binary files a/data/ui/hudfill.png and /dev/null differ diff --git a/data/ui/lagicon.png b/data/ui/lagicon.png deleted file mode 100644 index cf158dd6..00000000 Binary files a/data/ui/lagicon.png and /dev/null differ diff --git a/data/ui/menu/menu.cs.dso b/data/ui/menu/menu.cs.dso deleted file mode 100644 index 5cdf54f6..00000000 Binary files a/data/ui/menu/menu.cs.dso and /dev/null differ diff --git a/data/ui/motd/mess_buttn_d.png b/data/ui/motd/mess_buttn_d.png deleted file mode 100644 index 16f8e54f..00000000 Binary files a/data/ui/motd/mess_buttn_d.png and /dev/null differ diff --git a/data/ui/motd/mess_buttn_h.png b/data/ui/motd/mess_buttn_h.png deleted file mode 100644 index 0fae3706..00000000 Binary files a/data/ui/motd/mess_buttn_h.png and /dev/null differ diff --git a/data/ui/motd/mess_buttn_n.png b/data/ui/motd/mess_buttn_n.png deleted file mode 100644 index eef3f861..00000000 Binary files a/data/ui/motd/mess_buttn_n.png and /dev/null differ diff --git a/data/ui/motd/motd_buttn_d.png b/data/ui/motd/motd_buttn_d.png deleted file mode 100644 index 19d8a75e..00000000 Binary files a/data/ui/motd/motd_buttn_d.png and /dev/null differ diff --git a/data/ui/motd/motd_buttn_h.png b/data/ui/motd/motd_buttn_h.png deleted file mode 100644 index 928a538c..00000000 Binary files a/data/ui/motd/motd_buttn_h.png and /dev/null differ diff --git a/data/ui/motd/motd_buttn_n.png b/data/ui/motd/motd_buttn_n.png deleted file mode 100644 index 2813b8f6..00000000 Binary files a/data/ui/motd/motd_buttn_n.png and /dev/null differ diff --git a/data/ui/ok_d.png b/data/ui/ok_d.png deleted file mode 100644 index 92206f35..00000000 Binary files a/data/ui/ok_d.png and /dev/null differ diff --git a/data/ui/ok_h.png b/data/ui/ok_h.png deleted file mode 100644 index 25014375..00000000 Binary files a/data/ui/ok_h.png and /dev/null differ diff --git a/data/ui/ok_n.png b/data/ui/ok_n.png deleted file mode 100644 index 55bef933..00000000 Binary files a/data/ui/ok_n.png and /dev/null differ diff --git a/data/ui/options/aud_mus_knb.png b/data/ui/options/aud_mus_knb.png deleted file mode 100644 index 4f84c66f..00000000 Binary files a/data/ui/options/aud_mus_knb.png and /dev/null differ diff --git a/data/ui/options/aud_mus_slide.png b/data/ui/options/aud_mus_slide.png deleted file mode 100644 index 47474104..00000000 Binary files a/data/ui/options/aud_mus_slide.png and /dev/null differ diff --git a/data/ui/options/aud_snd_knb.png b/data/ui/options/aud_snd_knb.png deleted file mode 100644 index 4ca45da1..00000000 Binary files a/data/ui/options/aud_snd_knb.png and /dev/null differ diff --git a/data/ui/options/aud_snd_slide.png b/data/ui/options/aud_snd_slide.png deleted file mode 100644 index 6a5abe82..00000000 Binary files a/data/ui/options/aud_snd_slide.png and /dev/null differ diff --git a/data/ui/options/aud_tab.png b/data/ui/options/aud_tab.png deleted file mode 100644 index a5b39198..00000000 Binary files a/data/ui/options/aud_tab.png and /dev/null differ diff --git a/data/ui/options/aud_txt_wndo.png b/data/ui/options/aud_txt_wndo.png deleted file mode 100644 index 992a46c3..00000000 Binary files a/data/ui/options/aud_txt_wndo.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_dwn_d.png b/data/ui/options/cntr_cam_dwn_d.png deleted file mode 100644 index d01467cc..00000000 Binary files a/data/ui/options/cntr_cam_dwn_d.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_dwn_h.png b/data/ui/options/cntr_cam_dwn_h.png deleted file mode 100644 index 245f91a9..00000000 Binary files a/data/ui/options/cntr_cam_dwn_h.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_dwn_n.png b/data/ui/options/cntr_cam_dwn_n.png deleted file mode 100644 index dc4aa0c7..00000000 Binary files a/data/ui/options/cntr_cam_dwn_n.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_lft_d.png b/data/ui/options/cntr_cam_lft_d.png deleted file mode 100644 index 0506c5c8..00000000 Binary files a/data/ui/options/cntr_cam_lft_d.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_lft_h.png b/data/ui/options/cntr_cam_lft_h.png deleted file mode 100644 index f8b27fb8..00000000 Binary files a/data/ui/options/cntr_cam_lft_h.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_lft_n.png b/data/ui/options/cntr_cam_lft_n.png deleted file mode 100644 index 4391b7f7..00000000 Binary files a/data/ui/options/cntr_cam_lft_n.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_rt_d.png b/data/ui/options/cntr_cam_rt_d.png deleted file mode 100644 index d5234388..00000000 Binary files a/data/ui/options/cntr_cam_rt_d.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_rt_h.png b/data/ui/options/cntr_cam_rt_h.png deleted file mode 100644 index 95c939f3..00000000 Binary files a/data/ui/options/cntr_cam_rt_h.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_rt_n.png b/data/ui/options/cntr_cam_rt_n.png deleted file mode 100644 index cd123e92..00000000 Binary files a/data/ui/options/cntr_cam_rt_n.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_up_d.png b/data/ui/options/cntr_cam_up_d.png deleted file mode 100644 index 6264fb12..00000000 Binary files a/data/ui/options/cntr_cam_up_d.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_up_h.png b/data/ui/options/cntr_cam_up_h.png deleted file mode 100644 index c53dc960..00000000 Binary files a/data/ui/options/cntr_cam_up_h.png and /dev/null differ diff --git a/data/ui/options/cntr_cam_up_n.png b/data/ui/options/cntr_cam_up_n.png deleted file mode 100644 index 01fe8a1a..00000000 Binary files a/data/ui/options/cntr_cam_up_n.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_bak_d.png b/data/ui/options/cntr_mrb_bak_d.png deleted file mode 100644 index 42bd7942..00000000 Binary files a/data/ui/options/cntr_mrb_bak_d.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_bak_h.png b/data/ui/options/cntr_mrb_bak_h.png deleted file mode 100644 index 979af577..00000000 Binary files a/data/ui/options/cntr_mrb_bak_h.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_bak_n.png b/data/ui/options/cntr_mrb_bak_n.png deleted file mode 100644 index ec32d207..00000000 Binary files a/data/ui/options/cntr_mrb_bak_n.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_fw_d.png b/data/ui/options/cntr_mrb_fw_d.png deleted file mode 100644 index 18a3e3ae..00000000 Binary files a/data/ui/options/cntr_mrb_fw_d.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_fw_h.png b/data/ui/options/cntr_mrb_fw_h.png deleted file mode 100644 index bf51fdde..00000000 Binary files a/data/ui/options/cntr_mrb_fw_h.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_fw_n.png b/data/ui/options/cntr_mrb_fw_n.png deleted file mode 100644 index 8d5ea32c..00000000 Binary files a/data/ui/options/cntr_mrb_fw_n.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_jmp_d.png b/data/ui/options/cntr_mrb_jmp_d.png deleted file mode 100644 index 4e693d6c..00000000 Binary files a/data/ui/options/cntr_mrb_jmp_d.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_jmp_h.png b/data/ui/options/cntr_mrb_jmp_h.png deleted file mode 100644 index fba24da2..00000000 Binary files a/data/ui/options/cntr_mrb_jmp_h.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_jmp_n.png b/data/ui/options/cntr_mrb_jmp_n.png deleted file mode 100644 index 71114312..00000000 Binary files a/data/ui/options/cntr_mrb_jmp_n.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_lft_d.png b/data/ui/options/cntr_mrb_lft_d.png deleted file mode 100644 index c66bc6af..00000000 Binary files a/data/ui/options/cntr_mrb_lft_d.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_lft_h.png b/data/ui/options/cntr_mrb_lft_h.png deleted file mode 100644 index 23a2c97e..00000000 Binary files a/data/ui/options/cntr_mrb_lft_h.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_lft_n.png b/data/ui/options/cntr_mrb_lft_n.png deleted file mode 100644 index 14447615..00000000 Binary files a/data/ui/options/cntr_mrb_lft_n.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_pwr_d.png b/data/ui/options/cntr_mrb_pwr_d.png deleted file mode 100644 index 60210d0f..00000000 Binary files a/data/ui/options/cntr_mrb_pwr_d.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_pwr_h.png b/data/ui/options/cntr_mrb_pwr_h.png deleted file mode 100644 index 4f9c0188..00000000 Binary files a/data/ui/options/cntr_mrb_pwr_h.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_pwr_n.png b/data/ui/options/cntr_mrb_pwr_n.png deleted file mode 100644 index ac05022e..00000000 Binary files a/data/ui/options/cntr_mrb_pwr_n.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_rt_d.png b/data/ui/options/cntr_mrb_rt_d.png deleted file mode 100644 index e771c78e..00000000 Binary files a/data/ui/options/cntr_mrb_rt_d.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_rt_h.png b/data/ui/options/cntr_mrb_rt_h.png deleted file mode 100644 index 1e7833e4..00000000 Binary files a/data/ui/options/cntr_mrb_rt_h.png and /dev/null differ diff --git a/data/ui/options/cntr_mrb_rt_n.png b/data/ui/options/cntr_mrb_rt_n.png deleted file mode 100644 index 622c3401..00000000 Binary files a/data/ui/options/cntr_mrb_rt_n.png and /dev/null differ diff --git a/data/ui/options/cntr_rwnd_d.png b/data/ui/options/cntr_rwnd_d.png deleted file mode 100644 index be3521f4..00000000 Binary files a/data/ui/options/cntr_rwnd_d.png and /dev/null differ diff --git a/data/ui/options/cntr_rwnd_h.png b/data/ui/options/cntr_rwnd_h.png deleted file mode 100644 index e69c5b61..00000000 Binary files a/data/ui/options/cntr_rwnd_h.png and /dev/null differ diff --git a/data/ui/options/cntr_rwnd_n.png b/data/ui/options/cntr_rwnd_n.png deleted file mode 100644 index 3c57d4a0..00000000 Binary files a/data/ui/options/cntr_rwnd_n.png and /dev/null differ diff --git a/data/ui/options/cntr_tab.png b/data/ui/options/cntr_tab.png deleted file mode 100644 index 1d6ffc40..00000000 Binary files a/data/ui/options/cntr_tab.png and /dev/null differ diff --git a/data/ui/options/cntrl_cam_bse.png b/data/ui/options/cntrl_cam_bse.png deleted file mode 100644 index bbd95a80..00000000 Binary files a/data/ui/options/cntrl_cam_bse.png and /dev/null differ diff --git a/data/ui/options/cntrl_marb_bse.png b/data/ui/options/cntrl_marb_bse.png deleted file mode 100644 index 8b9ec865..00000000 Binary files a/data/ui/options/cntrl_marb_bse.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_base.png b/data/ui/options/cntrl_mous_base.png deleted file mode 100644 index edd01c67..00000000 Binary files a/data/ui/options/cntrl_mous_base.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_bttn_d.png b/data/ui/options/cntrl_mous_bttn_d.png deleted file mode 100644 index ef1f9374..00000000 Binary files a/data/ui/options/cntrl_mous_bttn_d.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_bttn_h.png b/data/ui/options/cntrl_mous_bttn_h.png deleted file mode 100644 index 8528128c..00000000 Binary files a/data/ui/options/cntrl_mous_bttn_h.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_bttn_n.png b/data/ui/options/cntrl_mous_bttn_n.png deleted file mode 100644 index 8254e164..00000000 Binary files a/data/ui/options/cntrl_mous_bttn_n.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_freel_d.png b/data/ui/options/cntrl_mous_freel_d.png deleted file mode 100644 index 666d0f7d..00000000 Binary files a/data/ui/options/cntrl_mous_freel_d.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_freel_h.png b/data/ui/options/cntrl_mous_freel_h.png deleted file mode 100644 index 94c0568e..00000000 Binary files a/data/ui/options/cntrl_mous_freel_h.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_freel_n.png b/data/ui/options/cntrl_mous_freel_n.png deleted file mode 100644 index 6e64fc65..00000000 Binary files a/data/ui/options/cntrl_mous_freel_n.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_invrt_d.png b/data/ui/options/cntrl_mous_invrt_d.png deleted file mode 100644 index 01bbdccb..00000000 Binary files a/data/ui/options/cntrl_mous_invrt_d.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_invrt_h.png b/data/ui/options/cntrl_mous_invrt_h.png deleted file mode 100644 index 8d3982d8..00000000 Binary files a/data/ui/options/cntrl_mous_invrt_h.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_invrt_n.png b/data/ui/options/cntrl_mous_invrt_n.png deleted file mode 100644 index efd7db1e..00000000 Binary files a/data/ui/options/cntrl_mous_invrt_n.png and /dev/null differ diff --git a/data/ui/options/cntrl_mous_knb.png b/data/ui/options/cntrl_mous_knb.png deleted file mode 100644 index 429c43f4..00000000 Binary files a/data/ui/options/cntrl_mous_knb.png and /dev/null differ diff --git a/data/ui/options/graf1024_d.png b/data/ui/options/graf1024_d.png deleted file mode 100644 index 20e2ae9f..00000000 Binary files a/data/ui/options/graf1024_d.png and /dev/null differ diff --git a/data/ui/options/graf1024_h.png b/data/ui/options/graf1024_h.png deleted file mode 100644 index 0a06f391..00000000 Binary files a/data/ui/options/graf1024_h.png and /dev/null differ diff --git a/data/ui/options/graf1024_n.png b/data/ui/options/graf1024_n.png deleted file mode 100644 index e79dfe51..00000000 Binary files a/data/ui/options/graf1024_n.png and /dev/null differ diff --git a/data/ui/options/graf16bt_d.png b/data/ui/options/graf16bt_d.png deleted file mode 100644 index c1fe91ad..00000000 Binary files a/data/ui/options/graf16bt_d.png and /dev/null differ diff --git a/data/ui/options/graf16bt_h.png b/data/ui/options/graf16bt_h.png deleted file mode 100644 index 4903b22f..00000000 Binary files a/data/ui/options/graf16bt_h.png and /dev/null differ diff --git a/data/ui/options/graf16bt_n.png b/data/ui/options/graf16bt_n.png deleted file mode 100644 index 5162810f..00000000 Binary files a/data/ui/options/graf16bt_n.png and /dev/null differ diff --git a/data/ui/options/graf32bt_d.png b/data/ui/options/graf32bt_d.png deleted file mode 100644 index 6bf02bfc..00000000 Binary files a/data/ui/options/graf32bt_d.png and /dev/null differ diff --git a/data/ui/options/graf32bt_h.png b/data/ui/options/graf32bt_h.png deleted file mode 100644 index 1834809b..00000000 Binary files a/data/ui/options/graf32bt_h.png and /dev/null differ diff --git a/data/ui/options/graf32bt_n.png b/data/ui/options/graf32bt_n.png deleted file mode 100644 index 9cef231e..00000000 Binary files a/data/ui/options/graf32bt_n.png and /dev/null differ diff --git a/data/ui/options/graf640_d.png b/data/ui/options/graf640_d.png deleted file mode 100644 index c30ebed2..00000000 Binary files a/data/ui/options/graf640_d.png and /dev/null differ diff --git a/data/ui/options/graf640_h.png b/data/ui/options/graf640_h.png deleted file mode 100644 index 4efd22d4..00000000 Binary files a/data/ui/options/graf640_h.png and /dev/null differ diff --git a/data/ui/options/graf640_n.png b/data/ui/options/graf640_n.png deleted file mode 100644 index 05620fff..00000000 Binary files a/data/ui/options/graf640_n.png and /dev/null differ diff --git a/data/ui/options/graf800_d.png b/data/ui/options/graf800_d.png deleted file mode 100644 index c9dd0674..00000000 Binary files a/data/ui/options/graf800_d.png and /dev/null differ diff --git a/data/ui/options/graf800_h.png b/data/ui/options/graf800_h.png deleted file mode 100644 index fe8a6406..00000000 Binary files a/data/ui/options/graf800_h.png and /dev/null differ diff --git a/data/ui/options/graf800_n.png b/data/ui/options/graf800_n.png deleted file mode 100644 index 4a046424..00000000 Binary files a/data/ui/options/graf800_n.png and /dev/null differ diff --git a/data/ui/options/graf_chkbx_d.png b/data/ui/options/graf_chkbx_d.png deleted file mode 100644 index 0307c490..00000000 Binary files a/data/ui/options/graf_chkbx_d.png and /dev/null differ diff --git a/data/ui/options/graf_chkbx_h.png b/data/ui/options/graf_chkbx_h.png deleted file mode 100644 index 4a9700ea..00000000 Binary files a/data/ui/options/graf_chkbx_h.png and /dev/null differ diff --git a/data/ui/options/graf_chkbx_n.png b/data/ui/options/graf_chkbx_n.png deleted file mode 100644 index f4851aa2..00000000 Binary files a/data/ui/options/graf_chkbx_n.png and /dev/null differ diff --git a/data/ui/options/graf_tab.png b/data/ui/options/graf_tab.png deleted file mode 100644 index dc80e8d5..00000000 Binary files a/data/ui/options/graf_tab.png and /dev/null differ diff --git a/data/ui/options/graf_txt.png b/data/ui/options/graf_txt.png deleted file mode 100644 index 627b2b55..00000000 Binary files a/data/ui/options/graf_txt.png and /dev/null differ diff --git a/data/ui/options/grafapply_d.png b/data/ui/options/grafapply_d.png deleted file mode 100644 index 0430ca81..00000000 Binary files a/data/ui/options/grafapply_d.png and /dev/null differ diff --git a/data/ui/options/grafapply_h.png b/data/ui/options/grafapply_h.png deleted file mode 100644 index 0f729449..00000000 Binary files a/data/ui/options/grafapply_h.png and /dev/null differ diff --git a/data/ui/options/grafapply_n.png b/data/ui/options/grafapply_n.png deleted file mode 100644 index 41b69222..00000000 Binary files a/data/ui/options/grafapply_n.png and /dev/null differ diff --git a/data/ui/options/grafdir3d_d.png b/data/ui/options/grafdir3d_d.png deleted file mode 100644 index 776bb04b..00000000 Binary files a/data/ui/options/grafdir3d_d.png and /dev/null differ diff --git a/data/ui/options/grafdir3d_h.png b/data/ui/options/grafdir3d_h.png deleted file mode 100644 index b57bace5..00000000 Binary files a/data/ui/options/grafdir3d_h.png and /dev/null differ diff --git a/data/ui/options/grafdir3d_n.png b/data/ui/options/grafdir3d_n.png deleted file mode 100644 index bfe14bcf..00000000 Binary files a/data/ui/options/grafdir3d_n.png and /dev/null differ diff --git a/data/ui/options/grafful_d.png b/data/ui/options/grafful_d.png deleted file mode 100644 index c18b1786..00000000 Binary files a/data/ui/options/grafful_d.png and /dev/null differ diff --git a/data/ui/options/grafful_h.png b/data/ui/options/grafful_h.png deleted file mode 100644 index 1ed4a2e1..00000000 Binary files a/data/ui/options/grafful_h.png and /dev/null differ diff --git a/data/ui/options/grafful_n.png b/data/ui/options/grafful_n.png deleted file mode 100644 index 62c6b432..00000000 Binary files a/data/ui/options/grafful_n.png and /dev/null differ diff --git a/data/ui/options/grafopgl_d.png b/data/ui/options/grafopgl_d.png deleted file mode 100644 index e791011f..00000000 Binary files a/data/ui/options/grafopgl_d.png and /dev/null differ diff --git a/data/ui/options/grafopgl_h.png b/data/ui/options/grafopgl_h.png deleted file mode 100644 index 1fcd0579..00000000 Binary files a/data/ui/options/grafopgl_h.png and /dev/null differ diff --git a/data/ui/options/grafopgl_n.png b/data/ui/options/grafopgl_n.png deleted file mode 100644 index 1f722880..00000000 Binary files a/data/ui/options/grafopgl_n.png and /dev/null differ diff --git a/data/ui/options/grafwindo_d.png b/data/ui/options/grafwindo_d.png deleted file mode 100644 index 91e31f74..00000000 Binary files a/data/ui/options/grafwindo_d.png and /dev/null differ diff --git a/data/ui/options/grafwindo_h.png b/data/ui/options/grafwindo_h.png deleted file mode 100644 index 82cc2c16..00000000 Binary files a/data/ui/options/grafwindo_h.png and /dev/null differ diff --git a/data/ui/options/grafwindo_n.png b/data/ui/options/grafwindo_n.png deleted file mode 100644 index 340c1c36..00000000 Binary files a/data/ui/options/grafwindo_n.png and /dev/null differ diff --git a/data/ui/optionsgui.png b/data/ui/optionsgui.png deleted file mode 100644 index 457e9952..00000000 Binary files a/data/ui/optionsgui.png and /dev/null differ diff --git a/data/ui/play/back_d.png b/data/ui/play/back_d.png deleted file mode 100644 index f6183689..00000000 Binary files a/data/ui/play/back_d.png and /dev/null differ diff --git a/data/ui/play/back_h.png b/data/ui/play/back_h.png deleted file mode 100644 index 7e0cf388..00000000 Binary files a/data/ui/play/back_h.png and /dev/null differ diff --git a/data/ui/play/back_i.png b/data/ui/play/back_i.png deleted file mode 100644 index 040f9608..00000000 Binary files a/data/ui/play/back_i.png and /dev/null differ diff --git a/data/ui/play/back_n.png b/data/ui/play/back_n.png deleted file mode 100644 index fada42d0..00000000 Binary files a/data/ui/play/back_n.png and /dev/null differ diff --git a/data/ui/play/cust_tab.png b/data/ui/play/cust_tab.png deleted file mode 100644 index 7a3af762..00000000 Binary files a/data/ui/play/cust_tab.png and /dev/null differ diff --git a/data/ui/play/goldscore.png b/data/ui/play/goldscore.png deleted file mode 100644 index a5f1674e..00000000 Binary files a/data/ui/play/goldscore.png and /dev/null differ diff --git a/data/ui/play/level_window.png b/data/ui/play/level_window.png deleted file mode 100644 index 8c5d5397..00000000 Binary files a/data/ui/play/level_window.png and /dev/null differ diff --git a/data/ui/play/playgui.png b/data/ui/play/playgui.png deleted file mode 100644 index 16616298..00000000 Binary files a/data/ui/play/playgui.png and /dev/null differ diff --git a/data/ui/play/tab_adv.png b/data/ui/play/tab_adv.png deleted file mode 100644 index aa562b6f..00000000 Binary files a/data/ui/play/tab_adv.png and /dev/null differ diff --git a/data/ui/play/tab_begin.png b/data/ui/play/tab_begin.png deleted file mode 100644 index 18725dd3..00000000 Binary files a/data/ui/play/tab_begin.png and /dev/null differ diff --git a/data/ui/play/tab_inter.png b/data/ui/play/tab_inter.png deleted file mode 100644 index 240248c9..00000000 Binary files a/data/ui/play/tab_inter.png and /dev/null differ diff --git a/data/ui/presents.jpg b/data/ui/presents.jpg deleted file mode 100644 index 7a2a9137..00000000 Binary files a/data/ui/presents.jpg and /dev/null differ diff --git a/data/ui/production.jpg b/data/ui/production.jpg deleted file mode 100644 index 74c1c3f9..00000000 Binary files a/data/ui/production.jpg and /dev/null differ diff --git a/data/ui/title.jpg b/data/ui/title.jpg deleted file mode 100644 index 909c0aeb..00000000 Binary files a/data/ui/title.jpg and /dev/null differ diff --git a/src/DtsObject.hx b/src/DtsObject.hx index 3dfdb9c2..fdb8352d 100644 --- a/src/DtsObject.hx +++ b/src/DtsObject.hx @@ -513,7 +513,7 @@ class DtsObject extends GameObject { hs.normals = []; hs.indices = []; - var material = this.dts.matNames[primitive.matIndex]; + var material = this.dts.matNames[primitive.matIndex & TSDrawPrimitive.MaterialMask]; if (dtsMaterials.exists(material)) { var data = dtsMaterials.get(material); hs.friction = data.friction; diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index 23324c88..65e88485 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -1556,7 +1556,8 @@ class MarbleWorld extends Scheduler { sub = this.currentCheckpoint.elem.fields.get('sub')[0]; } if (this.currentCheckpointTrigger != null) { - offset = this.currentCheckpointTrigger.add; + if (this.currentCheckpointTrigger.add != null) + offset = this.currentCheckpointTrigger.add; } if (add != "") { offset = MisParser.parseVector3(add); diff --git a/src/MissionList.hx b/src/MissionList.hx index 4830de4f..c2234603 100644 --- a/src/MissionList.hx +++ b/src/MissionList.hx @@ -45,6 +45,10 @@ class MissionList { } difficultyMissions.sort((a, b) -> Std.parseInt(a.missionInfo.level) - Std.parseInt(b.missionInfo.level)); + for (i in 0...difficultyMissions.length) { + difficultyMissions[i].index = i; + } + for (i in 0...difficultyMissions.length - 1) { @:privateAccess difficultyMissions[i].next = difficultyMissions[i + 1]; } diff --git a/src/shaders/CubemapRenderer.hx b/src/shaders/CubemapRenderer.hx index 0312aa4a..291930d4 100644 --- a/src/shaders/CubemapRenderer.hx +++ b/src/shaders/CubemapRenderer.hx @@ -20,7 +20,7 @@ class CubemapRenderer { public function new(scene:Scene) { this.scene = scene; this.cubemap = new Texture(128, 128, [Cube, Dynamic, Target]); - this.camera = new Camera(90, 1, 1, 0.02, 100); + this.camera = new Camera(90, 1, 1, 0.02); this.position = new Vector(); this.nextFaceToRender = 0; }