# HG changeset patch # User sirebral # Date 1259267059 21600 # Node ID 033887bb8a86ce8d0a51c161bce96261e6536c04 # Parent e564a01d13245d52b28cbabfd3b191300b5aaf28 Traipse Alpha 'OpenRPG' {091126-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user. Update Summary (Keeping up with Beta) New Features: Added Bookmarks Added 'boot' command to remote admin Added confirmation window for sent nodes Minor changes to allow for portability to an OpenSUSE linux OS Miniatures Layer pop up box allows users to turn off Mini labels, from FlexiRPG Zoom Mouse plugin added Images added to Plugin UI Switching to Element Tree Map efficiency, from FlexiRPG Added Status Bar to Update Manager New TrueDebug Class in orpg_log (See documentation for usage) Portable Mercurial Tip of the Day added, from Core and community New Reference Syntax added for custom PC sheets New Child Reference for gametree New Gametree Recursion method, mapping, context sensitivity, and effeciency.. New Features node with bonus nodes and Node Referencing help added Fixes: Fix to Text based Server Fix to Remote Admin Commands Fix to Pretty Print, from Core Fix to Splitter Nodes not being created Fix to massive amounts of images loading, from Core Fix to Map from gametree not showing to all clients Fix to gametree about menus Fix to Password Manager check on startup Fix to PC Sheets from tool nodes. They now use the tabber_panel Fixed Whiteboard ID to prevent random line or text deleting. Modified ID's to prevent non updated clients from ruining the fix. *Whiteboard from Core not showing* default_manifest.xml renamed to default_upmana.xml Fix to Update Manager; cleaner clode for saved repositories diff -r e564a01d1324 -r 033887bb8a86 orpg/gametree/nodehandlers/core.py --- a/orpg/gametree/nodehandlers/core.py Wed Nov 25 14:23:46 2009 -0600 +++ b/orpg/gametree/nodehandlers/core.py Thu Nov 26 14:24:19 2009 -0600 @@ -53,9 +53,9 @@ def __init__(self,xml,tree_node): self.xml = xml self.mytree_node = tree_node - self.tree = open_rpg.get_component('tree') - self.frame = open_rpg.get_component('frame') - self.chat = open_rpg.get_component('chat') + self.tree = component.get('tree') + self.frame = component.get('frame') + self.chat = component.get('chat') self.drag = True self.myeditor = None # designing self.myviewer = None # prett print @@ -381,7 +381,7 @@ def __init__(self,xml,tree_node): node_handler.__init__(self,xml,tree_node) self.file_node = self.xml[0] - self.frame = open_rpg.get_component('frame') + self.frame = component.get('frame') def on_ldclick(self,evt): file_name = self.file_node.get("name") @@ -413,7 +413,7 @@ def __init__(self,xml,tree_node): node_handler.__init__(self,xml,tree_node) self.file_node = self.xml[0] - self.frame = open_rpg.get_component('frame') + self.frame = component.get('frame') def on_ldclick(self,evt): file_name = self.file_node.get("url") @@ -444,9 +444,14 @@ """ def __init__(self,xml,tree_node): node_handler.__init__(self,xml,tree_node) - self.map = open_rpg.get_component('map') - self.mapdata = self.xml[0] + self.map = component.get('map') + self.mapdata = self.xml.find('map') def on_ldclick(self,evt): + if (component.get('session').my_role() != component.get('session').ROLE_GM): + component.get('chat').InfoPost("You must be a GM to use this feature") + return self.map.new_data(tostring(self.mapdata)) + component.get('session').send(tostring(self.mapdata)) + self.map.canvas.send_map_data() return 1 diff -r e564a01d1324 -r 033887bb8a86 orpg/mapper/map.py --- a/orpg/mapper/map.py Wed Nov 25 14:23:46 2009 -0600 +++ b/orpg/mapper/map.py Thu Nov 26 14:24:19 2009 -0600 @@ -703,8 +703,8 @@ wx.Panel.__init__(self, parent, id) self.canvas = MapCanvas(self, -1) self.session = component.get('session') - self.chat = component.get('chat') self.top_frame = component.get('frame') + self.chat = self.top_frame.chat self.root_dir = os.getcwd() self.current_layer = 2 self.layer_tabs = orpgTabberWnd(self, style=FNB.FNB_NO_X_BUTTON|FNB.FNB_BOTTOM|FNB.FNB_NO_NAV_BUTTONS) diff -r e564a01d1324 -r 033887bb8a86 orpg/mapper/miniatures.py --- a/orpg/mapper/miniatures.py Wed Nov 25 14:23:46 2009 -0600 +++ b/orpg/mapper/miniatures.py Thu Nov 26 14:24:19 2009 -0600 @@ -550,7 +550,7 @@ path = urllib.unquote(path) if not modify: start = path.rfind("/") + 1 - if self.canvas.parent.handlers[2].auto_label: min_label = path[start:len(path)-4] + if self.canvas.parent.layer_handlers[2].auto_label: min_label = path[start:len(path)-4] else: min_label = "" id = 'mini-' + self.canvas.frame.session.get_next_id() self.add_miniature(id, path, pos=pos, label=min_label, local=True, diff -r e564a01d1324 -r 033887bb8a86 orpg/orpg_version.py --- a/orpg/orpg_version.py Wed Nov 25 14:23:46 2009 -0600 +++ b/orpg/orpg_version.py Thu Nov 26 14:24:19 2009 -0600 @@ -4,7 +4,7 @@ #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed) DISTRO = "Traipse Alpha" DIS_VER = "Ornery Orc" -BUILD = "091125-03" +BUILD = "091126-00" # This version is for network capability. PROTOCOL_VERSION = "1.2" diff -r e564a01d1324 -r 033887bb8a86 upmana/mercurial/parsers.py --- a/upmana/mercurial/parsers.py Wed Nov 25 14:23:46 2009 -0600 +++ b/upmana/mercurial/parsers.py Thu Nov 26 14:24:19 2009 -0600 @@ -5,8 +5,8 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2, incorporated herein by reference. -from mercurial.node import bin, nullid, nullrev -from mercurial import util +from node import bin, nullid, nullrev +import util import struct, zlib _pack = struct.pack