summaryrefslogtreecommitdiff
path: root/src/resources
AgeCommit message (Collapse)AuthorFilesLines
2009-04-09Fixed some warningsBjørn Lindeijer1-4/+13
Unused variable, compiler suggested braces to disambiguate an else statement and another comparision between signed and unsigned integers.
2009-04-08Add a more flexible wallpaper systemJared Adams2-0/+152
2009-03-30Add a logging statement before trying to load mapsJared Adams1-0/+1
There is a rare segfault between this and the next logging statement, I think it's a bad map name. This will help test that.
2009-03-30Merge weapon typesJared Adams3-27/+0
2009-03-30Merge item types to remove more #ifdefsJared Adams2-15/+0
2009-03-27Merge branch 'aethyra/master'Bjørn Lindeijer3-13/+34
Conflicts: src/beingmanager.cpp src/gui/confirm_dialog.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/label.cpp src/gui/label.h src/gui/popup.cpp src/gui/popup.h src/gui/scrollarea.cpp src/gui/skin.cpp src/gui/skin.h src/gui/speechbubble.cpp src/gui/window.cpp src/gui/window.h src/localplayer.h src/main.cpp src/net/ea/playerhandler.cpp src/resources/ambientoverlay.h src/resources/dye.cpp src/resources/imagewriter.cpp src/resources/itemdb.cpp src/shopitem.cpp
2009-03-26Some code style commits influenced by TMW commitIra Rice5-24/+46
1715d0afe44a282a356ca88e47c92ec556f094dd Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-27Removed the unused BuddyList classBjørn Lindeijer2-200/+0
This class would store the buddy list in a file on the client, which is really not that useful. It was removed before in d268447e18c6e3edd80658f8f8d4317740c33af9, but apprently had come back with the merge with mainline.
2009-03-27Fixed include structure in resource/ directoryBjørn Lindeijer39-203/+199
There is also a new rule that trivial constructors and destructors should no longer be trivially "documented", since this just takes up space with no gain.
2009-03-26Fixed duplicate check for item namesBjørn Lindeijer1-4/+4
2009-03-27Fixed duplicate check for item namesBjørn Lindeijer1-4/+4
2009-03-26Fixes to file headers and header guardsBjørn Lindeijer2-11/+11
Mostly removal of branding for tmwserv related files, as was done for the eAthena client before.
2009-03-25A host of code style fixesBjørn Lindeijer9-18/+18
Mostly putting & and * in the right place and making some getters const.
2009-03-25Merge branch 'origin/master'Bjørn Lindeijer2-4/+0
Conflicts: .mailmap
2009-03-25Merge branch 'eathena/master'Bjørn Lindeijer8-34/+145
Conflicts: A lot of files.
2009-03-25Relaxed collision and fringe naming slightly so that they just need toIra Rice1-3/+4
start with collision or fringe, instead of being required to be the same case throughout the beginning of the layer name. Also made a default name for popup menus so that their skins can also be changed by users. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-24Remove some unneeded #ifdefs in SpriteDefJared Adams2-4/+0
2009-03-23Merge branch 'aethyra/master'Bjørn Lindeijer5-14/+102
Conflicts: Many files.
2009-03-22Merged the tmwserv client with the eAthena clientBjørn Lindeijer13-75/+526
This merge involved major changes on both sides, and as such took several weeks. Lots of things are expected to be broken now, however, we now have a single code base to improve and extend, which can be compiled to support either eAthena or tmwserv. In the coming months, the plan is to work towards a client that supports both eAthena and tmwserv, without needing to be recompiled. Conflicts: Everywhere!
2009-03-17Added an image merge feature loosely based on a merge function found inIra Rice2-2/+87
the open source project Wormux. To improve SDL performance, the number of layers that are pushed out to the hardware or software buffers should be reduced, which is where this function comes into play, as it combines two surfaces together so that the number of blit operations is reduced. This function is currently not used, but will be used once a good way to link each of the target systems is determined so that it only initiates when SDL is enabled, as well as making sure that each hook that uses this function is benefiting from it sufficiently. At the moment, it's suspected that the particle engine will likely be the most likely to benefit from this function, followed by tile drawing, then sprite drawing. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-16Rename the old Palette class to DyePaletteSteve Cotton2-10/+10
Having two classes called Palette makes the program crash, when compiled without optimisation.
2009-03-16Code reformattingSteve Cotton2-6/+6
Cherry-picking changes from Bjørn's 1b3cb122be1a418ce82b66fb9ce1ecf3aa5813fb Mainly making sure 'const std::string &' is used everywhere instead of 'std::string const &'. The former has always been the preferred order in this project.
2009-03-12Move emote sprite loading into EmoteDBJared Adams2-10/+23
2009-03-12Move emote sprite loading into EmoteDBJared Adams2-10/+23
2009-03-11Only check for name and descriptions in items with positive ID's in theIra Rice1-2/+5
ItemDB. This helps reduce the junk logging for the player and hair sprites. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-03-06Merge branch 'aethyra/master'Bjørn Lindeijer3-9/+18
Conflicts: src/being.cpp src/being.h src/floor_item.cpp src/floor_item.h src/flooritemmanager.cpp src/gui/inventorywindow.cpp src/gui/inventorywindow.h src/gui/itemcontainer.cpp src/gui/popupmenu.cpp src/net/beinghandler.cpp src/npc.cpp
2009-03-02Added particle attacks back on to the players. However, instead of beingIra Rice3-9/+18
constant, particle attacks are now weapon specific, so that different weapons can have different attacks. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer2-8/+3
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-18Introduced a toLower method and grouped string utilsBjørn Lindeijer2-8/+3
The string utility methods are now grouped together in the stringutils.h header. Also, a toLower method was added for convenience.
2009-02-15Removed unnecessary parenthesis at constructorsBjørn Lindeijer5-6/+6
When not passing any parameters to constructors, there is no reason for using parenthesis.
2009-02-15Merge commit 'aethyra/master'Bjørn Lindeijer8-214/+13
Conflicts: CMakeLists.txt configure.ac data/help/header.txt packaging/windows/setup.nsi po/POTFILES.in src/being.cpp src/being.h src/game.cpp src/gui/color.cpp src/gui/color.h src/gui/equipmentwindow.h src/gui/popupmenu.cpp src/gui/recorder.cpp src/gui/setup_colors.h src/gui/setup_keyboard.cpp src/gui/setup_keyboard.h src/gui/skill.cpp src/gui/speechbubble.cpp src/gui/speechbubble.h src/gui/table.cpp src/keyboardconfig.cpp src/keyboardconfig.h src/localplayer.cpp src/main.cpp src/main.h src/map.cpp src/resources/colordb.cpp src/resources/colordb.h src/resources/emotedb.cpp src/resources/emotedb.h src/text.cpp src/text.h src/tmw.rc src/winver.h
2009-02-13Fixed a break in building for non-mac users which was caused by usingIra Rice2-2/+2
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-13Added in mac build support, contributed to us by allenmoatallen> fromIra Rice2-1/+8
Legends of Mazzeroth. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Don't make log statements translatableBjørn Lindeijer5-31/+34
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-2/+2
2009-02-10Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Fixed header files, as well as removed the unused buddy list class (notIra Rice44-300/+130
useful since buddy lists are tracked through the player relation interface instead) Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-11Removed many pointless comparisons with NULLBjørn Lindeijer1-1/+1
Sometimes it's nice for clarity, but most of the time this is just clutter. C++ != Java. :)
2009-02-10Use string::empty() instead of comparing to ""Bjørn Lindeijer1-2/+2
2009-02-10Fixed copyright headers for emote and color DBsBjørn Lindeijer4-28/+28
2009-02-10Don't make log statements translatableBjørn Lindeijer5-28/+31
The log is mainly used to aid the developers, hence shouldn't be translated to the user's local language. Also introduces unnecessary work for all translators.
2009-02-10Merge branch 'aethyra/master'Bjørn Lindeijer2-13/+1
Conflicts: docs/FAQ.txt packaging/windows/make-translations.vbs src/Makefile.am src/gui/colour.cpp src/gui/colour.h src/gui/popupmenu.cpp src/gui/setup_colours.h src/main.cpp src/main.h src/resources/resourcemanager.cpp src/text.cpp src/text.h src/textmanager.cpp src/textmanager.h
2009-02-09Removed a getImage() function I added. Considered renaming it toIra Rice1-12/+0
getBaseImage() instead, but after looking at it a bit more, I can't particularly see anything that this can be used for yet. Was originally added when I was toying around with an idea for how to get image transparency to work under SDL, but which ended coming up busted. Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Mostly whitespace fixesBjørn Lindeijer7-13/+14
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Changed AETHYRA_DATADIR to PKG_DATADIR.Ira Rice1-1/+1
Signed-off-by: Ira Rice <irarice@gmail.com>
2009-02-09Merged with Aethyra master as of 2009-02-09Bjørn Lindeijer19-62/+55
Conflicts: A lot of files...
2009-02-09Mostly whitespace fixesBjørn Lindeijer7-12/+12
Removed tab characters and trailing spaces and added spaces between "if(", "for(", "while(" and "switch(".
2009-02-09Merged with Aethyra master as of 2009-01-27Bjørn Lindeijer41-185/+580
Conflicts: Almost everywhere.
2009-02-09Mostly whitespace and formatting changesBjørn Lindeijer2-2/+5
(merged from eAthena client)
2009-02-07Some more include cleanups.Ira Rice17-23/+11
Signed-off-by: Ira Rice <irarice@gmail.com>
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-03 06:38:53 +0000