summaryrefslogtreecommitdiff
path: root/src/gui
AgeCommit message (Collapse)AuthorFilesLines
2013-05-24Merge remote-tracking branch 'origin/master' into lpc2012 branchPrzemysław Grzywacz1-1/+1
2013-05-09Changed default serverlist.xml URL to avoid redirectThorbjørn Lindeijer1-1/+1
Previously the redirect was from www.manasource.org to manasource.org.
2013-05-02Fixed the shortcut window positionThorbjørn Lindeijer1-1/+1
It's meant to be fixed to the bottom-right.
2013-05-02Merge branch 'master' into lpc2012Thorbjørn Lindeijer4-59/+83
This merge reverts change 3b22c2cf170c877904dcef5a4af03ac360bd0581. Conflicts: src/gui/charcreatedialog.cpp src/net/manaserv/manaserv_protocol.h
2013-04-30Hide attribute sliders on character creation when appropriateThorbjørn Lindeijer2-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-29Single xml solution - compatibility with skill-set and special-setPrzemysław Grzywacz1-1/+2
Mana-mantis: #506.
2013-04-27Added support for charcreation.xml settingsThorbjørn Lindeijer1-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-13Removed unused IntMap typedefThorbjørn Lindeijer1-2/+0
2013-02-20Merge branch 'master' into lpc2012Erik Schilling3-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-14Can now build using cmake on OSXSocapex1-4/+0
Tested-by: Frost.
2012-08-14Can now build using cmake on OSXSocapex1-4/+0
Tested-by: Frost.
2012-08-12Fixed coding style in specialswindowErik Schilling1-16/+18
Reviewed-by: Thorbjørn Lindeijer.
2012-08-12Improved the layout of the specials windowThorbjørn Lindeijer2-25/+8
And removed the unused TabbedArea. Reviewed-by: Erik Schilling
2012-08-12Removed ImageLoader and ProxyImage classesThorbjørn Lindeijer1-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-08Changed to using delete_all instead of a loopTom Leese1-8/+2
Reviewed-by: Erik Schilling.
2012-08-07Fixed issue where previous special entries were drawn underneathTom Leese1-0/+7
Reviewed-by: Erik Schilling.
2012-08-05Removed all the hardcoded sizes of the various setup tabsThorbjørn Lindeijer19-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-05Add a checkbox to the debugging window to show being ids.Stefan Beller2-1/+42
Reviewed-by: Ablu Conflicts: src/gui/viewport.cpp
2012-08-04Fixed compile with MinGW/G++ 4.6.2Thorbjørn Lindeijer1-1/+1
It does not know 'ushort', and this variable should be 'size_t' anyway.
2012-08-02Removing constructor of DebugSwitches.Stefan Beller1-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-02Add a checkbox to the debugging window to show being ids.Stefan Beller2-1/+42
Reviewed-by: Ablu
2012-08-02Crash fix when re-entering the gameThorbjørn Lindeijer2-0/+12
Throw away the old layout rather than trying to reuse it and crashing cause of collisions.
2012-08-02Dynamically scaling background for login screenThorbjørn Lindeijer2-0/+47
Hacked Graphics::drawRescaledImage a bit to make it work...
2012-08-02Made download progress colorableErik Schilling1-1/+2
2012-08-02Tweaked default positions of chat and shortcut windowThorbjørn Lindeijer2-4/+4
Added some margin and made the shortcut window not movable/resizable.
2012-08-02Split off minimap window from mini status window and repositioned themThorbjørn Lindeijer4-46/+128
2012-08-02Changed default position and size of shortcut windowThorbjørn Lindeijer1-3/+4
2012-08-02Revert "Changed default position and size of chat window"Thorbjørn Lindeijer1-1/+1
This does not seem like a good idea at the moment. This reverts commit 7d0ba78e45a6f8d0e99dcde2a2f06fa98dfbee83.
2012-08-02Changed default position and size of chat windowThorbjørn Lindeijer1-1/+1
Moved it to the top-right.
2012-08-02[Hack] Removed emotion buttonjurkan1-1/+1
2012-08-02Removing the need to press space twice to close a dialog (probably a hack)jurkan1-0/+1
2012-08-02Embedded the minimap into the mini status windowThorbjørn Lindeijer4-91/+65
2012-08-01Some positioning changes in the game UIThorbjørn Lindeijer8-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-01Removed unused TabbedArea from SpecialsWindowThorbjørn Lindeijer2-15/+0
2012-08-01Improved the layout of the specials windowThorbjørn Lindeijer1-10/+8
Just in case I don't get around to do anything better...
2012-08-01Resized minimap + fixed clipErik Schilling1-7/+8
2012-08-01Fixed compile error when not compiling in C++11 modeThorbjørn Lindeijer1-1/+1
Qualifying enum values by the name of the enumeration is a C++11 feature.
2012-08-01Modify the NPC Dialog to be more RPG-LikeChuck Miller4-239/+144
2012-07-31Removed ImageLoader and ProxyImage classesThorbjørn Lindeijer1-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-30Hacked away the sliders in the character create dialog. Better not try ↵Erik Schilling1-6/+4
connecting to tmwAthena server.
2012-07-26Removed player box from the equipment windowThorbjørn Lindeijer1-9/+0
2012-07-26Fixed height of item popup that shows no itemThorbjørn Lindeijer1-1/+1
2012-07-26Removed UI to manually increase skillsThorbjørn Lindeijer2-19/+1
2012-07-26Fixed the dimensions of the popup/tooltipThorbjørn Lindeijer4-29/+21
2012-07-25Reduced the height of the Setup windowThorbjørn Lindeijer20-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.
2012-07-25Fixed UI layout after changing resolution in Setup dialogThorbjørn Lindeijer1-1/+2
It was doing the relayout using the unscaled screen dimensions.
2012-07-25Corrected the minimum height shown in the video optionsThorbjørn Lindeijer1-1/+1
Actually for me it doesn't list 640x360 anyway, but it might for some people I guess.
2012-07-22Replaced font with DejaVu Serif CondensedThorbjørn Lindeijer1-2/+2
Looks nicer in the game in my opinion.
2012-07-20Removed options to configure particle and ambient effectsErik Schilling2-128/+4
As discussed on IRC we agreed to remove the particle and ambients effects options. They are important for the game play and should stay enabled. Also moved the remaining options right to the resolution selection since there is enough space for them now. Change is tested. Reviewed-by: bjorn.
2012-07-17Enabled specials window by defaultErik Schilling1-2/+1
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-10-01 09:07:30 +0000