Sneed-Group/Poodletooth-iLand
2
0
Fork 0
mirror of https://github.com/Sneed-Group/Poodletooth-iLand synced 2025-01-09 17:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Another fix and Dan's nametag scaling.

Browse source
This commit is contained in:
Loudrob 2015-06-26 09:19:43 -04:00
parent 48539188de
commit 6eaaed8056
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
otp/nametag/Nametag3d.py
View file

@ -6,9 +6,10 @@ import math
class Nametag3d(Nametag): class Nametag3d(Nametag):
WANT_DYNAMIC_SCALING = True WANT_DYNAMIC_SCALING = True
MAX_SCALE = 2.5
SCALING_FACTOR = 0.055 SCALING_FACTOR = 0.055
SCALING_MINDIST = 1 SCALING_MINDIST = 1
SCALING_MAXDIST = 50 SCALING_MAXDIST = math.pow(MAX_SCALE / SCALING_FACTOR, 2)
BILLBOARD_OFFSET = 3.0 BILLBOARD_OFFSET = 3.0
SHOULD_BILLBOARD = True SHOULD_BILLBOARD = True

2
toontown/chat/ToontownChatManager.py
View file

@ -35,7 +35,7 @@ class ToontownChatManager(ChatManager.ChatManager):
ChatManager.ChatManager.__init__(self, cr, localAvatar) ChatManager.ChatManager.__init__(self, cr, localAvatar)
self.chatInputSpeedChat = TTChatInputSpeedChat(self) self.chatInputSpeedChat = TTChatInputSpeedChat(self)
self.normalPos = Vec3(0.25, 0, -0.196) self.normalPos = Vec3(0.25, 0, -0.196)
self.whisperPos = Vec3(0, 0, -0.296) self.whisperPos = Vec3(0.25, 0, -0.28)
self.speedChatPlusPos = Vec3(-0.35, 0, 0.71) self.speedChatPlusPos = Vec3(-0.35, 0, 0.71)
self.SCWhisperPos = Vec3(0, 0, 0) self.SCWhisperPos = Vec3(0, 0, 0)
self.chatInputWhiteList = TTChatInputWhiteList() self.chatInputWhiteList = TTChatInputWhiteList()

4
toontown/estate/House.py
View file

@ -77,7 +77,7 @@ class House(Place.Place):
self.accept('doorDoneEvent', self.handleDoorDoneEvent) self.accept('doorDoneEvent', self.handleDoorDoneEvent)
self.accept('DistributedDoor_doorTrigger', self.handleDoorTrigger) self.accept('DistributedDoor_doorTrigger', self.handleDoorTrigger)
self._telemLimiter = TLGatherAllAvs('House', RotationLimitToH) self._telemLimiter = TLGatherAllAvs('House', RotationLimitToH)
NametagGlobals.setWant2dNametags(True) NametagGlobals.setMasterArrowsOn(1)
self.fsm.request(requestStatus['how'], [requestStatus]) self.fsm.request(requestStatus['how'], [requestStatus])
def exit(self): def exit(self):
@ -87,7 +87,7 @@ class House(Place.Place):
self._telemLimiter.destroy() self._telemLimiter.destroy()
del self._telemLimiter del self._telemLimiter
messenger.send('exitHouse') messenger.send('exitHouse')
NametagGlobals.setWant2dNametags(False) NametagGlobals.setMasterArrowsOn(0)
def setState(self, state): def setState(self, state):
if hasattr(self, 'fsm'): if hasattr(self, 'fsm'):