summaryrefslogtreecommitdiff
path: root/src/game.cpp
AgeCommit message (Collapse)AuthorFilesLines
2024-01-26Merge branch 'master' into lpc2012lpc2012Thorbjørn Lindeijer1-4/+2
2024-01-25Minor includes cleanupThorbjørn Lindeijer1-2/+0
2024-01-25Ported to SDL2Thorbjørn Lindeijer1-2/+2
2012-08-02Crash fix when re-entering the gameThorbjørn Lindeijer1-0/+3
Throw away the old layout rather than trying to reuse it and crashing cause of collisions.
2012-08-02Split off minimap window from mini status window and repositioned themThorbjørn Lindeijer1-4/+7
2012-08-02Embedded the minimap into the mini status windowThorbjørn Lindeijer1-11/+7
2012-08-01Some positioning changes in the game UIThorbjørn Lindeijer1-10/+18
Moved player status bars to the top-right, next to the window menu. Used the layout for dynamic adjustments to screen resolution.
2012-07-31Removed the emote shortcut windowThorbjørn Lindeijer1-7/+0
We have no emotes for now, and we will never trigger them from such an ugly shortcut window anyway.
2012-02-09Allow changing fullscreen resolution without restartThorbjørn Lindeijer1-1/+1
Unified Graphics:setFullscreen and Graphics:resize into a single Graphics:changeVideoMode function that tries to restore the existing mode when changing to the new mode didn't work, and exists with an error when that also fails. Split up handling of SDL_VIDEORESIZE and the adapting to new resolution in the Client class, so that the second part could also be called when changing resolution fullscreen mode. The Video tab in the Setup window now also filters out any modes smaller than 640x480 since the game won't properly adapt to that resolution anyway. Reviewed-by: Yohann Ferreira
2012-01-26Updated copyrights to 2012Thorbjørn Lindeijer1-1/+1
2012-01-22Prevented looking at item when picking up while movingErik Schilling1-22/+4
+ Fixes from Bjorns review. Reviewed-by: Bjorn.
2012-01-22Allow resizing of the game in windowed modeThorbjørn Lindeijer1-3/+13
Window positions are semi-smartly corrected as a result of the resize. Not supported when using OpenGL on Windows for now. Reviewed-by: Yohann Ferreira
2012-01-16Renamed some file names for consistency with the class namesThorbjørn Lindeijer1-4/+4
This was already done by ManaPlus. It's a good idea anyway and it makes comparing the code a little easier. Reviewed-by: Yohann Ferreira
2012-01-14Don't lose the active target when pushing the target&attack key while moving.Yohann Ferreira1-2/+2
1st part of Mana-Mantis #441. Reviewed-by: Bjorn
2012-01-10player_node -> local_playerYohann Ferreira1-31/+31
Reviewed-by: Ablu
2012-01-09Added a close button to the npc dialog window.Yohann Ferreira1-2/+12
The close button will only display when the window is waiting for the server, so that crashed windows can be closed without restarting the client. Pushing the QUIT key (Escape by default) will also close the crashed windows in that case. I also fixed a memleak with the "next" button. Resolves: Mana-Mantis #72, 93, 389. Reviewed-by: Ablu.
2011-08-19Merge git://gitorious.org/~bertram/mana/mana-equipment-fix into equipment-fixYohann Ferreira1-9/+1
2011-08-18Made the equipment window not use server specific code again.Yohann Ferreira1-9/+1
I also made the number of slots displayed taken from the equip.xml file for manaserv.
2011-08-11The shortcuts are now refreshed when reassigning keys.Yohann Ferreira1-1/+0
2011-06-17First pass on removing tile hard coded values.Yohann Ferreira1-0/+16
Every files has been checked against the hard coded 32 values except the map.cpp file. I also added convenience functions in the Game class, centralized the default item icon size, and removed two unused defines in being.cpp.
2011-06-16Remove useless ping packetBen Longbons1-11/+0
The comment in game.cpp about the server waiting for this is a lie. Reviewed-by: Bertram.
2011-06-02Some work on the manaserv equipment backendThorbjørn Lindeijer1-7/+5
Currently the same equipment window is used as for tmwAthena so that at least something is visible. This means the location of equipped items is currently illogical. It is now possible to equip and unequip items. Mantis-issue: 164 Reviewed-by: Stefan Dombrowski
2011-05-20Removing KEY_PATHFIND and moving its function into the debug windowStefan Dombrowski1-5/+0
* The f-key is no longer used. That means new players are less likely to get into trouble by accidentally activating the debug mode. * The debug mode can now be activated in a new tab in the debug window. * The main advantage of using a gui is its extensibility. At the moment the debug mode does show too much information at once. In a follow-up patch the user should get more choices. Reviewed-by: Bjorn
2011-04-30Fixed disconnected dialog to only pop up onceThorbjørn Lindeijer1-2/+4
Bug introduced in 88934303761ba950be56eac8b60de2dede88a29f and spotted by Stefan Dombrowski. Reviewed-by: Stefan Dombrowski Reviewed-by: Yohann Ferreira
2011-04-26Made the client use a unique kind of movement code.Yohann Ferreira1-26/+35
This is fixng many issues and (hopefully) will make the movement rendering much smoother. Merge branch 'master' of gitorious.org:~bertram/mana/mana-movement-code-merge Conflicts: src/being.cpp src/net/manaserv/beinghandler.cpp Resolves: TMW-Mantis #946. Reviewed-by: Thorbjorn.
2011-04-18A bit of cleanup in the way the Client pops up error dialogsThorbjørn Lindeijer1-11/+3
No point in using mCurrentDialog for the OkDialog, since it will clean up after itself, as was pointed out in many places throughout the code. Now there are two convenience functions for popping up the OkDialog and having it change to a specified state afterwards. This also gets rid of the 4 different ActionListener classes that existed solely for this purpose. Reviewed-by: Yohann Ferreira
2011-04-16Introduced the Being::lookAt() function.Yohann Ferreira1-36/+35
We're now using it when picking up items. Also, de-overnested the Game::handleInput() function when handling pickups.
2011-04-11Implemented a simple non-blocking fadeOutAndPlay system.Yohann Ferreira1-2/+2
It's currently used when changing maps. Resolves: TMW-Mantis: #750. Reviewed-by: Thorbjorn.
2011-04-09Removed the Mana namespaceThorbjørn Lindeijer1-12/+12
It's just an annoyance when it's only applied to a few classes. Either we place everything in this namespace or nothing, and at the moment I don't see any rationale for placing everything in a Mana namespace. Acked-by: Jared Adams
2011-04-09Moved Channels to Mana::Event::ChannelThorbjørn Lindeijer1-11/+11
Acked-by: Jared Adams
2011-04-09Moved Events to Mana::Event::TypeThorbjørn Lindeijer1-11/+11
Acked-by: Jared Adams
2011-03-26Add search bar to storage and inventory windowsBlue Sans Douze1-1/+1
Reviewed-by: thorbjorn
2011-03-17Fixed pick up using keyboard for both servers.Yohann Ferreira1-20/+30
The character picks up one item at a time (to remain kinda realistic) and turns to the item picked up.
2011-02-01Merge branch '0.5'Thorbjørn Lindeijer1-3/+3
Conflicts: po/de.po src/game.cpp src/resources/wallpaper.cpp
2011-01-25Added a child class to the equipment window specialized for tAthena.Yohann Ferreira1-1/+11
(As requested by Thorbjorn.) Now the foundation to set up per-protocol equipment display is ready.
2011-01-22Fixing pick-up with joystickStefan Dombrowski1-3/+3
The pick-up with the joystick happend on the wrong tile. Bug was reported by Feufochmar on IRC.
2010-12-15Merge branch '0.5'Thorbjørn Lindeijer1-1/+2
2010-12-06Removed superfluous #includes taken from checkheaders list.Yohann Ferreira1-1/+0
Resolves: Mana-Mantis #265. Trivial fix.
2010-11-29Allow enter OK button key in input field.Andrei Karas1-1/+2
By default OK shortcut is space key. Reviewed-by: Jaxad0127, Kage
2010-11-11Replace Event names with enums instead of stringsChuck Miller1-11/+11
2010-11-11Have the event system channels use enums instead of stringsChuck Miller1-11/+11
Reviewed-by: Freeyorp
2010-11-01Merge branch '0.5' of gitorious.org:mana/manaYohann Ferreira1-9/+21
Conflicts: src/being.cpp src/client.cpp src/commandhandler.cpp src/gui/setup_video.cpp src/gui/socialwindow.cpp src/gui/viewport.cpp src/gui/widgets/browserbox.cpp src/gui/widgets/itemcontainer.cpp src/imageparticle.cpp src/localplayer.cpp src/localplayer.h src/map.cpp src/net/tmwa/beinghandler.cpp src/particle.cpp src/particle.h src/player.cpp src/player.h
2010-10-31Using tile coordinates for pick-upStefan Dombrowski1-7/+2
Since the tile coordinates are already avaible the calculation is not needed. Furthermore this avoids the correction of the tile, which was needed because the pixel coordinates are meant as coordinates for drawing the being. This resolves http://bugs.manasource.org/view.php?id=249 Reviewed-by: Thorbjorn
2010-10-14Disable showing of IP addresses while taking a screenshotMadCamel1-0/+15
This could potentially leak confidential information. Reviewed-by: cody
2010-10-08Remove the following systemStefan Dombrowski1-4/+0
Removed due to unresolved social issues. In master it had been already removed by Kage in commit 89f192b9039f9c000515f0a12f4bb9fb55c4691c.
2010-10-04Remove the following systemChuck Miller1-4/+0
The implamentation is poor, and this is something that would be better handled by the addon engine later down the road. Reviewed-By: Freeyorp < Freeyorp101@hotmail.com >
2010-09-25Merge branch '1.0'Thorbjørn Lindeijer1-8/+13
Conflicts: src/actorspritemanager.h src/beingmanager.cpp src/game.cpp src/gui/beingpopup.cpp src/gui/chat.cpp src/gui/chat.h src/gui/inventorywindow.h src/gui/itempopup.cpp src/gui/socialwindow.cpp src/gui/statuswindow.cpp src/gui/widgets/chattab.cpp src/gui/widgets/chattab.h src/net/tmwa/inventoryhandler.cpp src/net/tmwa/partyhandler.cpp src/party.cpp src/sound.cpp src/utils/stringutils.cpp src/utils/stringutils.h
2010-09-13Avoid loading non-existing music and minimapsStefan Dombrowski1-1/+6
Reviewed-by: Thorbjorn
2010-09-07Fixing reconnection after lost connectionStefan Dombrowski1-4/+4
An orderly disconnect of the map-server does work fine. Then in Game::logic() an OkDialog is created, which triggers an event that set the state to STATE_CHOOSE_SERVER. Upon an unexpected disconnect the same OkDialog is created, but the player does not see it. That is because the state gets changed to STATE_ERROR, which creates another OkDialog. It changes the state to STATE_CHOOSE_SERVER as well, but the ServerDialog does not take any input. Reviewed-by: Jaxad0127
2010-08-29Changing order in which windows are createdStefan Dombrowski1-2/+2
The mini status window is higher than its visible area. Creating it first makes sure that it does not overlap other windows. For example put the equipment window right below the mini status window. After a restart you cannot use the close button nor drag it, because you are actually clicking on the mini status window. Signed-off-by: Jared Adams <jaxad0127@gmail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-11 23:00:49 +0000