Mercurial > traipse_dev
changeset 232:53ae14747ba7 alpha
Traipse Alpha 'OpenRPG' {100615-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 (Closed)
New Features:
New to Map, can re-order Grid, Miniatures, and Whiteboard layer draw order
New to Server GUI, can now clear log
Fixes:
Fix to InterParse that was causing an Infernal Loop with Namespace Internal
Fix to XML data, removed old Minidom and switched to Element Tree
Fix to Server that was causing eternal attempt to find a Server ID, in Register Rooms thread
Fix to metaservers.xml file not being created
Fix to Single and Double quotes in Whiteboard text
Fix to Background images not showing when using the Image Server
Fix to Duplicate chat names appearing
Fix to Server GUI's logging output
Fix to FNB.COLORFUL_TABS bug.
| author | sirebral |
|---|---|
| date | Tue, 15 Jun 2010 14:28:22 -0500 |
| parents | cc7629ab526d |
| children | 196853e0f455 |
| files | orpg/networking/meta_server_lib.py orpg/networking/mplay_server.py orpg/orpg_version.py |
| diffstat | 3 files changed, 22 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/orpg/networking/meta_server_lib.py Mon Jun 14 15:20:08 2010 -0500 +++ b/orpg/networking/meta_server_lib.py Tue Jun 15 14:28:22 2010 -0500 @@ -423,27 +423,26 @@ "server_data[version]":PROTOCOL_VERSION, "server_data[num_users]":self.num_users, "act":"register"} ) - for path in getMetaServerList(): - try: # this POSTS the request and returns the result - etreeEl = get_server_dom(data, path.get('url')) - except Exception, e: - if META_DEBUG: print "Problem talking to server. Setting interval for retry ..." - if META_DEBUG: print data - if META_DEBUG: print e - self.interval = 0 - """ - If we are in the registerThread thread, then setting interval to 0 - will end up causing a retry in about 6 seconds (see self.run()) - If we are in the main thread, then setting interval to 0 will do one - of two things: - 1) Do the same as if we were in the registerThread - 2) Cause the next, normally scheduled register() call to use the values - provided in this call. - - Which case occurs depends on where the registerThread thread is when - the main thread calls register(). - """ - return 0 # indicates that it was okay to call, not that no errors occurred + try: # this POSTS the request and returns the result + etreeEl = get_server_dom(data, self.path) + except Exception, e: + if META_DEBUG: print "Problem talking to server. Setting interval for retry ..." + if META_DEBUG: print data + if META_DEBUG: print e + self.interval = 0 + """ + If we are in the registerThread thread, then setting interval to 0 + will end up causing a retry in about 6 seconds (see self.run()) + If we are in the main thread, then setting interval to 0 will do one + of two things: + 1) Do the same as if we were in the registerThread + 2) Cause the next, normally scheduled register() call to use the values + provided in this call. + + Which case occurs depends on where the registerThread thread is when + the main thread calls register(). + """ + return 0 # indicates that it was okay to call, not that no errors occurred # If there is a DOM returned .... if etreeEl != None:
--- a/orpg/networking/mplay_server.py Mon Jun 14 15:20:08 2010 -0500 +++ b/orpg/networking/mplay_server.py Tue Jun 15 14:28:22 2010 -0500 @@ -724,7 +724,7 @@ num_users=num_players) else: self.metas[meta] = registerThread(name=name, realHostName=self.server_address, - num_users=num_players, MetaPath=meta, port=self.server_port, + num_users=num_players, MetaPath=meta.get('url'), port=self.server_port, register_callback=self.register_callback) self.metas[meta].start()
--- a/orpg/orpg_version.py Mon Jun 14 15:20:08 2010 -0500 +++ b/orpg/orpg_version.py Tue Jun 15 14:28:22 2010 -0500 @@ -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 = "100614-00" +BUILD = "100615-00" # This version is for network capability. PROTOCOL_VERSION = "1.2"