diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-03-04 16:32:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-03-04 16:33:19 +0300 |
| commit | 8fd450f698f8277eb8348da914d3dcbc11890ea6 (patch) | |
| tree | ebaddac087d5e5b29f23a2aa01dd2758c3b8f68a /src/defaults.cpp | |
| parent | c6d7f7ed3d6d7827b820670faf6c48f0689fd5c2 (diff) | |
| parent | f74202392745923f9ce372a6bdcd0a45db6bcd08 (diff) | |
| download | plus-8fd450f698f8277eb8348da914d3dcbc11890ea6.tar.gz plus-8fd450f698f8277eb8348da914d3dcbc11890ea6.tar.bz2 plus-8fd450f698f8277eb8348da914d3dcbc11890ea6.tar.xz plus-8fd450f698f8277eb8348da914d3dcbc11890ea6.zip | |
Merge branch 'master' into stripped
Conflicts:
configure.ac
data/Makefile.am
data/fonts/liberationsans-bold.ttf
data/fonts/liberationsans.ttf
data/fonts/liberationsansmono-bold.ttf
data/fonts/liberationsansmono.ttf
data/themes/redandblack/CMakeLists.txt
data/themes/redandblack/Makefile.am
po/cs.po
po/de.po
po/es.po
po/fi.po
po/fr.po
po/id.po
po/ja.po
po/manaplus.pot
po/nl_BE.po
po/pl.po
po/pt.po
po/pt_BR.po
po/ru.po
po/zh_CN.po
src/guichan/color.cpp
src/guichan/defaultfont.cpp
src/guichan/focushandler.cpp
src/guichan/include/guichan/actionlistener.hpp
src/guichan/include/guichan/deathlistener.hpp
src/guichan/include/guichan/focushandler.hpp
src/guichan/include/guichan/focuslistener.hpp
src/guichan/include/guichan/graphics.hpp
src/guichan/include/guichan/keylistener.hpp
src/guichan/include/guichan/listmodel.hpp
src/guichan/include/guichan/mouselistener.hpp
src/guichan/include/guichan/sdl/sdlpixel.hpp
src/guichan/include/guichan/widget.hpp
src/guichan/include/guichan/widgetlistener.hpp
src/guichan/include/guichan/widgets/listbox.hpp
src/guichan/include/guichan/widgets/slider.hpp
src/guichan/sdl/sdlgraphics.cpp
src/guichan/sdl/sdlimage.cpp
src/guichan/widgets/scrollarea.cpp
src/guichan/widgets/slider.cpp
src/guichan/widgets/tabbedarea.cpp
src/guichan/widgets/textbox.cpp
src/guichan/widgets/window.cpp
src/net/manaserv/attributes.cpp
src/net/manaserv/beinghandler.cpp
src/net/manaserv/charhandler.cpp
src/net/manaserv/gamehandler.h
src/net/manaserv/inventoryhandler.cpp
src/net/manaserv/inventoryhandler.h
src/net/manaserv/itemhandler.cpp
src/net/manaserv/loginhandler.cpp
src/net/manaserv/network.cpp
Diffstat (limited to 'src/defaults.cpp')
| -rw-r--r-- | src/defaults.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/defaults.cpp b/src/defaults.cpp index b21941bfb..1ca64d4e6 100644 --- a/src/defaults.cpp +++ b/src/defaults.cpp @@ -226,6 +226,19 @@ DefaultsData* getConfigDefaults() AddDEF(configData, "enableresize", true); AddDEF(configData, "noframe", false); AddDEF(configData, "groupFriends", true); + AddDEF(configData, "grabinput", false); + AddDEF(configData, "usefbo", false); + AddDEF(configData, "gamma", 1); + AddDEF(configData, "vsync", 0); + AddDEF(configData, "enableBuggyServers", true); + AddDEF(configData, "soundwhisper", "newmessage"); + AddDEF(configData, "soundhighlight", "reminder"); + AddDEF(configData, "soundglobal", "email"); + AddDEF(configData, "sounderror", "error"); + AddDEF(configData, "soundtrade", "start"); + AddDEF(configData, "soundinfo", "notify"); + AddDEF(configData, "soundrequest", "attention"); + AddDEF(configData, "soundguild", "newmessage"); return configData; } @@ -260,6 +273,8 @@ DefaultsData* getBrandingDefaults() AddDEF(brandingData, "guiThemePath", "themes/"); AddDEF(brandingData, "fontsPath", "fonts/"); + AddDEF(brandingData, "systemsounds", "sfx/system/"); + AddDEF(brandingData, "wallpaperFile", ""); AddDEF(brandingData, "dataPath", ""); return brandingData; |