Menu
▾
▴
[Virtplayground-svn] SF.net SVN: virtplayground:[288] branches/VP-Grounds
|
From: <Blu...@us...> - 2009-03-23 15:01:13
|
Revision: 288
http://virtplayground.svn.sourceforge.net/virtplayground/?rev=288&view=rev
Author: BlueWolf_
Date: 2009-03-23 15:00:53 +0000 (Mon, 23 Mar 2009)
Log Message:
-----------
Merging trunk/VP r276 through r287. Could somebody please check the TODO?
Modified Paths:
--------------
branches/VP-Grounds/TODO
branches/VP-Grounds/modules/input.py
Added Paths:
-----------
branches/VP-Grounds/images/Input/
branches/VP-Grounds/images/Input/multiple.png
Removed Paths:
-------------
branches/VP-Grounds/images/Input/multiple.png
Property Changed:
----------------
branches/VP-Grounds/
branches/VP-Grounds/images/Button/
branches/VP-Grounds/images/Button/item.config.png
branches/VP-Grounds/images/Button/item.emoticons.png
branches/VP-Grounds/images/Button/item.master.png
branches/VP-Grounds/images/Button/item.status.away.png
branches/VP-Grounds/images/Button/item.status.busy.png
branches/VP-Grounds/images/Button/item.status.idle.png
branches/VP-Grounds/images/Button/item.status.online.png
branches/VP-Grounds/images/Chat/chaticons.status.png
branches/VP-Grounds/images/Chat/scrollbar.down.png
branches/VP-Grounds/images/Chat/scrollbar.png
branches/VP-Grounds/images/Chat/scrollbar.scroll.png
branches/VP-Grounds/images/Chat/top.png
branches/VP-Grounds/images/Login/background.png
branches/VP-Grounds/images/Menu/checkmenu.check.png
branches/VP-Grounds/images/Menu/checkmenu.unckeck.png
branches/VP-Grounds/images/Menu/icons/edit.png
branches/VP-Grounds/images/Menu/selected.png
branches/VP-Grounds/images/Menu/submenu.png
branches/VP-Grounds/images/Progressbar/background.png
branches/VP-Grounds/images/Progressbar/foreground.png
branches/VP-Grounds/images/Status/background.png
branches/VP-Grounds/images/Status/item.away.png
branches/VP-Grounds/images/Status/item.busy.png
branches/VP-Grounds/images/Status/item.online.png
branches/VP-Grounds/images/Userinfo/background.png
branches/VP-Grounds/images/Userinfo/close.png
branches/VP-Grounds/images/base.png
branches/VP-Grounds/images/gui/button.png
branches/VP-Grounds/images/gui/checkbox.png
branches/VP-Grounds/images/gui/closebutton.png
branches/VP-Grounds/images/gui/combobox.png
branches/VP-Grounds/images/gui/optionbox.png
branches/VP-Grounds/images/gui/shadebutton.png
branches/VP-Grounds/images/popup/chat.admin.png
branches/VP-Grounds/images/popup/chat.moderator.png
branches/VP-Grounds/images/popup/chat.png
branches/VP-Grounds/images/popup/user.enters_room.png
branches/VP-Grounds/images/popup/user.leaves_room.png
branches/VP-Grounds/images/popup/user.offline.png
branches/VP-Grounds/images/popup/user.online.png
Property changes on: branches/VP-Grounds
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/VP:276-287
Modified: branches/VP-Grounds/TODO
===================================================================
--- branches/VP-Grounds/TODO 2009-03-23 14:08:58 UTC (rev 287)
+++ branches/VP-Grounds/TODO 2009-03-23 15:00:53 UTC (rev 288)
@@ -21,14 +21,20 @@
* Submenus (assigned to BlueWolf_)
Playground
-* Creating the avatars
-* Getting the avatars visible (assigned to BlueWolf_)
+* Creating the avatars (the images)
+* Finishing up Static avatar (Z coords) (assigned to chozone)
+* Finishing up multidir avatar (Z coords) (assigned to chozone)
+* Finishing up multiparts avatar (Z coords) (assigned to chozone)
+* Finishing up multidir_parts avatar (Z coords) (assigned to chozone)
+* Walls
+* Smooth walking
+* Jumping
+* Running (assigned to chozone)
+* Walking/running bit slower when walking diagonally (assigned to chozone)
+* Chat balloons (assigned to K-4U)
WIO
-* Create a better background image
+* Create a better background image (same as Interface->'New Interface?'?)
About
* Content (assigned to K-4U) _on hold_ we need the info..
-
- Settings
-* Choose language (assigned to chozone)
Property changes on: branches/VP-Grounds/images/Button
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.config.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.emoticons.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.master.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.status.away.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.status.busy.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.status.idle.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Button/item.status.online.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Chat/chaticons.status.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Chat/scrollbar.down.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Chat/scrollbar.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Chat/scrollbar.scroll.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Chat/top.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Deleted: branches/VP-Grounds/images/Input/multiple.png
===================================================================
(Binary files differ)
Copied: branches/VP-Grounds/images/Input/multiple.png (from rev 287, trunk/VP/images/Input/multiple.png)
===================================================================
(Binary files differ)
Property changes on: branches/VP-Grounds/images/Login/background.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Menu/checkmenu.check.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Menu/checkmenu.unckeck.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Menu/icons/edit.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Menu/selected.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Menu/submenu.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Progressbar/background.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Progressbar/foreground.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Status/background.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Status/item.away.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Status/item.busy.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Status/item.online.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Userinfo/background.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/Userinfo/close.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/base.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/gui/button.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/gui/checkbox.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/gui/closebutton.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/gui/combobox.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/gui/optionbox.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/gui/shadebutton.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/chat.admin.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/chat.moderator.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/chat.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/user.enters_room.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/user.leaves_room.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/user.offline.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/VP-Grounds/images/popup/user.online.png
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/VP-Grounds/modules/input.py
===================================================================
--- branches/VP-Grounds/modules/input.py 2009-03-23 14:08:58 UTC (rev 287)
+++ branches/VP-Grounds/modules/input.py 2009-03-23 15:00:53 UTC (rev 288)
@@ -14,6 +14,7 @@
fontEndObj = pygame.font.Font(getRealDir('fonts', 'Bitstream Vera Sans.ttf'), 15)
fontEndObj.set_bold(True)
self.textEnd = fontEndObj.render('|', True, (0,130,21))
+ self.multipleLines = loadImage('images', 'Input', 'multiple.png')[0]
self.inputText = ''
@@ -109,16 +110,21 @@
textSurf = self.fontObj.render(visibleLine , True, (0,0,0))
textLength = textSurf.get_width()
-
- if textLength < 350:
+ textWidth = 350 if len(self.inputText.split('\n')) == 1 else 340 #So we have 10px more for the icon, when there are multiple lines
+
+ if textLength < textWidth:
pos = 0
cursorPos = textLength
else:
- pos = textLength - 350
- cursorPos = 350
+ pos = textLength - textWidth
+ cursorPos = textWidth
- area = (pos, 0, 350, textSurf.get_height())
+ area = (pos, 0, textWidth, textSurf.get_height())
+ if len(self.inputText.split('\n'))>1:
+ #Multiple lines, let's show that cool icon!
+ self.surf.blit(self.multipleLines, (355, 4))
+
self.surf.blit(textSurf, (12,4), area)
self.surf.blit(self.textEnd, (10+cursorPos, 2))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
