summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
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-29Removed a few now unnecessary data files.Ira Rice5-6/+0
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-29Added support for True Type Fonts using GUIChan's inbuilt SDLTrueTypeIra Rice22-67/+1078
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-28Fixed some dangling diffs that never got fixed.Ira Rice2-59/+1
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-27Adjusted compiling script to work for the most recent git version.Ira Rice1-3/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-27Adapted setup.nsi to 0.0.27 and added instructionsIra Rice3-32/+43
readme.txt explains a bit about how to build the Windows installer. Conflicts: packaging/windows/setup.nsi Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-26Moved debian packaging scripts to packaging directoryIra Rice15-36/+531
Conflicts: debian/aethyra.docs debian/aethyra.sgml debian/tmw.docs debian/tmw.sgml packaging/debian/tmw.docs packaging/debian/tmw.sgml Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-26Added Windows NSIS installer scriptsEugenio Favalli3-0/+237
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-14Merge branch 'master' of git@gitorious.org:tmw/aethyraIra Rice12-20/+19
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-09Changed a few references to the SVN so that it uses www.aethyra.org instead ↵Victor Fury12-20/+19
of 209.168.213.109 Changed a few references to aethyra.com to the appropriate aethyra.org values. There's a few other minor changes that mostly just replace references to TMW that are not essential with Aethyra references.
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-07Fixed a few help files that got messed up a few commits ago.Ira Rice4-87/+4
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Added some initialization and removed ChargeDialogIra Rice9-126/+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-07Fixed a few files that apparently weren't updated.Ira Rice5-16/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-07Merge commit 'a7c21e6f8add37af7412449742ec55c8daa8571a'Ira Rice109-452/+7740
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 statuseffectsFate12-137/+191
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/eathenaFate11-96/+137
2008-12-06Fixes to the /w commandFate1-2/+4
2008-12-06Fix background on resolutions other than 800x600Bjørn Lindeijer1-1/+10
The image is now centered and a gray background is drawn behind it so that parts that are not covered by the image don't show redrawing issues.
2008-12-06Prevent the player from continuing to walk after opening a NPC dialog.Ira Rice1-0/+3
This used to be caused by right clicking on an NPC, then clicking on it and telling the sprite to move at the same time. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Fixed NPC dialogs so that they properly wrap. Broken by the last cherryIra Rice1-0/+5
commit. Signed-off-by: Ira Rice <irarice@gmail.com>
2008-12-06Fixed wrapping in some cases, removed draw methodBjørn Lindeijer4-57/+24
The 'draw' method was confusingly named, and was actually for updating the GUI after a resize. Its functionality has been merged into 'widgetResized'. The wrapping was broken in the case where text was added to the NPC dialog, cause it was added to an already wrapped string, causing the wrapping to become permanent. Sorry for all the reformatting. Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 16:58:46 +0000