This is an automated email from the git hooks/post-receive script. berenm-guest pushed a commit to branch master in repository gemrb.
commit 7dbe3b0e5fbb7409e666e6f021b4d2b5a0c4055e Merge: a9568e8 6b14b05 Author: Beren Minor <[email protected]> Date: Mon Nov 27 19:35:14 2017 +0100 Update upstream source from tag 'upstream/0.8.5' Update to upstream version '0.8.5' with Debian dir a2d12f92bfcaa7896a69c2890f4c8bef670e90b5 .travis.yml | 18 +- CMakeLists.txt | 275 ++++--- INSTALL | 18 +- NEWS | 15 + README | 4 +- admin/todo-grapher | 6 +- android/prep_env.sh | 8 +- apple/GemRB.xcodeproj/project.pbxproj | 59 +- apple/osx/Info.plist | 4 +- cmake/cmake_config.h.in | 5 + cmake/modules/FindLIBVLC.cmake | 13 +- cmake/modules/config.cmake | 16 + configure.in | 2 +- demo/data/gemrb.ini | 1 - gemrb.6.in | 10 +- gemrb/CMakeLists.txt | 36 +- gemrb/GUIScripts/CommonWindow.py | 8 +- gemrb/GUIScripts/CreateControlDecorators.py | 2 +- gemrb/GUIScripts/GUIClasses.py | 1 + gemrb/GUIScripts/GUICommon.py | 3 + gemrb/GUIScripts/GUICommonWindows.py | 127 +++- gemrb/GUIScripts/GUIDefines.py | 6 + gemrb/GUIScripts/GUIMA.py | 3 +- gemrb/GUIScripts/GUIMG.py | 4 +- gemrb/GUIScripts/{bg2 => }/GUIMOVIE.py | 38 +- gemrb/GUIScripts/GUIOPT.py | 5 +- gemrb/GUIScripts/GUIREC.py | 2 + gemrb/GUIScripts/GUIRECCommon.py | 7 +- gemrb/GUIScripts/GUISAVE.py | 23 +- gemrb/GUIScripts/{bg1 => }/GUISONGS.py | 24 +- gemrb/GUIScripts/GUISTORE.py | 14 +- gemrb/GUIScripts/InventoryCommon.py | 3 +- gemrb/GUIScripts/LUCommon.py | 4 +- gemrb/GUIScripts/LUSpellSelection.py | 6 +- gemrb/GUIScripts/LevelUp.py | 43 +- gemrb/GUIScripts/Spellbook.py | 12 +- gemrb/GUIScripts/bg1/GUICG12.py | 4 +- gemrb/GUIScripts/bg1/GUICG5.py | 4 +- gemrb/GUIScripts/bg1/GUICG7.py | 3 +- gemrb/GUIScripts/bg1/GUIINV.py | 2 + gemrb/GUIScripts/bg1/GUIMOVIE.py | 83 --- gemrb/GUIScripts/bg1/ImportFile.py | 1 + gemrb/GUIScripts/bg2/GUICG12.py | 4 +- gemrb/GUIScripts/bg2/GUICG2.py | 10 +- gemrb/GUIScripts/bg2/GUICG22.py | 4 +- gemrb/GUIScripts/bg2/GUICG4.py | 119 ++- gemrb/GUIScripts/bg2/GUICG5.py | 3 +- gemrb/GUIScripts/bg2/GUICG7.py | 4 +- gemrb/GUIScripts/bg2/GUIINV.py | 1 + gemrb/GUIScripts/bg2/GUIJRNL.py | 6 +- gemrb/GUIScripts/bg2/GUISONGS.py | 65 -- gemrb/GUIScripts/bg2/ImportFile.py | 1 + gemrb/GUIScripts/bg2/LUHLASelection.py | 3 + gemrb/GUIScripts/bg2/MessageWindow.py | 8 +- gemrb/GUIScripts/iwd/CharGen.py | 24 +- gemrb/GUIScripts/iwd/GUIINV.py | 1 + gemrb/GUIScripts/iwd/GUIMOVIE.py | 80 -- gemrb/GUIScripts/iwd2/CGPortrait.py | 8 +- gemrb/GUIScripts/iwd2/Enemy.py | 5 +- gemrb/GUIScripts/iwd2/Feats.py | 4 +- gemrb/GUIScripts/iwd2/GUIINV.py | 11 +- gemrb/GUIScripts/iwd2/GUILOAD.py | 8 +- gemrb/GUIScripts/iwd2/GUIREC.py | 58 +- gemrb/GUIScripts/iwd2/GUISPL.py | 2 + gemrb/GUIScripts/iwd2/GUIWORLD.py | 7 +- gemrb/GUIScripts/iwd2/ImportFile.py | 3 + gemrb/GUIScripts/iwd2/Name.py | 3 +- gemrb/GUIScripts/iwd2/SPParty.py | 8 +- gemrb/GUIScripts/iwd2/SPParty2.py | 2 +- gemrb/GUIScripts/iwd2/SPPartyFormation.py | 3 +- gemrb/GUIScripts/iwd2/Skills.py | 42 +- gemrb/GUIScripts/iwd2/Spells.py | 5 +- gemrb/GUIScripts/iwd2/Start.py | 20 + gemrb/GUIScripts/pst/FloatMenuWindow.py | 30 +- gemrb/GUIScripts/pst/GUILOAD.py | 12 +- gemrb/GUIScripts/pst/GUIOPT.py | 2 +- gemrb/GUIScripts/pst/GUIWORLD.py | 1 + gemrb/GemRB.cfg.sample.in | 6 +- gemrb/GemRB.cpp | 3 +- gemrb/core/Ambient.cpp | 37 +- gemrb/core/Ambient.h | 24 +- gemrb/core/Audio.h | 3 + gemrb/core/Bitmap.cpp | 15 + gemrb/core/Bitmap.h | 1 + gemrb/core/CMakeLists.txt | 5 +- gemrb/core/Calendar.cpp | 2 +- gemrb/core/CharAnimations.cpp | 165 ++++- gemrb/core/CharAnimations.h | 4 + gemrb/core/ControlAnimation.cpp | 4 +- gemrb/core/Core.cpp | 20 +- gemrb/core/Dialog.cpp | 3 + gemrb/core/DialogHandler.cpp | 4 +- gemrb/core/DisplayMessage.cpp | 9 +- gemrb/core/EffectQueue.cpp | 70 +- gemrb/core/EffectQueue.h | 5 +- gemrb/core/GUI/Button.cpp | 2 +- gemrb/core/GUI/EventMgr.cpp | 10 +- gemrb/core/GUI/EventMgr.h | 2 + gemrb/core/GUI/GameControl.cpp | 169 +++-- gemrb/core/GUI/GameControl.h | 2 +- gemrb/core/GUI/Label.cpp | 2 +- gemrb/core/GUI/MapControl.cpp | 2 +- gemrb/core/GUI/ScrollBar.cpp | 14 +- gemrb/core/GUI/TextArea.cpp | 10 + gemrb/core/GUI/TextSystem/GemMarkup.cpp | 2 +- gemrb/core/GUI/Window.cpp | 18 + gemrb/core/GUI/Window.h | 23 + gemrb/core/GUI/WorldMapControl.cpp | 2 +- gemrb/core/Game.cpp | 142 +++- gemrb/core/Game.h | 2 + gemrb/core/GameData.h | 4 +- gemrb/core/GameScript/Actions.cpp | 89 ++- gemrb/core/GameScript/GSUtils.cpp | 32 +- gemrb/core/GameScript/GameScript.cpp | 14 +- gemrb/core/GameScript/GameScript.h | 11 +- gemrb/core/GameScript/Matching.cpp | 11 +- gemrb/core/GameScript/Triggers.cpp | 67 +- gemrb/core/Holder.h | 4 + gemrb/core/IniSpawn.cpp | 2 +- gemrb/core/Interface.cpp | 119 ++- gemrb/core/Interface.h | 15 +- gemrb/core/InterfaceConfig.cpp | 22 +- gemrb/core/Inventory.cpp | 49 +- gemrb/core/Inventory.h | 7 +- gemrb/core/Item.cpp | 12 + gemrb/core/Item.h | 2 +- gemrb/core/Makefile.am | 1 + gemrb/core/Map.cpp | 69 +- gemrb/core/Map.h | 9 +- gemrb/core/MapReverb.cpp | 101 +++ gemrb/core/MapReverb.h | 98 +++ gemrb/core/Palette.h | 6 + gemrb/core/Particles.cpp | 7 +- gemrb/core/PluginLoader.cpp | 15 +- gemrb/core/Projectile.cpp | 39 +- gemrb/core/RNG/sfmt/SFMT.c | 93 --- gemrb/core/RNG/sfmt/SFMT.h | 3 +- gemrb/core/ResourceManager.cpp | 8 +- gemrb/core/ResourceManager.h | 6 +- gemrb/core/SaveGameIterator.cpp | 13 +- gemrb/core/Scriptable/Actor.cpp | 801 ++++++++++++++------- gemrb/core/Scriptable/Actor.h | 28 +- gemrb/core/Scriptable/Container.cpp | 10 +- gemrb/core/Scriptable/Door.cpp | 3 +- gemrb/core/Scriptable/Scriptable.cpp | 27 +- gemrb/core/Scriptable/Scriptable.h | 2 + gemrb/core/ScriptedAnimation.cpp | 15 +- gemrb/core/Sprite2D.h | 5 +- gemrb/core/Store.cpp | 5 + gemrb/core/StringMgr.h | 1 + gemrb/core/System/Logging.cpp | 18 +- gemrb/core/System/MemoryStream.cpp | 1 + gemrb/core/System/SlicedStream.cpp | 14 +- gemrb/core/System/String.cpp | 6 +- gemrb/core/System/StringBuffer.cpp | 8 +- gemrb/core/System/VFS.cpp | 23 +- gemrb/core/Tile.cpp | 4 + gemrb/core/VEFObject.cpp | 4 +- gemrb/core/Video.cpp | 9 +- gemrb/core/Video.h | 7 +- gemrb/core/VideoMode.h | 55 -- gemrb/docs/en/GUIScript/controls.txt | 2 +- gemrb/docs/en/gemrb_ini.txt | 17 +- gemrb/includes/CircularBuffer.h | 2 +- gemrb/includes/RGBAColor.h | 6 + gemrb/includes/StringMap.h | 7 +- gemrb/includes/exports.h | 13 + gemrb/includes/globals.h | 10 +- gemrb/includes/ie_stats.h | 13 +- gemrb/includes/plugindef.h | 3 +- gemrb/includes/voodooconst.h | 7 +- gemrb/includes/win32def.h | 5 + gemrb/plugins/2DAImporter/2DAImporter.cpp | 2 +- gemrb/plugins/ACMReader/decoder.h | 3 + gemrb/plugins/ACMReader/unpacker.cpp | 3 +- gemrb/plugins/AREImporter/AREImporter.cpp | 148 ++-- gemrb/plugins/AREImporter/AREImporter.h | 1 + gemrb/plugins/BAMImporter/BAMFontManager.cpp | 7 +- gemrb/plugins/BAMImporter/BAMImporter.cpp | 5 + gemrb/plugins/BIFImporter/BIFImporter.cpp | 1 + gemrb/plugins/BIKPlayer/BIKPlayer.cpp | 15 + gemrb/plugins/BIKPlayer/CMakeLists.txt | 2 + gemrb/plugins/BIKPlayer/GetBitContext.cpp | 4 +- gemrb/plugins/BIKPlayer/GetBitContext.h | 207 +++--- gemrb/plugins/BIKPlayer/mem.cpp | 27 +- gemrb/plugins/BMPImporter/BMPImporter.cpp | 2 + gemrb/plugins/CHUImporter/CHUImporter.cpp | 1 + gemrb/plugins/CREImporter/CREImporter.cpp | 11 +- .../DirectoryImporter/DirectoryImporter.cpp | 18 +- gemrb/plugins/EFFImporter/EFFImporter.cpp | 1 + gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 228 ++++-- gemrb/plugins/GAMImporter/GAMImporter.cpp | 2 +- gemrb/plugins/GUIScript/GUIScript.cpp | 151 +++- gemrb/plugins/GUIScript/GUIScript.h | 1 + gemrb/plugins/GUIScript/PythonHelpers.cpp | 103 ++- gemrb/plugins/GUIScript/PythonHelpers.h | 55 +- gemrb/plugins/ITMImporter/ITMImporter.cpp | 87 ++- gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp | 18 +- gemrb/plugins/KEYImporter/KEYImporter.cpp | 1 + gemrb/plugins/MOSImporter/MOSImporter.cpp | 1 + gemrb/plugins/MVEPlayer/mve_player.cpp | 5 + gemrb/plugins/MVEPlayer/mvevideodec8.cpp | 11 +- gemrb/plugins/NullSound/NullSound.cpp | 5 + gemrb/plugins/NullSound/NullSound.h | 1 + gemrb/plugins/OpenALAudio/AmbientMgrAL.cpp | 134 ++-- gemrb/plugins/OpenALAudio/AmbientMgrAL.h | 20 +- gemrb/plugins/OpenALAudio/OpenALAudio.cpp | 168 ++++- gemrb/plugins/OpenALAudio/OpenALAudio.h | 26 +- gemrb/plugins/PLTImporter/PLTImporter.cpp | 4 +- gemrb/plugins/PNGImporter/PNGImporter.cpp | 2 + gemrb/plugins/SDLAudio/SDLAudio.cpp | 9 + gemrb/plugins/SDLAudio/SDLAudio.h | 1 + gemrb/plugins/SDLVideo/CMakeLists.txt | 2 +- gemrb/plugins/SDLVideo/GLPaletteManager.cpp | 9 +- gemrb/plugins/SDLVideo/GLPaletteManager.h | 4 +- gemrb/plugins/SDLVideo/GLTextureSprite2D.cpp | 4 +- gemrb/plugins/SDLVideo/OpenGLEnv.h | 4 +- gemrb/plugins/SDLVideo/SDL12Video.cpp | 6 + gemrb/plugins/SDLVideo/SDL12Video.h | 1 + gemrb/plugins/SDLVideo/SDL20GLVideo.cpp | 144 +++- gemrb/plugins/SDLVideo/SDL20GLVideo.h | 10 +- gemrb/plugins/SDLVideo/SDL20Video.cpp | 70 +- gemrb/plugins/SDLVideo/SDL20Video.h | 1 + gemrb/plugins/SDLVideo/SDLVideo.cpp | 34 +- gemrb/plugins/SDLVideo/SDLVideo.h | 11 + gemrb/plugins/SDLVideo/Shaders/SpritePal.glslf | 19 +- .../plugins/SDLVideo/Shaders/SpritePalGrayed.glslf | 21 +- .../plugins/SDLVideo/Shaders/SpritePalSepia.glslf | 23 +- gemrb/plugins/SPLImporter/SPLImporter.cpp | 3 +- gemrb/plugins/STOImporter/STOImporter.cpp | 2 +- gemrb/plugins/TISImporter/TISImporter.cpp | 2 +- gemrb/plugins/TLKImporter/TLKImporter.cpp | 10 +- gemrb/plugins/TLKImporter/TLKImporter.h | 2 + gemrb/plugins/WEDImporter/WEDImporter.cpp | 2 +- gemrb/plugins/WMPImporter/WMPImporter.cpp | 10 +- gemrb/tests/minimal/data/gemrb.ini | 1 - gemrb/unhardcoded/bg1/area_reverbs.2da | 446 ++++++++++++ gemrb/unhardcoded/bg1/gemrb.ini | 3 +- gemrb/unhardcoded/bg1/pdolls.2da | 12 +- gemrb/unhardcoded/bg1/walksnd.2da | 3 +- gemrb/unhardcoded/bg2/area_reverbs.2da | 391 ++++++++++ gemrb/unhardcoded/bg2/avatars.2da | 5 +- gemrb/unhardcoded/bg2/gemrb.ini | 3 +- gemrb/unhardcoded/bg2/qslots.2da | 10 +- gemrb/unhardcoded/bg2/walksnd.2da | 3 +- gemrb/unhardcoded/bg2/wildmag.2da | 2 +- gemrb/unhardcoded/how/avatars.2da | 2 +- gemrb/unhardcoded/how/avprefr.2da | 4 +- gemrb/unhardcoded/how/gemrb.ini | 3 +- gemrb/unhardcoded/how/zzweaps.2da | 35 + gemrb/unhardcoded/iwd/avatars.2da | 2 +- gemrb/unhardcoded/iwd/avprefr.2da | 4 +- gemrb/unhardcoded/iwd/gemrb.ini | 3 +- gemrb/unhardcoded/iwd/zzweaps.2da | 35 + gemrb/unhardcoded/iwd2/area_reverbs.2da | 113 +++ gemrb/unhardcoded/iwd2/avatars.2da | 168 ++--- gemrb/unhardcoded/iwd2/gemrb.ini | 3 +- gemrb/unhardcoded/iwd2/itemuse.2da | 10 +- gemrb/unhardcoded/iwd2/racskill.2da | 4 + gemrb/unhardcoded/iwd2/vcremap.2da | 32 + gemrb/unhardcoded/iwd2/walksnd.2da | 67 ++ gemrb/unhardcoded/pst/gemrb.ini | 3 +- gemrb/unhardcoded/shared/REVERB.2DA | 22 + gemrb/unhardcoded/shared/avatar_shadows.2da | 90 +++ gemrb/unhardcoded/shared/defaults.ini | 3 +- 265 files changed, 5468 insertions(+), 2229 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gemrb.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
