This is an automated email from the git hooks/post-receive script. berenm-guest pushed a commit to branch master in repository gemrb.
commit e8635a57511961cdb8dfc259405eeb99fb01f552 Merge: 09fd426 3b47095 Author: Beren Minor <[email protected]> Date: Fri Jan 2 01:07:26 2015 +0100 Merge tag 'upstream/0.8.2' Upstream version 0.8.2 .gitattributes | 1 + .mailmap | 1 + CMakeLists.txt | 46 +- NEWS | 13 + admin/announcement.template | 6 +- admin/extend2da.py | 17 +- cmake/cmake_config.h.in | 6 +- cmake/modules/FindSDL2_mixer.cmake | 14 +- configure.in | 6 +- demo/data/action.ids | 1 + demo/data/protagon.cre | Bin 1076 -> 1076 bytes demo/gem-demo.ini | 2 + gemrb.desktop | 1 + gemrb/CMakeLists.txt | 3 + gemrb/GUIScripts/AutodetectCommon.py | 7 +- gemrb/GUIScripts/CommonWindow.py | 3 +- gemrb/GUIScripts/GUICommon.py | 18 +- gemrb/GUIScripts/GUICommonWindows.py | 16 +- gemrb/GUIScripts/GUIDefines.py | 1 + gemrb/GUIScripts/GUIOPT.py | 5 +- gemrb/GUIScripts/GUIRECCommon.py | 47 +- gemrb/GUIScripts/InventoryCommon.py | 14 +- gemrb/GUIScripts/LUCommon.py | 50 +- gemrb/GUIScripts/LUSpellSelection.py | 61 ++- gemrb/GUIScripts/Spellbook.py | 140 ++++- gemrb/GUIScripts/TextScreen.py | 24 +- gemrb/GUIScripts/bg1/CharGenGui.py | 1 + gemrb/GUIScripts/bg2/CharGenEnd.py | 21 +- gemrb/GUIScripts/bg2/LUHLASelection.py | 13 +- gemrb/GUIScripts/bg2/MessageWindow.py | 52 +- gemrb/GUIScripts/iwd/CharGen.py | 13 +- gemrb/GUIScripts/iwd2/Appearance.py | 11 +- gemrb/GUIScripts/iwd2/CGPortrait.py | 2 +- gemrb/GUIScripts/iwd2/CharGen3.py | 2 + gemrb/GUIScripts/iwd2/CharGen4.py | 11 +- gemrb/GUIScripts/iwd2/CharGen9.py | 76 +-- gemrb/GUIScripts/iwd2/CharOverview.py | 30 +- gemrb/GUIScripts/iwd2/Class.py | 3 +- gemrb/GUIScripts/iwd2/Enemy.py | 5 +- gemrb/GUIScripts/iwd2/Feats.py | 6 +- gemrb/GUIScripts/iwd2/GUIJRNL.py | 2 +- gemrb/GUIScripts/iwd2/GUIREC.py | 46 +- gemrb/GUIScripts/iwd2/GUISPL.py | 7 +- gemrb/GUIScripts/iwd2/IDLUCommon.py | 138 +++++ gemrb/GUIScripts/iwd2/SPPartyFormation.py | 44 +- gemrb/GUIScripts/iwd2/Skills.py | 11 +- gemrb/GUIScripts/iwd2/Spells.py | 63 +++ gemrb/GUIScripts/pst/GUIREC.py | 10 +- gemrb/GemRB.cfg.noinstall.sample | 10 +- gemrb/GemRB.cfg.sample.in | 10 +- gemrb/core/Animation.cpp | 3 +- gemrb/core/CMakeLists.txt | 8 + gemrb/core/CharAnimations.cpp | 95 +++- gemrb/core/CharAnimations.h | 3 + gemrb/core/ControlAnimation.cpp | 8 +- gemrb/core/Core.cpp | 9 + gemrb/core/Dialog.cpp | 3 +- gemrb/core/DialogHandler.cpp | 104 ++-- gemrb/core/DisplayMessage.cpp | 41 +- gemrb/core/DisplayMessage.h | 2 +- gemrb/core/Effect.h | 7 + gemrb/core/EffectQueue.cpp | 108 ++-- gemrb/core/GUI/GameControl.cpp | 87 ++-- gemrb/core/GUI/GameControl.h | 1 + gemrb/core/GUI/TextArea.cpp | 4 +- gemrb/core/Game.cpp | 34 +- gemrb/core/Game.h | 2 +- gemrb/core/GameData.cpp | 8 +- gemrb/core/GameData.h | 2 +- gemrb/core/GameScript/Actions.cpp | 47 +- gemrb/core/GameScript/GSUtils.cpp | 103 ++-- gemrb/core/GameScript/GameScript.cpp | 15 +- gemrb/core/GameScript/GameScript.h | 8 + gemrb/core/GameScript/Objects.cpp | 2 +- gemrb/core/GameScript/Triggers.cpp | 103 ++-- gemrb/core/GlobalTimer.cpp | 5 +- gemrb/core/IniSpawn.cpp | 9 - gemrb/core/IniSpawn.h | 1 - gemrb/core/Interface.cpp | 83 ++- gemrb/core/InterfaceConfig.cpp | 8 +- gemrb/core/Inventory.cpp | 15 +- gemrb/core/Inventory.h | 3 +- gemrb/core/KeyMap.cpp | 7 +- gemrb/core/LRUCache.cpp | 5 +- gemrb/core/Map.cpp | 56 +- gemrb/core/Map.h | 1 + gemrb/core/Projectile.cpp | 26 +- gemrb/core/ProjectileServer.cpp | 2 +- gemrb/core/RNG/RNG_SFMT.cpp | 172 +++++++ gemrb/core/RNG/RNG_SFMT.h | 58 +++ gemrb/core/RNG/sfmt/LICENSE.txt | 32 ++ gemrb/core/RNG/sfmt/SFMT-common.h | 164 ++++++ gemrb/core/RNG/sfmt/SFMT-params.h | 98 ++++ gemrb/core/RNG/sfmt/SFMT-params19937.h | 50 ++ gemrb/core/RNG/sfmt/SFMT.c | 433 ++++++++++++++++ gemrb/core/RNG/sfmt/SFMT.h | 295 +++++++++++ gemrb/core/Scriptable/Actor.cpp | 688 ++++++++++++++++++------- gemrb/core/Scriptable/Actor.h | 19 +- gemrb/core/Scriptable/Door.cpp | 2 + gemrb/core/Scriptable/Scriptable.cpp | 150 +++--- gemrb/core/Scriptable/Scriptable.h | 6 +- gemrb/core/ScriptedAnimation.cpp | 2 + gemrb/core/Spellbook.cpp | 24 +- gemrb/core/Spellbook.h | 2 +- gemrb/core/System/VFS.cpp | 16 +- gemrb/core/TileMapMgr.h | 1 + gemrb/core/WorldMap.cpp | 3 +- gemrb/core/damages.h | 6 +- gemrb/docs/en/GUIScript/GetPlayerSound.txt | 5 +- gemrb/docs/en/Release.txt | 25 +- gemrb/includes/defsounds.h | 1 + gemrb/includes/globals.h | 3 +- gemrb/includes/plugindef.h | 2 + gemrb/override/bg2/clearair.2da | 5 + gemrb/override/iwd2/skillrac.2da | 4 + gemrb/plugins/2DAImporter/2DAImporter.cpp | 4 +- gemrb/plugins/AREImporter/AREImporter.cpp | 5 +- gemrb/plugins/BIKPlayer/BIKPlayer.cpp | 2 +- gemrb/plugins/BIKPlayer/common.h | 1 + gemrb/plugins/BIKPlayer/rational.cpp | 2 +- gemrb/plugins/BIKPlayer/rdft.cpp | 2 +- gemrb/plugins/CREImporter/CREImporter.cpp | 117 +++-- gemrb/plugins/EFFImporter/EFFImporter.cpp | 16 +- gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 164 +++--- gemrb/plugins/GUIScript/GUIScript.cpp | 135 +++-- gemrb/plugins/GUIScript/GUIScript.h | 1 + gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp | 16 +- gemrb/plugins/MUSImporter/MUSImporter.cpp | 26 +- gemrb/plugins/MVEPlayer/gstmvedemux.h | 4 + gemrb/plugins/MVEPlayer/mve_player.cpp | 2 +- gemrb/plugins/OpenALAudio/OpenALAudio.cpp | 9 +- gemrb/plugins/PSTOpcodes/PSTOpcodes.cpp | 123 ++--- gemrb/plugins/SDLAudio/CMakeLists.txt | 8 +- gemrb/plugins/SDLVideo/CMakeLists.txt | 2 + gemrb/plugins/SDLVideo/GLSLProgram.cpp | 22 +- gemrb/plugins/SDLVideo/SDL20GLVideo.cpp | 24 +- gemrb/plugins/SDLVideo/SDLVideo.cpp | 2 +- gemrb/plugins/TISImporter/TISImporter.cpp | 4 +- gemrb/plugins/TLKImporter/TLKImporter.cpp | 7 +- gemrb/plugins/TLKImporter/TlkOverride.cpp | 199 ++++--- gemrb/plugins/TLKImporter/TlkOverride.h | 11 +- gemrb/plugins/TTFImporter/TTFFontManager.cpp | 4 +- gemrb/plugins/WEDImporter/WEDImporter.cpp | 22 +- gemrb/plugins/WEDImporter/WEDImporter.h | 2 + gemrb/plugins/WMPImporter/WMPImporter.cpp | 3 + gemrb/unhardcoded/bg1/bios.2da | 44 +- gemrb/unhardcoded/bg1/defsound.2da | 2 +- gemrb/unhardcoded/bg1/difflvls.2da | 1 + gemrb/unhardcoded/bg1/races.2da | 14 +- gemrb/unhardcoded/bg2/avatars.2da | 2 +- gemrb/unhardcoded/bg2/defsound.2da | 2 +- gemrb/unhardcoded/{shared => bg2}/difflvls.2da | 1 + gemrb/unhardcoded/bg2/races.2da | 23 +- gemrb/unhardcoded/bg2/skills.2da | 2 +- gemrb/unhardcoded/how/clabdrui.2da | 3 +- gemrb/unhardcoded/how/defsound.2da | 2 +- gemrb/unhardcoded/how/difflvls.2da | 1 + gemrb/unhardcoded/how/fatiimm.spl | Bin 0 -> 250 bytes gemrb/unhardcoded/how/poisimm.spl | Bin 0 -> 298 bytes gemrb/unhardcoded/how/races.2da | 14 +- gemrb/unhardcoded/how/splspec.2da | 1 + gemrb/unhardcoded/iwd/clabdrui.2da | 3 +- gemrb/unhardcoded/iwd/defsound.2da | 2 +- gemrb/unhardcoded/iwd/races.2da | 14 +- gemrb/unhardcoded/iwd/splspec.2da | 1 + gemrb/unhardcoded/iwd2/bios.2da | 24 +- gemrb/unhardcoded/iwd2/classes.2da | 2 +- gemrb/unhardcoded/iwd2/clskills.2da | 26 +- gemrb/unhardcoded/iwd2/defsound.2da | 2 +- gemrb/unhardcoded/iwd2/magesch.2da | 20 +- gemrb/unhardcoded/iwd2/pictures.2da | 166 +++--- gemrb/unhardcoded/iwd2/races.2da | 34 +- gemrb/unhardcoded/iwd2/strings.2da | 6 +- gemrb/unhardcoded/pst/bios.2da | 22 +- gemrb/unhardcoded/pst/races.2da | 152 +++--- gemrb/unhardcoded/shared/difflvls.2da | 1 + 176 files changed, 4227 insertions(+), 1683 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
