From 211ab65196c451f45ecc922dea74912f5a04c78a Mon Sep 17 00:00:00 2001 From: namespace Date: Fri, 5 Jan 2007 21:59:07 +0000 Subject: [PATCH] - UFO:Alien Invasion Plugin (mattn2) - Fix: Filtering models in ET doesn't filter misc_gamemodels (Shaderman) git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@131 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- CHANGES | 5 +++++ GtkRadiant.sln | 10 ++++++++++ SConscript | 7 +++++++ plugins/entity/entity.cpp | 4 +++- setup/win32/components/ufoai.xml | 13 +++++++++++++ setup/win32/components/ufoaiplug.xml | 17 +++++++++++++++++ setup/win32/gtkradiant-1.5.0.xml | 6 ++++++ 7 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 setup/win32/components/ufoai.xml create mode 100644 setup/win32/components/ufoaiplug.xml diff --git a/CHANGES b/CHANGES index 9afc4b20..801e1483 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,11 @@ This is the changelog for developers, != changelog for the end user that we distribute with the binaries. (see changelog) +05/01/2007 +namespace +- UFO:Alien Invasion Plugin (mattn2) +- Fix: Filtering models in ET doesn't filter misc_gamemodels (Shaderman) + 25/12/2006 namespace - Brushplugin Version 2.0, supports multiple collapse modes and a materialignore list (namespace) diff --git a/GtkRadiant.sln b/GtkRadiant.sln index c9235331..bd54ae7a 100644 --- a/GtkRadiant.sln +++ b/GtkRadiant.sln @@ -164,11 +164,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shaderplug", "contrib\shade {1C785349-866D-447D-8C55-8A51E5CA0E87} = {1C785349-866D-447D-8C55-8A51E5CA0E87} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ufoai", "contrib\ufoaiplug\ufoai.vcproj", "{46B36F0C-5E17-458E-AE6F-AECE52F66EDE}" + ProjectSection(ProjectDependencies) = postProject + EndProjectSection +EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection + GlobalSection(ProjectDependencies) = postSolution + EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug.ActiveCfg = Debug|Win32 {49C5823A-5E50-4029-ACEE-1627EBB79E47}.Debug.Build.0 = Debug|Win32 @@ -306,6 +312,10 @@ Global {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32 {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32 {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.ActiveCfg = Debug|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Debug.Build.0 = Debug|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.ActiveCfg = Release|Win32 + {46B36F0C-5E17-458E-AE6F-AECE52F66EDE}.Release.Build.0 = Release|Win32 EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection diff --git a/SConscript b/SConscript index f4738ed1..f63531f7 100644 --- a/SConscript +++ b/SConscript @@ -493,6 +493,13 @@ sunplug_env.useGtk2() sunplug_lib = sunplug_env.SharedLibrarySafe(target='sunplug', source=sunplug_lst, LIBPATH='libs') sunplug_env.Install(INSTALL + '/plugins', sunplug_lib) +ufoai_env = module_env.Copy() +ufoai_lst = build_list('contrib/ufoai', 'ufoai.cpp ufoai_filters.cpp ufoai_gtk.cpp ufoai_level.cpp') +ufoai_env.useGlib2() +ufoai_env.useGtk2() +ufoai_lib = ufoai_env.SharedLibrarySafe(target='ufoai', source=ufoai_lst, LIBPATH='libs') +ufoai_env.Install(INSTALL + '/plugins', ufoai_lib) + shaderplug_env = module_env.Copy() shaderplug_lst = build_list('contrib/shaderplug', 'shaderplug.cpp') shaderplug_env.useGlib2() diff --git a/plugins/entity/entity.cpp b/plugins/entity/entity.cpp index 58669348..441481d9 100644 --- a/plugins/entity/entity.cpp +++ b/plugins/entity/entity.cpp @@ -305,6 +305,7 @@ filter_entity_classname g_filter_entity_world("worldspawn"); filter_entity_classname g_filter_entity_func_group("func_group"); filter_entity_classname g_filter_entity_light("light"); filter_entity_classname g_filter_entity_misc_model("misc_model"); +filter_entity_classname g_filter_entity_misc_gamemodel("misc_gamemodel"); filter_entity_classgroup g_filter_entity_trigger("trigger_"); filter_entity_classgroup g_filter_entity_path("path_"); @@ -326,8 +327,9 @@ void Entity_InitFilters() add_entity_filter(g_filter_entity_world, EXCLUDE_WORLD); add_entity_filter(g_filter_entity_func_group, EXCLUDE_WORLD); add_entity_filter(g_filter_entity_world, EXCLUDE_ENT, true); - add_entity_filter(g_filter_entity_trigger, EXCLUDE_TRIGGERS); + add_entity_filter(g_filter_entity_trigger, EXCLUDE_TRIGGERS); add_entity_filter(g_filter_entity_misc_model, EXCLUDE_MODELS); + add_entity_filter(g_filter_entity_misc_gamemodel, EXCLUDE_MODELS); add_entity_filter(g_filter_entity_doom3model, EXCLUDE_MODELS); add_entity_filter(g_filter_entity_light, EXCLUDE_LIGHTS); add_entity_filter(g_filter_entity_path, EXCLUDE_PATHS); diff --git a/setup/win32/components/ufoai.xml b/setup/win32/components/ufoai.xml new file mode 100644 index 00000000..7acb9fcd --- /dev/null +++ b/setup/win32/components/ufoai.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/setup/win32/components/ufoaiplug.xml b/setup/win32/components/ufoaiplug.xml new file mode 100644 index 00000000..aad3a79c --- /dev/null +++ b/setup/win32/components/ufoaiplug.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml index 9d673c0a..941e6d2d 100644 --- a/setup/win32/gtkradiant-1.5.0.xml +++ b/setup/win32/gtkradiant-1.5.0.xml @@ -52,6 +52,9 @@ + + + @@ -124,6 +127,9 @@ + + + -- 2.39.2