From 156a760ebab6839c53f9c613881f0937e814414a Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 22 May 2020 17:02:32 -0500 Subject: Full revert to tag 2.6.2 Due to a countless number of changes made to the core that were not fully understood, tested, or documented, it was decided to roll everything back to the last known stable version (2.6.2). Changes dropped include: - Witness needed - Shake - Frame SFX - Multiple custom objections - Multithreaded thumbnail generation - Looping - Various translation additions - "Mirror IC" - Color in IC log - An invocation of clang-format Next time, work together and split your big fork into independently testable feature branches. --- .gitignore | 4 ---- 1 file changed, 4 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 3f8b3ae4..1adb744f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ *.dll *.so *.pro.autosave -*.pro.user base_override.h .DS_Store @@ -22,7 +21,6 @@ debug/ Makefile* object_script* -/android/gradle* /Attorney_Online_remake_resource.rc /attorney_online_remake_plugin_import.cpp @@ -33,5 +31,3 @@ discord/ moc* /Attorney_Online_CC_resource.rc /attorney_online_cc_plugin_import.cpp - -*.autosave -- cgit From df8f19320b3a37521a7f93a578bf31c81f885238 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Fri, 22 May 2020 19:35:49 -0500 Subject: Bring back CI changes and macOS support --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 1adb744f..3f8b3ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ *.dll *.so *.pro.autosave +*.pro.user base_override.h .DS_Store @@ -21,6 +22,7 @@ debug/ Makefile* object_script* +/android/gradle* /Attorney_Online_remake_resource.rc /attorney_online_remake_plugin_import.cpp @@ -31,3 +33,5 @@ discord/ moc* /Attorney_Online_CC_resource.rc /attorney_online_cc_plugin_import.cpp + +*.autosave -- cgit From f0a0ecb983a5e160adaefca139f0fe034cb11062 Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 23 May 2020 18:53:31 +0200 Subject: ignore the logs --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 3f8b3ae4..212daeca 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ base_override.h base-full/ base/ +logs/ bass.lib bin/ -- cgit From ab00005bf7d4ffde047f30bad622de35e7485c51 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sun, 31 May 2020 21:20:59 -0500 Subject: Update themes submodule --- .gitignore | 1 - 1 file changed, 1 deletion(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 212daeca..eb0b9792 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ base_override.h .DS_Store base-full/ -base/ logs/ bass.lib -- cgit From 6cc7d7dd6d22dd684e2f4fe1cc4c76c5e0fc4950 Mon Sep 17 00:00:00 2001 From: likeawindrammer <31085911+likeawindrammer@users.noreply.github.com> Date: Thu, 30 Jul 2020 21:13:49 -0600 Subject: Adds background, characters and sounds to gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index eb0b9792..37f16122 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,9 @@ bins/ build/ release/ debug/ +base/background +base/characters +base/sounds .qmake.stash -- cgit From 204d6c4b79e46eae42eb424a884841efcfbe3a94 Mon Sep 17 00:00:00 2001 From: likeawindrammer <31085911+likeawindrammer@users.noreply.github.com> Date: Thu, 30 Jul 2020 22:06:04 -0600 Subject: Add callwords.ini and config.ini to gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index 37f16122..fedae9d9 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,8 @@ debug/ base/background base/characters base/sounds +base/callwords.ini +base/config.ini .qmake.stash -- cgit