Age | Commit message (Collapse) | Author | Files | Lines | |
---|---|---|---|---|---|
2024-01-26 | Merge branch 'master' into lpc2012lpc2012 | Thorbjørn Lindeijer | 23 | -149/+171 | |
2024-01-25 | Fixed parent for OkDialog in social window | Thorbjørn Lindeijer | 1 | -1/+1 | |
2024-01-25 | Minor includes cleanup | Thorbjørn Lindeijer | 3 | -7/+0 | |
2024-01-25 | Ported to SDL2 | Thorbjørn Lindeijer | 14 | -129/+156 | |
2024-01-24 | Fixed compilation issues and use of deprecated C++ features | Thorbjørn Lindeijer | 9 | -12/+14 | |
* Fixed compiler errors due to dynamic exception specifications * Replace std::auto_ptr with std::unique_ptr * Replace std::mem_fun with std::mem_fn * Prefix for_each with std:: (apparently not needed before) * Just use lambda instead of std::bind2nd * Removed usages of std::unary_function | |||||
2013-05-24 | Merge remote-tracking branch 'origin/master' into lpc2012 branch | Przemysław Grzywacz | 1 | -1/+1 | |
2013-05-09 | Changed default serverlist.xml URL to avoid redirect | Thorbjørn Lindeijer | 1 | -1/+1 | |
Previously the redirect was from www.manasource.org to manasource.org. | |||||
2013-05-02 | Fixed the shortcut window position | Thorbjørn Lindeijer | 1 | -1/+1 | |
It's meant to be fixed to the bottom-right. | |||||
2013-05-02 | Merge branch 'master' into lpc2012 | Thorbjørn Lindeijer | 4 | -59/+83 | |
This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581. Conflicts: src/gui/charcreatedialog.cpp src/net/manaserv/manaserv_protocol.h | |||||
2013-04-30 | Hide attribute sliders on character creation when appropriate | Thorbjørn Lindeijer | 2 | -53/+69 | |
When the minimum and maximum values of the attributes are equal, then there is nothing for the player to customize and the sliders are not shown. At the same time the dialog has been fixed to resize properly to any number of modifiable attributes. | |||||
2013-04-29 | Single xml solution - compatibility with skill-set and special-set | Przemysław Grzywacz | 1 | -1/+2 | |
Mana-mantis: #506. | |||||
2013-04-27 | Added support for charcreation.xml settings | Thorbjørn Lindeijer | 1 | -0/+7 | |
This file was introduced by ManaPlus as a way of configuring the character creation process. It defines the number of hair styles and colors, how stat points should be divided and what the starting equipment of the player is. The minimum and maximum hair color/style IDs are not supported at the moment. This is mostly a backport of ManaPlus commits 10cf52b5 and dcc18eba, with some style changes. Mantis-issue: 501 Reviewed-by: Ablu | |||||
2013-04-13 | Removed unused IntMap typedef | Thorbjørn Lindeijer | 1 | -2/+0 | |
2013-02-20 | Merge branch 'master' into lpc2012 | Erik Schilling | 3 | -22/+34 | |
Conflicts: src/graphics.h src/gui/setup_video.cpp src/gui/specialswindow.cpp src/gui/viewport.cpp src/gui/widgets/container.cpp src/gui/widgets/container.h | |||||
2012-08-14 | Can now build using cmake on OSX | Socapex | 1 | -4/+0 | |
Tested-by: Frost. | |||||
2012-08-14 | Can now build using cmake on OSX | Socapex | 1 | -4/+0 | |
Tested-by: Frost. | |||||
2012-08-12 | Fixed coding style in specialswindow | Erik Schilling | 1 | -16/+18 | |
Reviewed-by: Thorbjørn Lindeijer. | |||||
2012-08-12 | Improved the layout of the specials window | Thorbjørn Lindeijer | 2 | -25/+8 | |
And removed the unused TabbedArea. Reviewed-by: Erik Schilling | |||||
2012-08-12 | Removed ImageLoader and ProxyImage classes | Thorbjørn Lindeijer | 1 | -5/+0 | |
They allowed using gcn::Image, which in turns allows using gcn::Icon and gcn::ImageFont, but none of this is actually used anymore. Reviewed-by: Erik Schilling | |||||
2012-08-08 | Changed to using delete_all instead of a loop | Tom Leese | 1 | -8/+2 | |
Reviewed-by: Erik Schilling. | |||||
2012-08-07 | Fixed issue where previous special entries were drawn underneath | Tom Leese | 1 | -0/+7 | |
Reviewed-by: Erik Schilling. | |||||
2012-08-05 | Removed all the hardcoded sizes of the various setup tabs | Thorbjørn Lindeijer | 19 | -81/+66 | |
Instead, support for dynamically adjusting layout was added to the Container class. Various other places were also adapted to use the new layout support in Container. Reviewed-by: Erik Schilling | |||||
2012-08-05 | Add a checkbox to the debugging window to show being ids. | Stefan Beller | 2 | -1/+42 | |
Reviewed-by: Ablu Conflicts: src/gui/viewport.cpp | |||||
2012-08-04 | Fixed compile with MinGW/G++ 4.6.2 | Thorbjørn Lindeijer | 1 | -1/+1 | |
It does not know 'ushort', and this variable should be 'size_t' anyway. | |||||
2012-08-02 | Removing constructor of DebugSwitches. | Stefan Beller | 1 | -15/+0 | |
The class DebugSwitches is a derived class from Container, 'which automatically deletes its child widgets, so there is no need for such fragile cleanup code.' acked-by: bjorn | |||||
2012-08-02 | Add a checkbox to the debugging window to show being ids. | Stefan Beller | 2 | -1/+42 | |
Reviewed-by: Ablu | |||||
2012-08-02 | Crash fix when re-entering the game | Thorbjørn Lindeijer | 2 | -0/+12 | |
Throw away the old layout rather than trying to reuse it and crashing cause of collisions. | |||||
2012-08-02 | Dynamically scaling background for login screen | Thorbjørn Lindeijer | 2 | -0/+47 | |
Hacked Graphics::drawRescaledImage a bit to make it work... | |||||
2012-08-02 | Made download progress colorable | Erik Schilling | 1 | -1/+2 | |
2012-08-02 | Tweaked default positions of chat and shortcut window | Thorbjørn Lindeijer | 2 | -4/+4 | |
Added some margin and made the shortcut window not movable/resizable. | |||||
2012-08-02 | Split off minimap window from mini status window and repositioned them | Thorbjørn Lindeijer | 4 | -46/+128 | |
2012-08-02 | Changed default position and size of shortcut window | Thorbjørn Lindeijer | 1 | -3/+4 | |
2012-08-02 | Revert "Changed default position and size of chat window" | Thorbjørn Lindeijer | 1 | -1/+1 | |
This does not seem like a good idea at the moment. This reverts commit 7d0ba78e45a6f8d0e99dcde2a2f06fa98dfbee83. | |||||
2012-08-02 | Changed default position and size of chat window | Thorbjørn Lindeijer | 1 | -1/+1 | |
Moved it to the top-right. | |||||
2012-08-02 | [Hack] Removed emotion button | jurkan | 1 | -1/+1 | |
2012-08-02 | Removing the need to press space twice to close a dialog (probably a hack) | jurkan | 1 | -0/+1 | |
2012-08-02 | Embedded the minimap into the mini status window | Thorbjørn Lindeijer | 4 | -91/+65 | |
2012-08-01 | Some positioning changes in the game UI | Thorbjørn Lindeijer | 8 | -50/+56 | |
Moved player status bars to the top-right, next to the window menu. Used the layout for dynamic adjustments to screen resolution. | |||||
2012-08-01 | Removed unused TabbedArea from SpecialsWindow | Thorbjørn Lindeijer | 2 | -15/+0 | |
2012-08-01 | Improved the layout of the specials window | Thorbjørn Lindeijer | 1 | -10/+8 | |
Just in case I don't get around to do anything better... | |||||
2012-08-01 | Resized minimap + fixed clip | Erik Schilling | 1 | -7/+8 | |
2012-08-01 | Fixed compile error when not compiling in C++11 mode | Thorbjørn Lindeijer | 1 | -1/+1 | |
Qualifying enum values by the name of the enumeration is a C++11 feature. | |||||
2012-08-01 | Modify the NPC Dialog to be more RPG-Like | Chuck Miller | 4 | -239/+144 | |
2012-07-31 | Removed ImageLoader and ProxyImage classes | Thorbjørn Lindeijer | 1 | -5/+0 | |
They allowed using gcn::Image, which in turns allows using gcn::Icon and gcn::ImageFont, but none of this is actually used anymore. | |||||
2012-07-30 | Hacked away the sliders in the character create dialog. Better not try ↵ | Erik Schilling | 1 | -6/+4 | |
connecting to tmwAthena server. | |||||
2012-07-26 | Removed player box from the equipment window | Thorbjørn Lindeijer | 1 | -9/+0 | |
2012-07-26 | Fixed height of item popup that shows no item | Thorbjørn Lindeijer | 1 | -1/+1 | |
2012-07-26 | Removed UI to manually increase skills | Thorbjørn Lindeijer | 2 | -19/+1 | |
2012-07-26 | Fixed the dimensions of the popup/tooltip | Thorbjørn Lindeijer | 4 | -29/+21 | |
2012-07-25 | Reduced the height of the Setup window | Thorbjørn Lindeijer | 20 | -83/+66 | |
Also removed all the hardcoded sizes of the various setup tabs. Instead, support for dynamically adjusting layout was added to the Container class. Various other places were also adapted to use the new layout support in Container. |