[gemrb] 02/03: Merge tag 'upstream/0.8.3'
Beren Minor
berenm-guest at moszumanska.debian.org
Wed Dec 2 18:43:27 UTC 2015
This is an automated email from the git hooks/post-receive script.
berenm-guest pushed a commit to branch master
in repository gemrb.
commit a1e19ba0d86be027e290a9221c1e2791b2e75de4
Merge: acba432 4d6a9da
Author: Beren Minor <beren.minor+git at gmail.com>
Date: Wed Sep 9 20:42:39 2015 +0200
Merge tag 'upstream/0.8.3'
Upstream version 0.8.3
.gitattributes | 3 +
.gitignore | 2 +
CMakeLists.txt | 8 +-
COPYING | 4 +-
HACKING | 16 +
NEWS | 14 +
admin/run.gdb | 4 +
admin/run.valgrind | 5 +
android/GEMRB_Android.mk | 10 +-
android/GEMRB_Application.mk | 1 +
android/prep_env.sh | 90 +-
apple/CocoaWrapper/mac/CocoaWrapper.mm | 2 +-
apple/GemRB.xcodeproj/project.pbxproj | 518 ++++++--
configure.in | 2 +-
demo/data/avatars.2da | 2 +-
demo/data/fonts.2da | 2 +-
demo/data/gemrb.ini | 3 -
demo/dialog.tlk | Bin 19 -> 5024 bytes
gemrb.6.in | 5 +
gemrb/GUIScripts/Actor.py | 18 +-
gemrb/GUIScripts/CommonWindow.py | 10 +-
gemrb/GUIScripts/DualClass.py | 27 +-
gemrb/GUIScripts/GUIClasses.py | 21 +-
gemrb/GUIScripts/GUICommon.py | 15 +-
gemrb/GUIScripts/GUICommonWindows.py | 161 ++-
gemrb/GUIScripts/GUIDefines.py | 23 +-
gemrb/GUIScripts/GUILOAD.py | 9 +-
gemrb/GUIScripts/GUIMA.py | 3 +-
gemrb/GUIScripts/GUIMG.py | 139 ++-
gemrb/GUIScripts/GUIOPT.py | 14 +-
gemrb/GUIScripts/GUIREC.py | 162 ++-
gemrb/GUIScripts/GUIRECCommon.py | 54 +-
gemrb/GUIScripts/GUISAVE.py | 12 +-
gemrb/GUIScripts/GUISTORE.py | 16 +-
gemrb/GUIScripts/GUIWORLD.py | 20 +-
gemrb/GUIScripts/GameCheck.py | 2 +
gemrb/GUIScripts/InventoryCommon.py | 8 +-
gemrb/GUIScripts/LUCommon.py | 19 +-
gemrb/GUIScripts/LUSkillsSelection.py | 8 +-
gemrb/GUIScripts/LUSpellSelection.py | 13 +-
gemrb/GUIScripts/LevelUp.py | 38 +-
gemrb/GUIScripts/Spellbook.py | 32 +-
gemrb/GUIScripts/TextScreen.py | 10 +-
gemrb/GUIScripts/bg1/CharGenGui.py | 28 +-
gemrb/GUIScripts/bg1/ExportFile.py | 3 +-
gemrb/GUIScripts/bg1/GUICG12.py | 4 +-
gemrb/GUIScripts/bg1/GUICG19.py | 3 +-
gemrb/GUIScripts/bg1/GUICG7.py | 2 +-
gemrb/GUIScripts/bg1/GUIINV.py | 4 +-
gemrb/GUIScripts/bg1/GUIJRNL.py | 7 +-
gemrb/GUIScripts/bg1/GUIMOVIE.py | 12 +-
gemrb/GUIScripts/bg1/GUISONGS.py | 5 +-
gemrb/GUIScripts/bg1/ImportFile.py | 5 +-
gemrb/GUIScripts/bg1/MessageWindow.py | 33 +-
gemrb/GUIScripts/bg2/CharGen6.py | 8 +-
gemrb/GUIScripts/bg2/CharGenCommon.py | 60 +-
gemrb/GUIScripts/bg2/CharGenEnd.py | 4 +-
gemrb/GUIScripts/bg2/ExportFile.py | 3 +-
gemrb/GUIScripts/bg2/GUICG12.py | 4 +-
gemrb/GUIScripts/bg2/GUICG19.py | 3 +-
gemrb/GUIScripts/bg2/GUICG23.py | 3 +-
gemrb/GUIScripts/bg2/GUICG7.py | 2 +-
gemrb/GUIScripts/bg2/GUIINV.py | 13 +-
gemrb/GUIScripts/bg2/GUIJRNL.py | 14 +-
gemrb/GUIScripts/bg2/GUIMOVIE.py | 12 +-
gemrb/GUIScripts/bg2/GUISONGS.py | 5 +-
gemrb/GUIScripts/bg2/ImportFile.py | 5 +-
gemrb/GUIScripts/bg2/LUHLASelection.py | 8 +-
gemrb/GUIScripts/bg2/LoadScreen.py | 34 +-
gemrb/GUIScripts/bg2/MessageWindow.py | 11 +-
gemrb/GUIScripts/bg2/Start.py | 2 +-
gemrb/GUIScripts/bg2/Start2.py | 2 +-
gemrb/GUIScripts/demo/MessageWindow.py | 36 +-
gemrb/GUIScripts/demo/Tests.py | 202 +++
gemrb/GUIScripts/iwd/CharGen.py | 98 +-
gemrb/GUIScripts/iwd/GUIINV.py | 4 +-
gemrb/GUIScripts/iwd/GUIJRNL.py | 5 +-
gemrb/GUIScripts/iwd/GUIMOVIE.py | 8 +-
gemrb/GUIScripts/iwd/MessageWindow.py | 12 +-
gemrb/GUIScripts/iwd/Start.py | 2 +-
gemrb/GUIScripts/iwd2/CGPortrait.py | 4 +-
gemrb/GUIScripts/iwd2/CSound.py | 3 +-
gemrb/GUIScripts/iwd2/CharGen6.py | 3 +-
gemrb/GUIScripts/iwd2/CharOverview.py | 59 +-
gemrb/GUIScripts/iwd2/Feats.py | 10 +-
gemrb/GUIScripts/iwd2/GUIJRNL.py | 5 +-
gemrb/GUIScripts/iwd2/GUILOAD.py | 1 +
gemrb/GUIScripts/iwd2/GUIREC.py | 386 +++---
gemrb/GUIScripts/iwd2/IDLUCommon.py | 6 +-
gemrb/GUIScripts/iwd2/ImportFile.py | 5 +-
gemrb/GUIScripts/iwd2/LoadScreen.py | 31 +-
gemrb/GUIScripts/iwd2/MessageWindow.py | 16 +-
gemrb/GUIScripts/iwd2/SPParty.py | 1 +
gemrb/GUIScripts/iwd2/SPParty2.py | 1 +
gemrb/GUIScripts/iwd2/Skills.py | 4 +-
gemrb/GUIScripts/iwd2/Songs.py | 5 +-
gemrb/GUIScripts/iwd2/Start.py | 2 +-
gemrb/GUIScripts/pst/GUIINV.py | 2 +-
gemrb/GUIScripts/pst/GUIJRNL.py | 41 +-
gemrb/GUIScripts/pst/GUILOAD.py | 1 +
gemrb/GUIScripts/pst/GUIOPT.py | 7 +-
gemrb/GUIScripts/pst/GUIREC.py | 12 +-
gemrb/GUIScripts/pst/GUISAVE.py | 1 +
gemrb/GUIScripts/pst/GUISTORE.py | 8 +-
gemrb/GUIScripts/pst/MessageWindow.py | 7 +-
gemrb/GUIScripts/pst/Start.py | 2 +-
gemrb/GemRB.cfg.noinstall.sample | 6 +
gemrb/GemRB.cfg.sample.in | 6 +
gemrb/core/Ambient.cpp | 4 +
gemrb/core/Animation.cpp | 4 +-
gemrb/core/Animation.h | 2 +
gemrb/core/AnimationFactory.cpp | 2 +-
gemrb/core/AnimationMgr.h | 2 +-
gemrb/core/Audio.cpp | 1 +
gemrb/core/CMakeLists.txt | 5 +-
gemrb/core/Calendar.cpp | 2 +-
gemrb/core/Callback.h | 42 +-
gemrb/core/CharAnimations.cpp | 42 +-
gemrb/core/CharAnimations.h | 3 +-
gemrb/core/DialogHandler.cpp | 244 ++--
gemrb/core/DialogHandler.h | 6 +-
gemrb/core/DisplayMessage.cpp | 302 +++--
gemrb/core/DisplayMessage.h | 32 +-
gemrb/core/EffectQueue.cpp | 109 +-
gemrb/core/EffectQueue.h | 8 +-
gemrb/core/Font.cpp | 669 ----------
gemrb/core/Font.h | 126 --
gemrb/core/FontManager.h | 23 +-
gemrb/core/GUI/Button.cpp | 70 +-
gemrb/core/GUI/Button.h | 34 +-
gemrb/core/GUI/Console.cpp | 142 +--
gemrb/core/GUI/Console.h | 24 +-
gemrb/core/GUI/Control.cpp | 81 +-
gemrb/core/GUI/Control.h | 37 +-
gemrb/core/GUI/EventMgr.cpp | 1 +
gemrb/core/GUI/GameControl.cpp | 87 +-
gemrb/core/GUI/GameControl.h | 10 +-
gemrb/core/GUI/Label.cpp | 48 +-
gemrb/core/GUI/Label.h | 19 +-
gemrb/core/GUI/MapControl.cpp | 37 +-
gemrb/core/GUI/MapControl.h | 11 +-
gemrb/core/GUI/Progressbar.cpp | 15 +-
gemrb/core/GUI/Progressbar.h | 8 +-
gemrb/core/GUI/ScrollBar.cpp | 119 +-
gemrb/core/GUI/ScrollBar.h | 35 +-
gemrb/core/GUI/Slider.cpp | 15 +-
gemrb/core/GUI/Slider.h | 8 +-
gemrb/core/GUI/TextArea.cpp | 1158 +++++++----------
gemrb/core/GUI/TextArea.h | 188 ++-
gemrb/core/GUI/TextEdit.cpp | 87 +-
gemrb/core/GUI/TextEdit.h | 21 +-
gemrb/core/GUI/TextSystem/Font.cpp | 678 ++++++++++
gemrb/core/GUI/TextSystem/Font.h | 203 +++
gemrb/core/GUI/TextSystem/GemMarkup.cpp | 180 +++
gemrb/core/GUI/TextSystem/GemMarkup.h | 134 ++
gemrb/core/GUI/TextSystem/TextContainer.cpp | 621 ++++++++++
gemrb/core/GUI/TextSystem/TextContainer.h | 197 +++
gemrb/core/GUI/Window.cpp | 176 +--
gemrb/core/GUI/Window.h | 12 +-
gemrb/core/GUI/WorldMapControl.cpp | 50 +-
gemrb/core/GUI/WorldMapControl.h | 6 +-
gemrb/core/Game.cpp | 226 +++-
gemrb/core/Game.h | 10 +-
gemrb/core/GameScript/Actions.cpp | 60 +-
gemrb/core/GameScript/GSUtils.cpp | 125 +-
gemrb/core/GameScript/GameScript.cpp | 67 +-
gemrb/core/GameScript/GameScript.h | 43 +-
gemrb/core/GameScript/Objects.cpp | 28 +
gemrb/core/GameScript/Triggers.cpp | 449 ++++++-
gemrb/core/GlobalTimer.cpp | 6 -
gemrb/core/GlobalTimer.h | 2 -
gemrb/core/Interface.cpp | 783 ++++--------
gemrb/core/Interface.h | 93 +-
gemrb/core/Inventory.cpp | 25 +-
gemrb/core/Inventory.h | 3 +
gemrb/core/Item.cpp | 2 +-
gemrb/core/Item.h | 8 +-
gemrb/core/ItemMgr.cpp | 4 +
gemrb/core/ItemMgr.h | 5 +
gemrb/core/Makefile.am | 1 +
gemrb/core/Map.cpp | 98 +-
gemrb/core/Map.h | 62 +-
gemrb/core/Palette.cpp | 24 +
gemrb/core/Palette.h | 5 +-
gemrb/core/PluginMgr.cpp | 6 +-
gemrb/core/PluginMgr.h | 2 +-
gemrb/core/Polygon.h | 2 +-
gemrb/core/PolymorphCache.h | 2 +-
gemrb/core/Projectile.cpp | 15 +-
gemrb/core/RNG/sfmt/SFMT-params.h | 2 +-
gemrb/core/RNG/sfmt/SFMT.c | 5 -
gemrb/core/Region.cpp | 114 +-
gemrb/core/Region.h | 51 +-
gemrb/core/Resource.h | 49 +-
gemrb/core/SaveGameIterator.cpp | 23 +-
gemrb/core/ScriptEngine.h | 2 +-
gemrb/core/Scriptable/Actor.cpp | 179 ++-
gemrb/core/Scriptable/Actor.h | 3 +-
gemrb/core/Scriptable/Container.cpp | 16 +-
gemrb/core/Scriptable/Door.cpp | 7 +
gemrb/core/Scriptable/Door.h | 3 +-
gemrb/core/Scriptable/InfoPoint.cpp | 3 +-
gemrb/core/Scriptable/PCStatStruct.cpp | 14 +-
gemrb/core/Scriptable/Scriptable.cpp | 133 +-
gemrb/core/Scriptable/Scriptable.h | 18 +-
gemrb/core/ScriptedAnimation.cpp | 11 +-
gemrb/core/Spell.cpp | 4 +
gemrb/core/Spell.h | 6 +-
gemrb/core/Sprite2D.cpp | 4 +-
gemrb/core/Sprite2D.h | 59 +-
gemrb/core/StringMgr.h | 16 +-
gemrb/core/System/Logger/MessageWindowLogger.cpp | 9 +-
gemrb/core/System/String.cpp | 166 ++-
gemrb/core/System/String.h | 24 +-
gemrb/core/System/VFS.cpp | 25 +-
gemrb/core/System/VFS.h | 10 +-
gemrb/core/TileOverlay.cpp | 1 +
gemrb/core/Video.cpp | 35 +-
gemrb/core/Video.h | 20 +-
gemrb/core/WorldMap.cpp | 23 +-
gemrb/core/WorldMap.h | 4 +-
gemrb/docs/en/Engine/Triggers.txt | 14 +-
gemrb/docs/en/GUIScript/AttachScrollBar.txt | 2 +-
.../en/GUIScript/Control_SubstituteForControl.txt | 12 +
gemrb/docs/en/GUIScript/ConvertEdit.txt | 13 -
gemrb/docs/en/GUIScript/GetCharSounds.txt | 20 -
gemrb/docs/en/GUIScript/GetCharacters.txt | 20 -
gemrb/docs/en/GUIScript/GetPortraits.txt | 21 -
gemrb/docs/en/GUIScript/MoveTAText.txt | 14 -
gemrb/docs/en/GUIScript/SetTAHistory.txt | 13 -
gemrb/docs/en/GUIScript/SetTextAreaFlags.txt | 10 +-
gemrb/docs/en/GUIScript/SetTooltip.txt | 1 -
gemrb/docs/en/GUIScript/TextArea_GetCharSounds.txt | 15 -
gemrb/docs/en/GUIScript/TextArea_GetCharacters.txt | 15 -
gemrb/docs/en/GUIScript/TextArea_GetPortraits.txt | 16 -
gemrb/docs/en/GUIScript/TextArea_ListResources.txt | 17 +
gemrb/docs/en/GUIScript/TextArea_MoveText.txt | 17 -
gemrb/docs/en/GUIScript/TextArea_Rewind.txt | 16 -
gemrb/docs/en/GUIScript/TextArea_SelectText.txt | 16 -
.../docs/en/GUIScript/TextArea_SetChapterText.txt | 16 +
gemrb/docs/en/GUIScript/TextArea_SetHistory.txt | 16 -
gemrb/docs/en/GUIScript/TextEdit_ConvertEdit.txt | 16 -
gemrb/docs/en/Release.txt | 2 +-
gemrb/docs/en/Tables/splspec.txt | 5 +
gemrb/docs/en/gemrb_ini.txt | 9 +-
gemrb/includes/CircularBuffer.h | 75 ++
gemrb/includes/Predicates.h | 74 ++
gemrb/includes/globals.h | 17 +-
gemrb/includes/opcode_params.h | 2 +
gemrb/includes/win32def.h | 2 +
gemrb/plugins/2DAImporter/2DAImporter.cpp | 2 +-
gemrb/plugins/AREImporter/AREImporter.cpp | 83 +-
gemrb/plugins/BAMImporter/BAMFont.cpp | 88 --
gemrb/plugins/BAMImporter/BAMFont.h | 46 -
gemrb/plugins/BAMImporter/BAMFontManager.cpp | 96 +-
gemrb/plugins/BAMImporter/BAMFontManager.h | 11 +-
gemrb/plugins/BAMImporter/BAMImporter.cpp | 16 +-
gemrb/plugins/BAMImporter/BAMImporter.h | 2 +-
gemrb/plugins/BAMImporter/BAMSprite2D.cpp | 4 +-
gemrb/plugins/BAMImporter/CMakeLists.txt | 2 +-
gemrb/plugins/BIKPlayer/BIKPlayer.cpp | 1 -
gemrb/plugins/BMPWriter/BMPWriter.cpp | 2 +-
gemrb/plugins/CHUImporter/CHUImporter.cpp | 19 +-
gemrb/plugins/CREImporter/CREImporter.cpp | 21 +-
gemrb/plugins/FXOpcodes/FXOpcodes.cpp | 115 +-
gemrb/plugins/GAMImporter/GAMImporter.cpp | 7 +-
gemrb/plugins/GUIScript/GUIScript.cpp | 1307 +++++++++-----------
gemrb/plugins/GUIScript/GUIScript.h | 2 +-
gemrb/plugins/GUIScript/PythonHelpers.cpp | 77 +-
gemrb/plugins/GUIScript/PythonHelpers.h | 21 +-
gemrb/plugins/ITMImporter/ITMImporter.cpp | 31 +-
gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp | 49 +-
gemrb/plugins/KEYImporter/KEYImporter.cpp | 7 +
gemrb/plugins/OpenALAudio/OpenALAudio.cpp | 6 +-
gemrb/plugins/PSTOpcodes/PSTOpcodes.cpp | 9 +-
gemrb/plugins/SDLAudio/SDLAudio.cpp | 2 +
gemrb/plugins/SDLVideo/GLPaletteManager.cpp | 12 +-
gemrb/plugins/SDLVideo/GLPaletteManager.h | 2 +-
gemrb/plugins/SDLVideo/GLSLProgram.cpp | 20 +-
gemrb/plugins/SDLVideo/GLSLProgram.h | 10 +-
gemrb/plugins/SDLVideo/GLTextureSprite2D.cpp | 8 +-
gemrb/plugins/SDLVideo/GLTextureSprite2D.h | 2 +-
gemrb/plugins/SDLVideo/Matrix.cpp | 2 +-
.../Callback.cpp => plugins/SDLVideo/OpenGLEnv.h} | 43 +-
gemrb/plugins/SDLVideo/SDL12Video.cpp | 31 +-
gemrb/plugins/SDLVideo/SDL20GLVideo.cpp | 168 +--
gemrb/plugins/SDLVideo/SDL20GLVideo.h | 6 +-
gemrb/plugins/SDLVideo/SDL20Video.cpp | 1 +
gemrb/plugins/SDLVideo/SDLVideo.cpp | 214 ++--
gemrb/plugins/SDLVideo/SDLVideo.h | 24 +-
gemrb/plugins/SDLVideo/Shaders/Ellipse.glslf | 2 +
gemrb/plugins/SDLVideo/Shaders/Rect.glslf | 1 +
gemrb/plugins/SDLVideo/SpriteRenderer.inl | 49 -
gemrb/plugins/SPLImporter/SPLImporter.cpp | 12 +-
gemrb/plugins/STOImporter/STOImporter.cpp | 3 +-
gemrb/plugins/TISImporter/TISImporter.cpp | 1 +
gemrb/plugins/TLKImporter/TLKImporter.cpp | 54 +-
gemrb/plugins/TLKImporter/TLKImporter.h | 3 +-
gemrb/plugins/TLKImporter/TlkOverride.cpp | 9 +-
gemrb/plugins/TTFImporter/Freetype.h | 4 +
gemrb/plugins/TTFImporter/TTFFont.cpp | 222 ++--
gemrb/plugins/TTFImporter/TTFFont.h | 23 +-
gemrb/plugins/TTFImporter/TTFFontManager.cpp | 67 +-
gemrb/plugins/TTFImporter/TTFFontManager.h | 2 +-
gemrb/plugins/WAVReader/WAVReader.h | 2 +-
gemrb/plugins/WEDImporter/WEDImporter.cpp | 35 +-
gemrb/plugins/WMPImporter/WMPImporter.cpp | 2 +
gemrb/tests/minimal/data/gemrb.ini | 4 +-
gemrb/tests/minimal/data/numtest.bam | Bin 978 -> 1390 bytes
gemrb/unhardcoded/bg1/fonts.2da | 4 +-
gemrb/unhardcoded/bg1/gemrb.ini | 10 +-
gemrb/unhardcoded/bg1/splspec.2da | 14 +-
gemrb/unhardcoded/bg2/fonts.2da | 10 +-
gemrb/unhardcoded/bg2/gemrb.ini | 7 +-
gemrb/unhardcoded/bg2/splspec.2da | 38 +-
gemrb/unhardcoded/how/avatars.2da | 14 +-
gemrb/unhardcoded/how/confusw.pro | Bin 768 -> 768 bytes
gemrb/unhardcoded/how/fonts.2da | 2 +-
gemrb/unhardcoded/how/gemrb.ini | 10 +-
gemrb/unhardcoded/how/{portal.pro => portalh.pro} | Bin
gemrb/unhardcoded/how/splspec.2da | 20 +-
gemrb/unhardcoded/iwd/avatars.2da | 12 +-
gemrb/unhardcoded/iwd/confusw.pro | Bin 768 -> 768 bytes
gemrb/unhardcoded/iwd/fonts.2da | 2 +-
gemrb/unhardcoded/iwd/gemrb.ini | 10 +-
gemrb/unhardcoded/iwd/{portal.pro => portalh.pro} | Bin
gemrb/unhardcoded/iwd/splspec.2da | 20 +-
gemrb/unhardcoded/iwd2/avatars.2da | 8 +-
gemrb/unhardcoded/iwd2/confusw.pro | Bin 768 -> 768 bytes
gemrb/unhardcoded/iwd2/fonts.2da | 3 +-
gemrb/unhardcoded/iwd2/gemrb.ini | 11 +-
gemrb/unhardcoded/iwd2/overlay.2da | 4 +-
gemrb/unhardcoded/iwd2/{portal.pro => portalh.pro} | Bin
gemrb/unhardcoded/iwd2/splspec.2da | 19 +-
gemrb/unhardcoded/pst/fonts.2da | 2 +-
gemrb/unhardcoded/pst/gemrb.ini | 6 +
gemrb/unhardcoded/pst/splspec.2da | 20 +-
gemrb/unhardcoded/shared/defaults.ini | 4 +-
gemrb/unhardcoded/shared/dmgtypes.2da | 3 +-
gemrb/unhardcoded/shared/gemtrig.ids | 31 +
gemrb/unhardcoded/shared/spmagmis.pro | Bin 512 -> 512 bytes
341 files changed, 9188 insertions(+), 6807 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