summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2009-01-05Image alpha should also be set to 1, in case it was changed before.Bjørn Lindeijer2-8/+8
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
2009-01-05Added support for alpha blending to true type font drawing.Philipp Sehmisch1-0/+7
(cherry picked from mainline commit 89a1dcb59be3e531cc0761c32d1aa70e141d4a12)
2009-01-05Fixed double-free of true-type resources.Guillaume Melquiond1-2/+5
(cherry-picked from mainline)
2009-01-05Modified the Aethyra client to use the TMW TrueType class, rather thanEugenio Favalli7-338/+246
the inbuilt GUIChan TrueType class. (Didn't use it originally because I didn't see the difference, when there's a considerable speedup, and that originally the import for TMW was broken code at the time, which has been fixed since.)
2009-01-05Fixed browser box so that it'd work again.Ira Rice2-51/+26
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Changed smiley window to say emote. (I like emote better, so that'sIra Rice1-2/+2
why. :P) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Added emote window button.Ira Rice1-0/+6
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-01-05Made trade window resizableBjørn Lindeijer4-27/+51
Also fixed overlap between description label and the buttons and added the SDL_ttf library to the Code::Blocks project file.
2009-01-05Made an option around the syncing, but no way to change it for now.Bjørn Lindeijer1-3/+1
(cherry picked from mainline commit f6f8b2f885145d4cacf7a6c42d88b6a39f71b366) Conflicts: src/openglgraphics.cpp
2009-01-05Merged Vector class improvements from mainlineBjørn Lindeijer1-0/+1
2009-01-05Renamed PATH_NODE to Position as on mainlineBjørn Lindeijer8-38/+126
2009-01-05Handling gender with an enum everywhere.Philipp Sehmisch14-39/+45
(cherry picked from mainline commit d3adc61aa4b4924f82d8cbc23bea26da7257da97) Conflicts: src/net/beinghandler.cpp src/net/charserverhandler.cpp src/player.cpp src/player.h
2009-01-05Refactor the way in which browser box text is drawn and wrapped.Björn Steinbrink2-94/+151
(cherry picked from mainline commit ecabe82d8720689905a6d035b0597d97037287c7) Conflicts: src/gui/browserbox.cpp
2009-01-04Smiley step 1.91, the little part to make it workForge4-9/+36
TODO list of 1.9 still intact.
2009-01-04Smiley track: step 1.9Forge10-15/+1202
The window listing the smiley is ok (F11). The window for shortcut of smiley is in progress (F12) So far, you can use any available smiley directly (mouse interface) and can get a reminder of the keybinding in the shortcut window. Yet to be done (for final step 2.0): * Transform the keybinding into the actual mapping of the shortcut seen in F12 * Drag & Drop from F11 to F12 windows and from F12 to F12 * Code factorisation for class ShortcutContainer and derivatives Item & Smiley (so far, most code is shared, but actually in 3 places, should keep only specific code in leaf-class, and main code in parent) Revision of copyright message (so far, only a cut-paste of inspiring previous files) * Save shortcut-smiley mapping on exit (and reload on start) (with protection against changing smiley-list)
2009-01-02Step 1.5 of smiley update: allow usage of same key for smiley andForge3-462/+460
different purpose (as smiley are requiring a special key press, that's not a problem to assign the same key to differents purpose) The function of game.cpp get reindented in the process, but the actual change is minor. The keyboardconfig get a new function, returning directly the emoticon offset from the key pressed. (later, that function will return the index of the smiley shortcut/array that has been selected... later) Signed-off-by: Forge <jgrimbert@free.fr>
2009-01-01Customisable shortkey for smiley (defaulting to keypad 0-9/*)Forge3-27/+77
First step to more smileys... Fully functionnal, very minor modifications Provisions made for second step (windows for choosing smiley) Signed-off-by: Forge <jgrimbert@free.fr>
2008-12-29Fixed a video resolution switching crash.Ira Rice1-1/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Removed a duplicate file that was overlooked.Ira Rice1-171/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Removed TMW's truetype file, since we don't use it (accidentaly left itIra Rice1-2/+0
in) Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice14-65/+1055
class. NOTE: This commit adds a brand new dependency (SDL_TTF). Make sure to install it, regenerate your config files, reconfigure, and then install before attempting to compile. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-27Remove ../ from tileset files.Ira Rice1-1/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-26Fixed a potential leak in setup, changed the default border color toIra Rice8-17/+47
white for wallpapers (matches our wallpapers better), and fixed the effect manager. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-21Fixed wallpaper selection to be handled correctly.Ira Rice1-3/+3
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-20Enabled video mode switching, as well as got rid of an old, unneededIra Rice4-15/+43
check in the ColorDB. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-14Code reformatting to conform to line lengthBjørn Lindeijer1-151/+160
(cherry picked from mainline) Conflicts: src/game.cpp
2008-12-14Passing vectors by referencePhilipp Sehmisch2-318/+317
2008-12-14Some systactical sugar for 864e33Philipp Sehmisch2-18/+9
2008-12-14Fixed follow-parent of nested and being-following particle emittersPhilipp Sehmisch6-45/+62
2008-12-10Obscure precise home directory name when making screenshotsFate1-9/+14
2008-12-09Fixed two issues with the chat message parsingBjørn Lindeijer1-6/+17
Don't treat anything starting with "Welcome" as a server message, for example messages starting with a name that starts with "Welcome" shouldn't belong in that category. Put the nick in the right place for global announcements. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-09Make the window shortcuts configurableJared Adams4-18/+52
2008-12-08Small maps used to scroll as well as big maps. Fixed.Ira Rice1-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08An attempt to fix the crashes related to particlesBjørn Lindeijer1-2/+7
The player character is never deleted, and hence might have particles still active when the map changes. These particles are deleted on map change, but when the player character was moved, it was trying to mark these deleted particles for deletion, writing to unallocated memory. The marking for deletion by the player character now happens before the particles are deleted. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-08Code reformattingBjørn Lindeijer12-198/+128
I wish I had never fallen for this weird style, and I hope removing it will prevent others from introducing new code like this. :-)
2008-12-08Fixed speech bubbles, which broke on the last merger.Ira Rice1-0/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Compacted the inventory window layout.Ira Rice2-22/+8
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-08Clip the minimap image to within its windowBjørn Lindeijer1-10/+14
The image wasn't clipped so it would draw beneath the map name and on top of the window border.
2008-12-08Don't scroll past the edges of the minimapBjørn Lindeijer1-0/+12
When centering the minimap on the player, it would often happen that the minimap scrolled past its edge. Based on a patch by QOAL.
2008-12-07Added some initialization and removed ChargeDialogIra Rice8-124/+13
Many member variables of LocalPlayer were not being initialized properly. In general this shouldn't have caused any problems, but it's bad style. The ChargeDialog was removed. This class was long dead anyway. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl> Conflicts: src/Makefile.am src/game.cpp src/gui/chargedialog.cpp src/gui/chargedialog.h src/localplayer.cpp src/localplayer.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Fixed inconsistency in default window sizesBjørn Lindeijer9-20/+21
The default window sizes were all too small, since they were specified in content size. On pressing "Reset Windows", the sizes would be interpreted as such and apply alright. The inconsistency is now removed, and the default window sizes are always the size of the whole widget now, not just the contents. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
2008-12-07Fixed the minimap name field so that it works for us again. Since IIra Rice1-6/+4
originally ported this from TMW's trunk, and they later changed their mind on the minimap name property, this was broken on our maps. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Made minimap visible by defaultBjørn Lindeijer1-0/+2
Also remember its visibility state.
2008-12-07Tweaked some configuration defaultsBjørn Lindeijer3-10/+10
Scrolling is now a bit less lazy and the scroll radius is 0. In my opinion this is a better default. Framerate limiter is now off by default, since it makes the game appear a bit choppy. It's basically only useful for laptops anyway, and not too hard to find.
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice68-352/+1368
Conflicts: AUTHORS CMakeLists.txt ChangeLog INSTALL README aethyra.cbp configure.ac data/help/changes.txt data/help/commands.txt data/help/header.txt data/help/support.txt src/Makefile.am src/aethyra.rc src/being.cpp src/being.h src/equipment.cpp src/equipment.h src/floor_item.h src/game.cpp src/gui/buddywindow.cpp src/gui/char_select.cpp src/gui/char_server.cpp src/gui/chat.cpp src/gui/chat.h src/gui/equipmentwindow.cpp src/gui/equipmentwindow.h src/gui/gui.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/itemcontainer.h src/gui/minimap.cpp src/gui/ministatus.cpp src/gui/newskill.cpp src/gui/npc_text.cpp src/gui/npclistdialog.h src/gui/ok_dialog.cpp src/gui/setup_video.cpp src/gui/skill.cpp src/gui/skill.h src/gui/status.h src/gui/table_model.h src/gui/updatewindow.cpp src/gui/viewport.cpp src/inventory.cpp src/inventory.h src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/localplayer.h src/logindata.h src/main.cpp src/map.cpp src/monster.cpp src/monster.h src/net/beinghandler.cpp src/net/beinghandler.h src/net/buysellhandler.cpp src/net/equipmenthandler.cpp src/net/loginhandler.cpp src/net/loginhandler.h src/net/network.h src/net/npchandler.cpp src/net/playerhandler.cpp src/net/protocol.h src/net/tradehandler.cpp src/npc.cpp src/npc.h src/particleemitter.cpp src/particleemitterprop.h src/player.cpp src/player.h src/player_relations.cpp src/resources/imageset.cpp src/resources/imageset.h src/resources/itemdb.cpp src/resources/mapreader.cpp src/resources/monsterinfo.h src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h src/tileset.h src/utils/fastsqrt.h src/utils/strprintf.cpp src/winver.h tools/tmxcopy/Makefile tools/tmxcopy/base64.cpp tools/tmxcopy/base64.h tools/tmxcopy/tostring.h Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Defrobnicated ParticleContainer inheritance hierarchyFate3-31/+69
2008-12-06Merge branch 'master' into statuseffectsFate10-136/+187
2008-12-06Minor punctuation fix, merged earlier /whisper fix/help update with separate ↵Fate1-2/+2
fix for same issue
2008-12-06Merge branch 'master' of git@gitorious.org:tmw/eathenaFate9-95/+133
2008-12-06Fixes to the /w commandFate1-2/+4
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-19 12:45:12 +0000