Changeset 8627 for code/branches/presentation/data

Timestamp:

May 27, 2011, 9:54:03 PM (13 years ago)

Author:

landauf

Message:

merged revisions 8527-8530 from trunk to presentation branch:

• 8527: build fix for mingw, d_ostream.open() is not defined for wchar
• 8528: disable LOD for some of the debris meshes which cause a crash on old versions of Ogre
• 8529: fixed lua error when pressing ESC ingame after closing the console
• 8530: added config value to define the scroll speed in CEGUI listboxes. default 1 line.

Location:

code/branches/presentation/data

Files:

• gui/scripts/SheetManager.lua (modified) (1 diff)
• levels/templates/lodInformation.oxt (modified) (1 diff)

code/branches/presentation/data/gui/scripts/SheetManager.lua

@@ -216 +216 @@
 function keyESC()
     -- HUGE, very HUGE hacks!
-    
+
     -- If the InGameConsole is active, ignore the ESC command.
     if bInGameConsoleClosed == true then
         bInGameConsoleClosed = false
-        if activeMenuSheets[i] and activeMenuSheets[1].sheet.name == "MainMenu" then
+        if activeMenuSheets[1] and activeMenuSheets[1].sheet.name == "MainMenu" then
             return
         end

code/branches/presentation/data/levels/templates/lodInformation.oxt

@@ -15 +15 @@
       <MeshLodInformation mesh=CuboidLandingZone.mesh enabled=false/>
       <MeshLodInformation mesh=HydroHarvester.mesh enabled=false />
+
+      <!-- disable LOD for some debris meshes which caused a crash (fixed in Ogre 1.7.3) -->
+      <MeshLodInformation mesh=BodyDebris1.mesh enabled=false/>
+      <MeshLodInformation mesh=WingDebris2.mesh enabled=false/>
     </lodinformation>
   </Level>