add files.txt to gitignore

remove images that accidentally made it into the merge
2024-03-06 20:37:03 -06:00 · 2024-03-06 20:36:46 -06:00
46 changed files with 1 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,6 +18,7 @@ ehthumbs_vista.db
 log.txt
 errors.txt
 traceback.txt
+files.txt


 #Vim (best text editor) swap files
--- a/game/images/backgrounds/bg_principalsoffice_base.png
+++ b/game/images/backgrounds/bg_principalsoffice_base.png
--- a/game/images/backgrounds/bg_principalsoffice_text.png
+++ b/game/images/backgrounds/bg_principalsoffice_text.png
--- a/game/images/backgrounds/cafeteria/bg_cafeteria_winter_base.png
+++ b/game/images/backgrounds/cafeteria/bg_cafeteria_winter_base.png
--- a/game/images/backgrounds/cafeteria/bg_cafeteria_winter_text.png
+++ b/game/images/backgrounds/cafeteria/bg_cafeteria_winter_text.png
--- a/game/images/cgs/cg_contestpainting_base.png
+++ b/game/images/cgs/cg_contestpainting_base.png
--- a/game/images/cgs/cg_contestpainting_words.png
+++ b/game/images/cgs/cg_contestpainting_words.png
--- a/game/images/cgs/hospital/cg_a01.png
+++ b/game/images/cgs/hospital/cg_a01.png
--- a/game/images/cgs/hospital/cg_a01_base.png
+++ b/game/images/cgs/hospital/cg_a01_base.png
--- a/game/images/cgs/hospital/cg_a01_rat.png
+++ b/game/images/cgs/hospital/cg_a01_rat.png
--- a/game/images/cgs/hospital/cg_a01_text.png
+++ b/game/images/cgs/hospital/cg_a01_text.png
--- a/game/images/cgs/hospital/cg_a02.png
+++ b/game/images/cgs/hospital/cg_a02.png
--- a/game/images/cgs/hospital/cg_a03.png
+++ b/game/images/cgs/hospital/cg_a03.png
--- a/game/images/cgs/hospital/cg_a04.png
+++ b/game/images/cgs/hospital/cg_a04.png
--- a/game/images/cgs/hospital/cg_a05.png
+++ b/game/images/cgs/hospital/cg_a05.png
--- a/game/images/cgs/hospital/cg_a06_base.png
+++ b/game/images/cgs/hospital/cg_a06_base.png
--- a/game/images/cgs/hospital/cg_a06_text.png
+++ b/game/images/cgs/hospital/cg_a06_text.png
--- a/game/images/cgs/hospital/cg_a07.png
+++ b/game/images/cgs/hospital/cg_a07.png
--- a/game/images/cgs/hospital/cg_a07a.png
+++ b/game/images/cgs/hospital/cg_a07a.png
--- a/game/images/cgs/hospital/cg_a08.png
+++ b/game/images/cgs/hospital/cg_a08.png
--- a/game/images/cgs/hospital/cg_a09.png
+++ b/game/images/cgs/hospital/cg_a09.png
--- a/game/images/doodles/ddl_bigBoy_base.png
+++ b/game/images/doodles/ddl_bigBoy_base.png
--- a/game/images/doodles/ddl_bigBoy_words.png
+++ b/game/images/doodles/ddl_bigBoy_words.png
--- a/game/images/props/spr_lovetester_base.png
+++ b/game/images/props/spr_lovetester_base.png
--- a/game/images/props/spr_lovetester_words.png
+++ b/game/images/props/spr_lovetester_words.png
--- a/game/images/props/spr_macaroni_left_base.png
+++ b/game/images/props/spr_macaroni_left_base.png
--- a/game/images/props/spr_macaroni_left_text.png
+++ b/game/images/props/spr_macaroni_left_text.png
--- a/game/images/props/spr_mug_damien_base.png
+++ b/game/images/props/spr_mug_damien_base.png
--- a/game/images/props/spr_mug_damien_text.png
+++ b/game/images/props/spr_mug_damien_text.png
--- a/game/images/props/spr_mug_inco_base.png
+++ b/game/images/props/spr_mug_inco_base.png
--- a/game/images/props/spr_mug_inco_text.png
+++ b/game/images/props/spr_mug_inco_text.png
--- a/game/images/props/spr_mug_olivia_base.png
+++ b/game/images/props/spr_mug_olivia_base.png
--- a/game/images/props/spr_mug_olivia_text.png
+++ b/game/images/props/spr_mug_olivia_text.png
--- a/game/images/props/spr_mug_vinny_base.png
+++ b/game/images/props/spr_mug_vinny_base.png
--- a/game/images/props/spr_mug_vinny_text.png
+++ b/game/images/props/spr_mug_vinny_text.png
--- a/game/tl/es/images/backgrounds/bg_principalsoffice_text.png
+++ b/game/tl/es/images/backgrounds/bg_principalsoffice_text.png
--- a/game/tl/es/images/backgrounds/cafeteria/bg_cafeteria_winter_text.png
+++ b/game/tl/es/images/backgrounds/cafeteria/bg_cafeteria_winter_text.png
--- a/game/tl/es/images/cgs/cg_contestpainting_words.png
+++ b/game/tl/es/images/cgs/cg_contestpainting_words.png
--- a/game/tl/es/images/cgs/hospital/cg_a01_text.png
+++ b/game/tl/es/images/cgs/hospital/cg_a01_text.png
--- a/game/tl/es/images/cgs/hospital/cg_a06_text.png
+++ b/game/tl/es/images/cgs/hospital/cg_a06_text.png
--- a/game/tl/es/images/doodles/ddl_bigBoy_words.png
+++ b/game/tl/es/images/doodles/ddl_bigBoy_words.png
--- a/game/tl/es/images/fullbody/sketchbook/fb_sketchbook_doodles_words.png
+++ b/game/tl/es/images/fullbody/sketchbook/fb_sketchbook_doodles_words.png
--- a/game/tl/es/images/fullbody/sketchbook/fb_sketchbook_inco_askout_words.png
+++ b/game/tl/es/images/fullbody/sketchbook/fb_sketchbook_inco_askout_words.png
--- a/game/tl/es/images/fullbody/sketchbook/fb_sketchbook_olivia_hug_words.png
+++ b/game/tl/es/images/fullbody/sketchbook/fb_sketchbook_olivia_hug_words.png
--- a/game/tl/es/images/props/spr_lovetester_words.png
+++ b/game/tl/es/images/props/spr_lovetester_words.png
--- a/game/tl/es/images/props/spr_macaroni_left_text.png
+++ b/game/tl/es/images/props/spr_macaroni_left_text.png
Author	SHA1	Message	Date
Mappening	f8728979ca	add files.txt to gitignore	2024-03-06 20:37:03 -06:00
Mappening	355a259e29	remove images that accidentally made it into the merge	2024-03-06 20:36:46 -06:00