[Gtkradiant] r4808 - in GtkRadiant/trunk: docs/developer docs/user radiant setup/win32

svn-noreply at zerowing.idsoftware.com svn-noreply at zerowing.idsoftware.com
Sat Sep 25 20:38:17 CDT 2004 

Author: spog
Date: 2004-09-25 20:37:57 -0500 (Sat, 25 Sep 2004)
New Revision: 4808

Modified:
   GtkRadiant/trunk/docs/developer/CHANGES
   GtkRadiant/trunk/docs/developer/TODO
   GtkRadiant/trunk/docs/user/transition.html
   GtkRadiant/trunk/radiant/mainframe.cpp
   GtkRadiant/trunk/radiant/map.cpp
   GtkRadiant/trunk/radiant/qe3.cpp
   GtkRadiant/trunk/radiant/qe3.h
   GtkRadiant/trunk/setup/win32/installer.py
   GtkRadiant/trunk/setup/win32/template.msi
Log:
fixed center-xy-views in floating-windows mode; fixed autosave saving unmodified maps; added support for upgrades to win32 installer

Modified: GtkRadiant/trunk/docs/developer/CHANGES
===================================================================
--- GtkRadiant/trunk/docs/developer/CHANGES	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/docs/developer/CHANGES	2004-09-26 01:37:57 UTC (rev 4808)
@@ -6,6 +6,10 @@
 - Added component-editing for curves on doom3 entities.
 - Added normalisation of translation for texture-lock on doom3 brushes.
 - Added update of surface inspector for texdef changes caused by texture-lock.
+- Changed floating-windows layout to centre all ortho views on center-xy-views.
+- Stopped autosave from saving unmodified maps after first-time load.
+Shamus
+- Textool improvements.
 
 21/09/2004
 Michael Schlueter

Modified: GtkRadiant/trunk/docs/developer/TODO
===================================================================
--- GtkRadiant/trunk/docs/developer/TODO	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/docs/developer/TODO	2004-09-26 01:37:57 UTC (rev 4808)
@@ -14,6 +14,7 @@
 Shaders: pcx.m8 texture loading broken for heretic2
 UI: radiant fails to handle handle the key-up/key-down events when another combination is performed at about the same time (eg CTRL+D).
 texture-lock: faces end up with huge shift values somehow.
+UI: changing resolution in floating-windows mode can screw up window positions.
 
 
 HIGH priority features

Modified: GtkRadiant/trunk/docs/user/transition.html
===================================================================
--- GtkRadiant/trunk/docs/user/transition.html	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/docs/user/transition.html	2004-09-26 01:37:57 UTC (rev 4808)
@@ -24,6 +24,14 @@
 This feature was removed temporarily, it will be back. Until then, use area-select to pick faces for texturing.
 </small></p>
 <p><small>
+<b>Selecting faces is too slow!</b><br>
+In the latest builds, you can select faces in the 3d view by clicking anywhere on the face, not just on the centre dot.
+</small></p>
+<p><small>
+<b>How do I copy textures from one face to another?</b><br>
+A useful feature in 1.5 is copy/paste for brush face shader and texture projection parameters. Select faces and hit ctrl+c to copy, then select some more and hit ctrl+v to paste.
+</small></p>
+<p><small>
 <b>Why can't I select brush-entities to edit their properties in the entity-inspector?</b><br>
 1.5 requires you to select the parent entity directly to edit its properties. Either use the entity-list (shortcut 'l') to select the entity, or hold ctrl while selecting any brush belonging to the entity.
 </small></p>
@@ -31,4 +39,7 @@
 <b>Why can't I exit the clipper?</b><br>
 The clipper ('x') now behaves as a tool, like the translate ('w') rotate ('r') and QE ('q') tools. Hit the toolbar button or shortcut to change from the clipper to another tool.
 </small></p>
-</body>
+<p><small>
+<b>How can I drag-select more than one point on a patch?</b><br>
+Hold shift or shift+alt and drag a box over the points.
+</small></p>

Modified: GtkRadiant/trunk/radiant/mainframe.cpp
===================================================================
--- GtkRadiant/trunk/radiant/mainframe.cpp	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/radiant/mainframe.cpp	2004-09-26 01:37:57 UTC (rev 4808)
@@ -2149,7 +2149,7 @@
     create_menu_item_with_mnemonic(menu_in_menu, "Set Se_lected Brushes", "RegionSetSelection");
   }
 
-  if(style == MainFrame::eSplit)
+  if(style == MainFrame::eSplit || style == MainFrame::eFloating)
   {
     command_connect_accelerator("CenterXYViews");
   }

Modified: GtkRadiant/trunk/radiant/map.cpp
===================================================================
--- GtkRadiant/trunk/radiant/map.cpp	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/radiant/map.cpp	2004-09-26 01:37:57 UTC (rev 4808)
@@ -1086,6 +1086,7 @@
     Resource* resource = GlobalReferenceCache().Capture(g_map.m_name.c_str());
     resource->load();
     GlobalSceneGraph().insert_root(resource->getNode());
+    AutoSave_clear();
 
     entity_updateworldspawn walker;
     GlobalSceneGraph().root()->m_traverse->traverse(walker);
@@ -1357,11 +1358,13 @@
   Map_SetWorldspawn(g_map, 0);
 
   GlobalUndoSystem().clear();
+  AutoSave_clear();
 
   GlobalSceneGraph().erase_root();
   GlobalReferenceCache().Release(g_map.m_name.c_str());
 
   GlobalSceneGraph().insert_root(clone);
+  AutoSave_clear();
 
   Map_SetValid(g_map, true);
 }
@@ -1411,6 +1414,7 @@
       map->save();
     }
     GlobalSceneGraph().insert_root(resource->getNode());
+    AutoSave_clear();
     SceneChangeNotify();
   }
 

Modified: GtkRadiant/trunk/radiant/qe3.cpp
===================================================================
--- GtkRadiant/trunk/radiant/qe3.cpp	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/radiant/qe3.cpp	2004-09-26 01:37:57 UTC (rev 4808)
@@ -144,9 +144,14 @@
 namespace
 {
   time_t s_start = 0;
-  std::size_t s_changes = SIZE_T_MAX;
+  std::size_t s_changes = 0;
 }
 
+void AutoSave_clear()
+{
+  s_changes = 0;
+}
+
 scene::Node* Map_Node()
 {
   return GlobalSceneGraph().root();

Modified: GtkRadiant/trunk/radiant/qe3.h
===================================================================
--- GtkRadiant/trunk/radiant/qe3.h	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/radiant/qe3.h	2004-09-26 01:37:57 UTC (rev 4808)
@@ -28,6 +28,7 @@
 extern int m_AutoSave_Frequency;
 extern bool g_SnapShots_Enabled;
 
+void AutoSave_clear();
 void QE_CheckAutoSave( void );
 void Map_Snapshot();
 

Modified: GtkRadiant/trunk/setup/win32/installer.py
===================================================================
--- GtkRadiant/trunk/setup/win32/installer.py	2004-09-25 21:59:23 UTC (rev 4807)
+++ GtkRadiant/trunk/setup/win32/installer.py	2004-09-26 01:37:57 UTC (rev 4808)
@@ -310,6 +310,11 @@
     tableFile.write("Action\tType\tSource\tTarget\ns72\ti2\tS72\tS255\nCustomAction\tAction\n")
     tableFile.write("caSetTargetDir\t51\tTARGETDIR\t" + self.target)
   
+  def writeUpgradeTable(self, name):
+    tableFile = file(name, "wt")
+    tableFile.write("UpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\tRemove\tActionProperty\ns38\tS20\tS20\tS255\ti4\tS255\ts72\nUpgrade\tUpgradeCode\tVersionMin\tVersionMax\tLanguage\tAttributes\n")
+    tableFile.write(format_guid(self.code) + "\t\t" + self.version + "\t1033\t1\t\tRELATEDPRODUCTS")
+  
   def writeMSILicense(self, msiName, licenseName):
     if(not os.path.exists(licenseName)):
       raise Exception("file not found: " + licenseName)
@@ -328,10 +333,14 @@
     msiDB = msi.Database(msiName)
     print("ProductCode=" + format_guid(self.code))
     msiDB.setproperty("ProductCode", format_guid(self.code))
+    print("UpgradeCode=" + format_guid(self.code))
+    msiDB.setproperty("UpgradeCode", format_guid(self.code))
     print("ProductName=" + self.name)
     msiDB.setproperty("ProductName", self.name)
     print("ProductVersion=" + self.version)
     msiDB.setproperty("ProductVersion", self.version)
+    msiDB.setproperty("RELATEDPRODUCTS", "")
+    msiDB.setproperty("SecureCustomProperties", "RELATEDPRODUCTS")
     msiDB.commit()
 
   def writeMSI(self, msiTemplate, msiName):
@@ -370,6 +379,9 @@
     self.writeCustomActionTable("CustomAction.idt")
     os.system("msidb -d " + msiWorkName + " -i -f \"" + cwd + "\" CustomAction.idt")
     os.system("del CustomAction.idt")
+    self.writeUpgradeTable("Upgrade.idt")
+    os.system("msidb -d " + msiWorkName + " -i -f \"" + cwd + "\" Upgrade.idt")
+    os.system("del Upgrade.idt")
 
     cabText = file("archive_files.txt", "wt")
     for cabDirective in self.cabList:

Modified: GtkRadiant/trunk/setup/win32/template.msi
===================================================================
(Binary files differ)

More information about the Gtkradiant mailing list