summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2010-08-25Adding autoComplete for inviteStefan Dombrowski7-11/+48
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-24Giving functionality to invite in socialwindow and allow enter key in textdialogStefan Dombrowski3-8/+13
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-23Fixing segmentation fault in partyhandlerStefan Dombrowski1-1/+1
Segmentation fault happens if a player leaves your party while he is out of sight. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-22Fixing segmentation fault when tab gets removedStefan Dombrowski1-17/+3
How to reproduce the bug: Leave a party, while the party tab in the chat window is not selected. Then click with the mouse on the chat window. Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2010-08-21Fixing segmentation fault and improving gui for partyStefan Dombrowski3-4/+4
* Segmentation fault happened if a player left a party while other party members are offline. * While creating a party the key input is not anymore reused for game play. * The vertical scrollbar is only shown when needed. * The default height was raised, because before much of the functionality was hidden. Signed-off-by: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
2010-08-20Show info popups for all playersStefan Dombrowski1-11/+14
Until now popups were only shown for players who are member of a party. This resolves http://bugs.manasource.org/view.php?id=197 Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-19Fixing some bugs in NPC-shop guiStefan Dombrowski3-0/+26
* Price and total money is now shown from the beginning in sell dialog. * Item popup is set invisible when mouse has moved away from items. * Item popup gets deleted when shop closes. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-18Fix Theme loadingJared Adams1-0/+4
Reviewed-by: Freeyorp
2010-08-18Fixing overlapping icons in item popupsStefan Dombrowski1-17/+18
The bug could not be reproduced by everyone. Many thanks to Jaxad0127 for testing it on an affected system. This patch resolves http://bugs.manasource.org/view.php?id=191 Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-18Merge branch '1.0'Thorbjørn Lindeijer1-8/+5
Conflicts: src/log.cpp
2010-08-17Add missing include and add enet files to codeblocksStefan Dombrowski1-5/+3
The missing include generated compiler error on windows. Because of compiler warnings generated by enet, warnings are switched of for: * unknown #pragmas, which are for MSVC compiler * enumeration with missing case Reviewed-by: Bertram
2010-08-16Move more to the event systemJared Adams30-359/+472
Most of Net::InventoryHandler is now done through events. The ActorSpriteManager was also replaced by events. A few odds and ends were taken care of too. Reviewed-by: Bertram
2010-08-15Remove the logToChat optionChuck Miller4-24/+5
This is a very old legacy option. Today its not very useful because the logger had become quite verbose that using it during run-time is not helpful. Reviewed-By: Jared Adams Reviewed-By: Freeyorp
2010-08-15Merge branch '1.0'Chuck Miller15-223/+381
Conflicts: mana.cbp mana.files src/CMakeLists.txt src/Makefile.am src/utils/xml.cpp
2010-08-15Add included enet to CMakeBernd Wachter1-3/+9
2010-08-13Add code to change gameservers to manaserv netcodeJared Adams2-6/+21
Reviewed-by: Freeyorp
2010-08-13Simplify handling of compressed filesJared Adams8-174/+283
ResourceManager will now check for ".gz" and act appropriately (unless told not to). Compression handling functions are now in new utils/zlib files, along with a function to load a file from drive, uncompressing it if it ends in ".gz". Reviewed-by: Freeyorp
2010-08-13Add missing setAttribute for moneyStefan Dombrowski1-0/+1
Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-12Simplify working with the event systemJared Adams36-225/+184
EventManager has been merged into Event, with some new convinience methods added. Reviewed-by: Chuck Miller
2010-08-12Replace most of Net::NpcHandler with eventsJared Adams8-164/+134
Reviewed-by: Chuck Miller
2010-08-12Forgot a Label constructorJared Adams1-0/+1
2010-08-12Fix some issues in the Event classJared Adams2-10/+10
Reviewed-by: Thorbjørn Lindeijer
2010-08-12Avoid string copy for SpriteDef::getActionThorbjørn Lindeijer2-2/+2
Pass std::string as const & when it makes sense.
2010-08-12Fix Label color handlingJared Adams1-1/+1
2010-08-10Remove NpcDialog references from netcodeJared Adams9-193/+281
Reviewed-by: Chuck Miller
2010-08-10Add some new methods to the Event classJared Adams2-7/+112
Adds get methods with default values, and has methods that return true if the variable exists. Reviewed-by: Chuck Miller
2010-08-09Fix enet version check *again*Jared Adams3-2/+8
Reviewed-by: Chuck Miller
2010-08-09Replace remaining gcn::Label instances with Label instancesJared Adams3-4/+8
Reviewed-by: Chuck Miller
2010-08-08Do proper checks on the ENet versionThorbjørn Lindeijer2-2/+2
The previous check broke compilation against ENet 1.2.2, which does define the version macros but does not have the API changes.
2010-08-07Removed superfluous semicolonThorbjørn Lindeijer1-1/+1
2010-08-05Add better XML error logging and do some related cleanupJared Adams3-34/+54
Error details from libxml2 are no longer ignored and are properly logged now. XML initialization code is now in the XML namespace. The XML::Document constructor that took a data pointer was removed because it wasn't being used and it would make the new logging less useful (no filename). Signed-off-by: Chuck Miller
2010-08-05Have Being manage speech creation and add permissions to eventsJared Adams7-23/+59
The Being and Player Chat events now have the precomuted permissions for SPEECH_LOG and SPEECH_FLOAT. The Being class now acts on those events to show speech (if SPEECH_FLOAT is present). ChatWindow now checks for the SPEECH_LOG permission. Reviewed-by: Freeyorp
2010-08-04Remove some unused headers and fix some chat eventsJared Adams8-19/+14
Reviewed-by: Chuck Miller
2010-08-04Changed the stats.xml to attributes.xml according to the server commit.Yohann Ferreira3-7/+12
Also, fixed a compilation warning about passing a NULL value to a boolean parameter. The built-ins are kept for now. Reviewed-by: Jaxad0127.
2010-08-03Move Theme and UserPalette to the resources folderJared Adams56-79/+76
Reviewed-by: Yohann Ferreira
2010-08-03Merge remote branch 'origin/1.0'Jared Adams4-16/+66
Conflicts: src/net/tmwa/chathandler.cpp
2010-08-03Improve OpenGL speed.Andrei Karas3-110/+422
Use batch commands and not selecting already selected texture. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-03Fix enet version checkJared Adams2-0/+8
Tested-by: BaseBallBoy
2010-08-03Added double click to equip unequip and use itemsdweems1-4/+36
-Double-click items in invetory to equip/unequip -Double-click items in inventory to use Signed-off-by: Jared Adams <jaxad0127@gmail.com>
2010-08-02Fix enet version checkJared Adams2-10/+6
Tested-by: BaseBallBoy
2010-08-02Fix some bugsJared Adams2-2/+7
Trivial fixes.
2010-08-02Add support for enet 1.3Jared Adams2-0/+12
Reviewed-by: Yohann Ferreira
2010-08-02Remove non-GUI references to MiniStatusWindowJared Adams9-93/+106
Reviewed-by: Freeyorp
2010-08-02Convert most of the remaining chat system to use the event systemChuck Miller3-20/+72
Reviewed-by: Jared Adams
2010-08-01Fix events added in last commit to use ints instead of boolsJared Adams1-6/+6
2010-08-01Remove isActive methods from NPC dialogs and InventoryWindowJared Adams10-25/+122
Uses counts in PlayerInfo instead. Reviewed-by: Chuck Miller
2010-08-01Remove isActive methods from buy/sell windowsJared Adams15-65/+140
Uses a state variable in PlayerInfo instead. Moves isTalking from Being to PlayerInfo. Also some small cleanups. Reviewed-by: Chuck Miller
2010-08-01Fix chat spoofing. Remove colors from nicks in public chat.Andrei Karas1-10/+29
Signed-off-by: Chuck Miller <shadowmil@gmail.com>
2010-08-01Reduce localChatTab presence replacing it with the event systemChuck Miller11-70/+58
Reviewed-By: Jared Adams
2010-07-30I forgot to tidy src/resources/spritedef.hYohann Ferreira1-33/+2
(Trivial)