[gemrb] 02/03: Merge tag 'upstream/0.8.1'
Beren Minor
berenm-guest at moszumanska.debian.org
Sat Aug 30 14:07:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
berenm-guest pushed a commit to branch master
in repository gemrb.
commit 2fbbbf7ba2b1a471f06e6f6f9d0606638e498710
Merge: 5268c16 5d2273f
Author: Beren Minor <beren.minor+git at gmail.com>
Date: Thu Aug 14 22:19:29 2014 +0200
Merge tag 'upstream/0.8.1'
Upstream version 0.8.1
.gitignore | 1 +
.mailmap | 2 +-
.pydevproject | 7 -
AUTHORS | 30 +-
CMakeLists.txt | 121 +-
HACKING | 2 +-
INSTALL | 7 +-
NEWS | 13 +
TODO | 82 --
admin/gource-generator | 32 +-
android/GEMRB_Android.mk | 5 +-
android/GemRB.java | 9 +
android/TODO | 9 +-
android/packaged.GemRB.cfg | 324 ------
android/prep_env.sh | 57 +-
apple/AppleLogger.mm | 4 +-
apple/CMakeLists.txt | 6 +
apple/CocoaWrapper/ios/GEM_ConfController.m | 9 +-
apple/CocoaWrapper/ios/GEM_SDL_Keyboard.m | 3 +-
apple/CocoaWrapper/mac/CocoaWrapper.mm | 106 +-
apple/CocoaWrapper/mac/nibs/GemRB.xib | 753 ++++++++++++-
.../RGBAColor.h => apple/EmptyStringTransformer.h | 28 +-
apple/{config.h => EmptyStringTransformer.m} | 43 +-
apple/GemRB.xcodeproj/project.pbxproj | 224 ++--
apple/defaults.plist | 23 +
apple/ios/GemRB.cfg.newinstall | 3 -
apple/osx/Info.plist | 5 -
artwork/gemrb-logo-36px.png | Bin 1043 -> 0 bytes
artwork/gemrb-logo-48px.png | Bin 1325 -> 0 bytes
artwork/gemrb-logo-72px.png | Bin 2110 -> 0 bytes
artwork/gemrb-logo-glow-144px.png | Bin 0 -> 10241 bytes
artwork/gemrb-logo-glow-96px.png | Bin 0 -> 6469 bytes
cmake/cmake_config.h.in | 10 +-
cmake/modules/FindGLEW.cmake | 52 +
cmake/modules/FindSDL2.cmake | 181 +++
cmake/modules/FindSDL2_mixer.cmake | 88 ++
cmake/modules/config.cmake | 43 +
configure.in | 2 +-
demo/data/README | 7 +
demo/data/gemrb.ini | 1 +
gemrb.6.in | 5 -
gemrb/CMakeLists.txt | 4 +-
gemrb/GUIScripts/CommonWindow.py | 37 +-
gemrb/GUIScripts/CreateControlDecorators.py | 42 +
gemrb/GUIScripts/DualClass.py | 9 +-
gemrb/GUIScripts/GUIClasses.py | 17 +-
gemrb/GUIScripts/GUICommon.py | 81 +-
gemrb/GUIScripts/GUICommonWindows.py | 140 ++-
gemrb/GUIScripts/GUIDefines.py | 6 +
gemrb/GUIScripts/GUILOAD.py | 8 +-
gemrb/GUIScripts/{bg2 => }/GUIMA.py | 276 +++--
gemrb/GUIScripts/{bg2 => }/GUIMG.py | 71 +-
gemrb/GUIScripts/GUIOPT.py | 32 +-
gemrb/GUIScripts/GUIOPTControls.py | 18 +-
gemrb/GUIScripts/GUIPR.py | 11 +-
gemrb/GUIScripts/GUIREC.py | 47 +-
gemrb/GUIScripts/GUIRECCommon.py | 28 +-
gemrb/GUIScripts/GUISAVE.py | 13 +-
gemrb/GUIScripts/GUISTORE.py | 111 +-
gemrb/GUIScripts/GUIWORLD.py | 9 +-
gemrb/GUIScripts/GameCheck.py | 59 +
gemrb/GUIScripts/InventoryCommon.py | 79 +-
gemrb/GUIScripts/LUCommon.py | 5 +-
gemrb/GUIScripts/LUProfsSelection.py | 40 +-
gemrb/GUIScripts/LUSkillsSelection.py | 6 +-
gemrb/GUIScripts/LUSpellSelection.py | 26 +-
gemrb/GUIScripts/LevelUp.py | 29 +-
gemrb/GUIScripts/Portrait.py | 4 +-
gemrb/GUIScripts/Spellbook.py | 8 +-
gemrb/GUIScripts/TextScreen.py | 15 +-
gemrb/GUIScripts/bg1/CharGenGui.py | 19 +-
gemrb/GUIScripts/bg1/GUIINV.py | 76 +-
gemrb/GUIScripts/bg1/GUIMA.py | 301 -----
gemrb/GUIScripts/bg1/GUIMG.py | 357 ------
gemrb/GUIScripts/bg1/GUISONGS.py | 4 +-
gemrb/GUIScripts/bg2/CharGenCommon.py | 2 +
gemrb/GUIScripts/bg2/CharGenEnd.py | 22 +-
gemrb/GUIScripts/bg2/GUICG10.py | 3 +-
gemrb/GUIScripts/bg2/GUICG2.py | 3 +-
gemrb/GUIScripts/bg2/GUICG22.py | 3 +-
gemrb/GUIScripts/bg2/GUIINV.py | 71 +-
gemrb/GUIScripts/bg2/GUIJRNL.py | 3 +-
gemrb/GUIScripts/bg2/GUIMOVIE.py | 4 +-
gemrb/GUIScripts/bg2/GUISONGS.py | 4 +-
gemrb/GUIScripts/bg2/LUHLASelection.py | 3 +-
gemrb/GUIScripts/bg2/LoadScreen.py | 31 +-
gemrb/GUIScripts/bg2/MessageWindow.py | 29 +-
gemrb/GUIScripts/bg2/Start.py | 4 +-
gemrb/GUIScripts/bg2/Start2.py | 19 +-
gemrb/GUIScripts/ie_spells.py | 1 +
gemrb/GUIScripts/iwd/CharGen.py | 24 +-
gemrb/GUIScripts/iwd/GUIINV.py | 81 +-
gemrb/GUIScripts/iwd/GUIMA.py | 300 -----
gemrb/GUIScripts/iwd/GUIMG.py | 359 ------
gemrb/GUIScripts/iwd/MessageWindow.py | 3 +-
gemrb/GUIScripts/iwd/PartyFormation.py | 6 +-
gemrb/GUIScripts/iwd/Start.py | 8 +-
gemrb/GUIScripts/iwd2/GUIINV.py | 2 +-
gemrb/GUIScripts/iwd2/GUIJRNL.py | 37 +-
gemrb/GUIScripts/iwd2/GUIMA.py | 391 -------
gemrb/GUIScripts/pst/GUIINV.py | 30 +-
gemrb/GUIScripts/pst/GUILOAD.py | 2 +-
gemrb/GUIScripts/pst/GUIOPT.py | 11 +-
gemrb/GUIScripts/pst/GUISTORE.py | 55 +-
gemrb/GUIScripts/pst/Start.py | 2 +-
gemrb/core/Animation.cpp | 8 +-
gemrb/core/AnimationFactory.cpp | 15 +-
gemrb/core/CMakeLists.txt | 10 +-
gemrb/core/CharAnimations.cpp | 259 +++--
gemrb/core/CharAnimations.h | 26 +-
gemrb/core/ControlAnimation.cpp | 6 +-
gemrb/core/DialogHandler.cpp | 20 +-
gemrb/core/DialogHandler.h | 1 +
gemrb/core/Effect.h | 5 +-
gemrb/core/EffectQueue.cpp | 7 +-
gemrb/core/EffectQueue.h | 1 +
gemrb/core/Font.cpp | 145 +--
gemrb/core/Font.h | 9 +-
gemrb/core/GUI/Button.cpp | 179 ++-
gemrb/core/GUI/Button.h | 34 +-
gemrb/core/GUI/Console.cpp | 18 +-
gemrb/core/GUI/Console.h | 11 +-
gemrb/core/GUI/Control.cpp | 55 +-
gemrb/core/GUI/Control.h | 18 +-
gemrb/core/GUI/EventMgr.cpp | 19 +-
gemrb/core/GUI/EventMgr.h | 1 +
gemrb/core/GUI/GameControl.cpp | 1161 +++++++-------------
gemrb/core/GUI/GameControl.h | 44 +-
gemrb/core/GUI/Label.cpp | 35 +-
gemrb/core/GUI/Label.h | 8 +-
gemrb/core/GUI/MapControl.cpp | 73 +-
gemrb/core/GUI/MapControl.h | 11 +-
gemrb/core/GUI/Progressbar.cpp | 32 +-
gemrb/core/GUI/Progressbar.h | 8 +-
gemrb/core/GUI/ScrollBar.cpp | 175 ++-
gemrb/core/GUI/ScrollBar.h | 36 +-
gemrb/core/GUI/Slider.cpp | 40 +-
gemrb/core/GUI/Slider.h | 8 +-
gemrb/core/GUI/TextArea.cpp | 138 +--
gemrb/core/GUI/TextArea.h | 19 +-
gemrb/core/GUI/TextEdit.cpp | 47 +-
gemrb/core/GUI/TextEdit.h | 12 +-
gemrb/core/GUI/Window.cpp | 43 +-
gemrb/core/GUI/WorldMapControl.cpp | 53 +-
gemrb/core/GUI/WorldMapControl.h | 12 +-
gemrb/core/Game.cpp | 62 +-
gemrb/core/Game.h | 1 +
gemrb/core/GameData.cpp | 30 +-
gemrb/core/GameData.h | 6 +-
gemrb/core/GameScript/Actions.cpp | 109 +-
gemrb/core/GameScript/GSUtils.cpp | 113 +-
gemrb/core/GameScript/GSUtils.h | 4 +-
gemrb/core/GameScript/GameScript.cpp | 59 +-
gemrb/core/GameScript/GameScript.h | 148 +--
gemrb/core/GameScript/Matching.cpp | 18 +-
gemrb/core/GameScript/Triggers.cpp | 37 +-
gemrb/core/Image.h | 3 +-
gemrb/core/ImageFactory.cpp | 3 +-
gemrb/core/ImageMgr.cpp | 5 +-
gemrb/core/Interface.cpp | 303 +++--
gemrb/core/Interface.h | 26 +-
gemrb/core/InterfaceConfig.cpp | 4 +
gemrb/core/Inventory.cpp | 190 +---
gemrb/core/Inventory.h | 8 +-
gemrb/core/Item.cpp | 16 +-
gemrb/core/Map.cpp | 227 ++--
gemrb/core/Map.h | 19 +-
gemrb/core/Palette.cpp | 2 +-
gemrb/core/Palette.h | 13 +-
gemrb/core/Projectile.cpp | 20 +-
gemrb/core/Projectile.h | 9 +-
gemrb/core/Region.h | 6 +-
gemrb/core/SaveGameIterator.cpp | 1 -
gemrb/core/SaveGameIterator.h | 2 +-
gemrb/core/Scriptable/Actor.cpp | 247 +++--
gemrb/core/Scriptable/Actor.h | 15 +-
gemrb/core/Scriptable/Container.cpp | 21 +-
gemrb/core/Scriptable/Door.cpp | 29 +-
gemrb/core/Scriptable/InfoPoint.cpp | 14 +-
gemrb/core/Scriptable/PCStatStruct.cpp | 1 +
gemrb/core/Scriptable/Scriptable.cpp | 62 +-
gemrb/core/Scriptable/Scriptable.h | 14 +-
gemrb/core/ScriptedAnimation.cpp | 2 +-
gemrb/core/Spell.cpp | 1 +
gemrb/core/Sprite2D.cpp | 128 +--
gemrb/core/Sprite2D.h | 53 +-
gemrb/core/Store.cpp | 18 +-
gemrb/core/Store.h | 10 +-
gemrb/core/System/VFS.cpp | 2 -
gemrb/core/TileMap.cpp | 8 +-
gemrb/core/VEFObject.cpp | 296 +++++
gemrb/core/VEFObject.h | 78 ++
gemrb/core/Video.cpp | 183 +++
gemrb/core/Video.h | 40 +-
gemrb/core/WorldMap.cpp | 13 +-
gemrb/core/WorldMap.h | 5 +-
gemrb/docs/en/GUIScript/CreateScrollBar.txt | 5 +-
gemrb/docs/en/GUIScript/CreateWorldMapControl.txt | 3 +-
gemrb/docs/en/GUIScript/HasSpecialSpell.txt | 2 +-
gemrb/docs/en/GUIScript/ScrollBar_SetSprites.txt | 23 -
gemrb/docs/en/GUIScript/SetFeature.txt | 16 +
gemrb/docs/en/Tables/splspec.txt | 12 +
gemrb/docs/en/gemrb_ini.txt | 20 +-
gemrb/includes/RGBAColor.h | 12 +-
gemrb/includes/globals.h | 8 +-
gemrb/includes/opcode_params.h | 4 +
gemrb/override/how/drmtxt2.2da | 0
gemrb/override/iwd/drmtxt2.2da | 0
gemrb/override/iwd2/drmtxt2.2da | 0
gemrb/override/pst/drmtxt2.2da | 0
gemrb/override/pst/source/baldur.baf | 157 ---
gemrb/plugins/AREImporter/AREImporter.cpp | 84 +-
gemrb/plugins/AREImporter/AREImporter.h | 1 +
gemrb/plugins/BAMImporter/BAMFont.cpp | 6 +-
gemrb/plugins/BAMImporter/BAMFontManager.cpp | 4 -
gemrb/plugins/BAMImporter/BAMImporter.cpp | 23 +-
gemrb/plugins/BAMImporter/BAMSprite2D.cpp | 120 ++
.../BAMImporter/BAMSprite2D.h} | 69 +-
gemrb/plugins/BAMImporter/CMakeLists.txt | 2 +-
gemrb/plugins/BMPImporter/BMPImporter.cpp | 6 +-
gemrb/plugins/CHUImporter/CHUImporter.cpp | 118 +-
gemrb/plugins/CREImporter/CREImporter.cpp | 23 +-
gemrb/plugins/DLGImporter/DLGImporter.cpp | 14 +-
gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 97 +-
gemrb/plugins/GUIScript/GUIScript.cpp | 533 ++++-----
gemrb/plugins/ITMImporter/ITMImporter.cpp | 5 +
gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp | 152 ++-
gemrb/plugins/MUSImporter/MUSImporter.cpp | 5 +-
gemrb/plugins/MVEPlayer/mveaudiodec.cpp | 2 +-
gemrb/plugins/PNGImporter/PNGImporter.cpp | 3 +-
gemrb/plugins/PSTOpcodes/PSTOpcodes.cpp | 22 +-
gemrb/plugins/SDLVideo/CMakeLists.txt | 16 +-
gemrb/plugins/SDLVideo/GLPaletteManager.cpp | 194 ++++
gemrb/plugins/SDLVideo/GLPaletteManager.h | 51 +
gemrb/plugins/SDLVideo/GLSLProgram.cpp | 317 ++++++
gemrb/plugins/SDLVideo/GLSLProgram.h | 46 +
gemrb/plugins/SDLVideo/GLTextureSprite2D.cpp | 238 ++++
gemrb/plugins/SDLVideo/GLTextureSprite2D.h | 45 +
gemrb/plugins/SDLVideo/Matrix.cpp | 468 ++++++++
gemrb/plugins/SDLVideo/Matrix.h | 33 +
gemrb/plugins/SDLVideo/SDL12Video.cpp | 66 +-
gemrb/plugins/SDLVideo/SDL12Video.h | 1 -
gemrb/plugins/SDLVideo/SDL20GLVideo.cpp | 764 +++++++++++++
gemrb/plugins/SDLVideo/SDL20GLVideo.h | 76 ++
gemrb/plugins/SDLVideo/SDL20Video.cpp | 296 +++--
gemrb/plugins/SDLVideo/SDL20Video.h | 29 +-
gemrb/plugins/SDLVideo/SDLSurfaceSprite2D.cpp | 158 +++
gemrb/plugins/SDLVideo/SDLSurfaceSprite2D.h | 56 +
gemrb/plugins/SDLVideo/SDLVideo.cpp | 836 +++++---------
gemrb/plugins/SDLVideo/SDLVideo.h | 65 +-
gemrb/plugins/SDLVideo/Shaders/Ellipse.glslf | 26 +
gemrb/plugins/SDLVideo/Shaders/Ellipse.glslv | 9 +
gemrb/plugins/SDLVideo/Shaders/Rect.glslf | 5 +
gemrb/plugins/SDLVideo/Shaders/Rect.glslv | 6 +
gemrb/plugins/SDLVideo/Shaders/Sprite.glslv | 9 +
gemrb/plugins/SDLVideo/Shaders/Sprite32.glslf | 10 +
gemrb/plugins/SDLVideo/Shaders/SpritePal.glslf | 14 +
.../plugins/SDLVideo/Shaders/SpritePalGrayed.glslf | 14 +
.../plugins/SDLVideo/Shaders/SpritePalSepia.glslf | 17 +
gemrb/plugins/SDLVideo/SpriteRenderer.inl | 11 +-
gemrb/plugins/STOImporter/STOImporter.cpp | 18 +-
gemrb/plugins/TISImporter/TISImporter.cpp | 4 +-
gemrb/plugins/TLKImporter/TLKImporter.cpp | 13 +-
gemrb/plugins/TLKImporter/TlkOverride.cpp | 9 -
gemrb/plugins/TLKImporter/TlkOverride.h | 1 -
gemrb/plugins/TTFImporter/TTFFont.cpp | 45 +-
gemrb/plugins/TTFImporter/TTFFontManager.cpp | 5 +-
gemrb/plugins/VLCPlayer/VideoContext.cpp | 2 +-
gemrb/unhardcoded/bg1/avatars.2da | 2 +-
gemrb/unhardcoded/bg1/clabrngr.2da | 4 +-
gemrb/unhardcoded/bg1/gemrb.ini | 4 +-
gemrb/unhardcoded/bg1/splspec.2da | 4 +
gemrb/unhardcoded/bg2/avatars.2da | 17 +-
gemrb/unhardcoded/bg2/gemrb.ini | 4 +-
gemrb/unhardcoded/bg2/splspec.2da | 12 +
gemrb/unhardcoded/how/clabdrui.2da | 6 +
gemrb/unhardcoded/how/clabpala.2da | 12 +
gemrb/unhardcoded/how/clabrngr.2da | 5 +
gemrb/unhardcoded/how/clskills.2da | 10 +-
gemrb/unhardcoded/how/gemrb.ini | 4 +-
gemrb/unhardcoded/how/pictures.2da | 20 +
gemrb/unhardcoded/how/splspec.2da | 9 +
gemrb/unhardcoded/iwd/clabdrui.2da | 6 +
gemrb/unhardcoded/iwd/clabpala.2da | 12 +
gemrb/unhardcoded/iwd/clabrngr.2da | 4 +
gemrb/unhardcoded/iwd/clskills.2da | 10 +-
gemrb/unhardcoded/iwd/gemrb.ini | 4 +-
gemrb/unhardcoded/iwd/splspec.2da | 9 +
gemrb/unhardcoded/iwd2/avatars.2da | 8 +-
gemrb/unhardcoded/iwd2/{sunfire.pro => clight.pro} | Bin 768 -> 768 bytes
.../unhardcoded/iwd2/{sunfire.pro => dbfireb.pro} | Bin 768 -> 768 bytes
gemrb/unhardcoded/iwd2/gemrb.ini | 4 +-
gemrb/unhardcoded/iwd2/skillsta.2da | 34 +-
gemrb/unhardcoded/iwd2/splspec.2da | 6 +
gemrb/unhardcoded/iwd2/sunfire.pro | Bin 768 -> 768 bytes
gemrb/{override => unhardcoded}/pst/baldur.bcs | 0
gemrb/unhardcoded/pst/gemrb.ini | 5 +-
gemrb/unhardcoded/pst/item_use.2da | 37 +-
gemrb/unhardcoded/pst/itemtype.2da | 2 +-
gemrb/unhardcoded/pst/splspec.2da | 5 +
gemrb/unhardcoded/shared/chinese.ini | 3 +
gemrb/unhardcoded/shared/czech.ini | 3 +
gemrb/unhardcoded/shared/default.ini | 3 +
gemrb/unhardcoded/shared/defaults.ini | 2 +-
gemrb/unhardcoded/shared/japanese.ini | 2 +
gemrb/unhardcoded/shared/korean.ini | 2 +
tools/tlk_convert/base.py | 33 +
tools/tlk_convert/tlk.py | 49 +
tools/tlk_convert/tlk_convert.py | 56 +
309 files changed, 10077 insertions(+), 7143 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git
More information about the Pkg-games-commits
mailing list