Merge remote-tracking branch 'refs/remotes/origin/master'

This commit is contained in:
simio 2025-02-20 00:32:06 -03:00
commit 7d84f47586

View File

@ -1511,7 +1511,9 @@ class gui(QtGui.QWidget):
self.emotebuttons[n_emote].setPixmap(image) self.emotebuttons[n_emote].setPixmap(image)
self.emotebuttons[n_emote].show() self.emotebuttons[n_emote].show()
self.emotebuttons[n_emote].setToolTip(self.charemotes[n_emote + self.current_emote_page * self.max_emotes_on_page][0])
def iniswap_index_change(self, ind): def iniswap_index_change(self, ind):
self.iniswapindex = ind self.iniswapindex = ind
@ -2941,7 +2943,6 @@ class gui(QtGui.QWidget):
break break
if coincidence > -1: if coincidence > -1:
print(coincidence)
self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%") self.tcp.send("CC#0#"+str(coincidence)+"#ur mom gay#%")
else: else:
self.charselect.show() self.charselect.show()