Commit graph

16 commits

Author SHA1 Message Date
David Cernat
b6a7377692 Merge pull request #366 from TES3MP/0.6.2 while resolving conflicts, 2nd try
Conflicts:
	apps/openmw-mp/Networking.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.cpp
	apps/openmw-mp/Script/Functions/Miscellaneous.hpp
	apps/openmw/mwmp/GUI/GUIChat.cpp
2018-01-05 21:24:14 +02:00
David Cernat
502df7d9c1 [Client] Clean up GUIChat slightly 2018-01-05 00:03:05 +02:00
David Cernat
40e70ebf9c [Client] Fix key focus for chat window 2017-12-25 05:08:36 +02:00
David Cernat
ad61d88cb1 [General] Fix typos and use consistent style for recent additions 2017-12-08 18:02:23 +02:00
Koncord
051f65a4d5 [Client] Make channel buttons blinking on new messages 2017-12-08 22:53:22 +08:00
Koncord
7eecbfd08e [Client] Fix saving channel history 2017-12-08 22:36:16 +08:00
Koncord
aa183e6844 [General] Introduce chat channels 2017-12-08 07:43:29 +08:00
Koncord
382f56178c [Client] Add custom windows 2017-11-25 23:50:14 +08:00
Koncord
ca7f3f7450 [Client] Disable focus on <tab> for chat window 2017-11-07 11:44:08 +08:00
Koncord
3495fd43f4 [Client] Add network statistics (CTRL+F2) 2017-10-28 00:39:46 +08:00
David Cernat
08f34e5356 [Client] Fix recent problems with password window 2017-10-08 02:42:41 +03:00
David Cernat
711c4d83da [Client] Fix build after recent OpenMW changes to GUI 2017-10-07 23:33:36 +03:00
Koncord
54f5104345 [General] Escape format for strings 2017-08-31 20:09:05 +08:00
David Cernat
1f682749d6 [General] Add optional notes to PasswordDialogs 2017-07-02 13:07:36 +03:00
Koncord
3803535bd5 [General] Implement CleanChat() 2017-06-12 08:01:47 +08:00
Koncord
587b53bfed [Client] Reorder files 2017-06-07 00:06:10 +08:00