From d403cec8ee423acf0d27de872fbc3ba0b6bccbd8 Mon Sep 17 00:00:00 2001 From: namespace Date: Sun, 8 Oct 2006 21:13:50 +0000 Subject: [PATCH] - Fix for bug 1106 - .wad files don't get listed in the textures menu (Shaderman) (http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1106) - Added initial support for Prey (Shaderman) - Fixed entity inspector sliders to always show (Shaderman) - Added NOTES subsection to the entity inspector listing .def editor_usage* values (Shaderman) git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@114 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- CHANGES | 9 +++++++++ TODO | 1 + plugins/vfspk3/vfs.cpp | 9 +-------- radiant/eclass_doom3.cpp | 22 ++++++++++++++++++++-- radiant/entityinspector.cpp | 20 ++++++++++++-------- setup/win32/gtkradiant-1.5.0.xml | 3 +++ 6 files changed, 46 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index be96d419..149b4c0d 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,16 @@ This is the changelog for developers, != changelog for the end user that we distribute with the binaries. (see changelog) +08/10/2006 +namespace +- Fix for bug 1106 - .wad files don't get listed in the textures menu (Shaderman) + (http://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=1106) +- Added initial support for Prey (Shaderman) +- Fixed entity inspector sliders to always show (Shaderman) +- Added NOTES subsection to the entity inspector listing .def "editor_usage*" values (Shaderman) + 07/10/2006 +namespace - Added "select inside" and "select touching" Both functions now work with multiple selectionbrushes, allowing complex selection operations. diff --git a/TODO b/TODO index dcb862f1..b21c1493 100644 --- a/TODO +++ b/TODO @@ -145,6 +145,7 @@ Selection: Customisable manipulator size - +/- to change the size of the transla Selection: Add optional screen-relative control for constrained rotations. Clipper: Change selection/manipulation to be consistent with other component editing. Filtering: Either deselect filtered nodes, or render filtered nodes that are selected. +Filtering: Add customisable filter presets to set/unset multiple filters at once. Texdef: Make texdef formats abstract, add conversion between texdef formats (use generic affine-texture-matrix format for conversions). Textures Window: Precise display of texture size when selecting. (tooltip, possibly) Status: 'Size of brush' display on status bar. diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp index cbe0812a..68837483 100644 --- a/plugins/vfspk3/vfs.cpp +++ b/plugins/vfspk3/vfs.cpp @@ -57,7 +57,6 @@ ArchiveModules& FileSystemQ3API_getArchiveModules(); #include "generic/callback.h" #include "string/string.h" -#include "container/array.h" #include "stream/stringstream.h" #include "os/path.h" #include "moduleobservers.h" @@ -142,13 +141,7 @@ static void InitPakFile (ArchiveModules& archiveModules, const char *filename) if(table != 0) { archive_entry_t entry; - - std::size_t length = string_length(filename); - Array tmp(length + 2); - std::copy(filename, filename + length, tmp.begin()); - tmp[length] = ':'; - tmp[length + 1] = '\0'; - entry.name = tmp.begin(); + entry.name = filename; entry.archive = table->m_pfnOpenArchive(filename); entry.is_pakfile = true; diff --git a/radiant/eclass_doom3.cpp b/radiant/eclass_doom3.cpp index b172a36a..217c4ec5 100644 --- a/radiant/eclass_doom3.cpp +++ b/radiant/eclass_doom3.cpp @@ -452,12 +452,12 @@ static bool EntityClass_parse(EntityClass& entityClass, Tokeniser& tokeniser) } else if(string_equal_n(key, "editor_usage", 12)) { - usage << "\n"; PARSE_RETURN_FALSE_IF_FAIL(EntityClassDoom3_parseString(tokeniser, usage)); currentString = &usage; } else if(string_equal(key, "editor_rotatable") || string_equal(key, "editor_showangle") + || string_equal(key, "editor_showangles") // typo? in prey movables.def || string_equal(key, "editor_mover") || string_equal(key, "editor_model") || string_equal(key, "editor_material") @@ -556,6 +556,17 @@ static bool EntityClass_parse(EntityClass& entityClass, Tokeniser& tokeniser) PARSE_RETURN_FALSE_IF_FAIL(EntityClassDoom3_parseToken(tokeniser)); } // end quake4-specific keys + // begin ignore prey (unknown/unused?) entity keys + else if(string_equal(key, "editor_light") + || string_equal(key, "editor_def def_debrisspawner") + || string_equal(key, "editor_def def_drop") + || string_equal(key, "editor_def def_guihand") + || string_equal(key, "editor_def def_mine")) + { + //const char* value = + PARSE_RETURN_FALSE_IF_FAIL(EntityClassDoom3_parseToken(tokeniser)); + } + // end ignore prey entity keys else { CopiedString tmp(key); @@ -794,7 +805,14 @@ public: StringOutputStream usage(256); - usage << "-------- KEYS --------\n"; + usage << "-------- NOTES --------\n"; + + if(!string_empty((*i).second->m_comments.c_str())) + { + usage << (*i).second->m_comments.c_str() << "\n"; + } + + usage << "\n-------- KEYS --------\n"; for(EntityClassAttributes::iterator j = (*i).second->m_attributes.begin(); j != (*i).second->m_attributes.end(); ++j) { diff --git a/radiant/entityinspector.cpp b/radiant/entityinspector.cpp index f8a0cce9..de3086d8 100644 --- a/radiant/entityinspector.cpp +++ b/radiant/entityinspector.cpp @@ -1678,15 +1678,19 @@ GtkWidget* EntityInspector_constructWindow(GtkWindow* toplevel) { - int x = g_entitysplit1_position; - if (x != -1) + // show the sliders in any case + if(g_entitysplit2_position > 22) { - gtk_paned_set_position(GTK_PANED(g_entity_split1), x); - - x = g_entitysplit2_position; - - if (x != -1) - gtk_paned_set_position (GTK_PANED(g_entity_split2), x); + gtk_paned_set_position (GTK_PANED(g_entity_split2), g_entitysplit2_position); + } else { + g_entitysplit2_position = 22; + gtk_paned_set_position (GTK_PANED(g_entity_split2), 22); + } + if((g_entitysplit1_position - g_entitysplit2_position) > 27) + { + gtk_paned_set_position (GTK_PANED(g_entity_split1), g_entitysplit1_position); + } else { + gtk_paned_set_position (GTK_PANED(g_entity_split1), g_entitysplit2_position + 27); } } diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml index 9f5087be..e13bdfcc 100644 --- a/setup/win32/gtkradiant-1.5.0.xml +++ b/setup/win32/gtkradiant-1.5.0.xml @@ -75,6 +75,9 @@ + + + -- 2.39.2