From: Jens G. <je...@gm...> - 2013-04-28 21:58:14
|
Branch: refs/heads/master Home: https://github.com/gemrb/gemrb Commit: 09155cc2da10a18aeb69e52a996f7485337806e1 https://github.com/gemrb/gemrb/commit/09155cc2da10a18aeb69e52a996f7485337806e1 Author: Jens Granseuer <je...@gm...> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M gemrb/core/GameScript/GameScript.cpp Log Message: ----------- make trigger evaluation more robust against scripting errors When an unfinished OR block was encountered in a condition the trigger would always evaluate to true. Instead, use the subresult we got until that point. This fixes a bug with Viconia in AR1000 in BG2. The vicg1 script used by the fanatics has a buggy OR block that claims to have 4 conditions but actually only contains 2. Since it would always evaluate to true, the fanatics escaped the area immediately which meant that Viconia was never burnt, and if you cut her down from the stake you'd enter an endlessly repeating dialog Commit: 66418f106d1280aa202175fa310d5f4e795c8eb3 https://github.com/gemrb/gemrb/commit/66418f106d1280aa202175fa310d5f4e795c8eb3 Author: Jens Granseuer <je...@gm...> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M gemrb/GUIScripts/GUICommonWindows.py Log Message: ----------- don't break on cutscenes when resting outside, either Commit: cca834dfe4e3fb7310f731b4a3c98b54232b814c https://github.com/gemrb/gemrb/commit/cca834dfe4e3fb7310f731b4a3c98b54232b814c Author: Jens Granseuer <je...@gm...> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M gemrb/core/CharAnimations.cpp Log Message: ----------- fix some animation cycles for IE_ANI_CODE_MIRROR_3 Fixes phases of invisibility for MIGO, MKUL, and MSPS. Commit: bd1600bc2c333e47502107955a7bf928bf2090d4 https://github.com/gemrb/gemrb/commit/bd1600bc2c333e47502107955a7bf928bf2090d4 Author: Jens Granseuer <je...@gm...> Date: 2013-04-28 (Sun, 28 Apr 2013) Changed paths: M gemrb/GUIScripts/LUSkillsSelection.py Log Message: ----------- LevelUp: also reset the skills top index global var Otherwise we may break if the scrollbar's been moved and the next character can select from more more skills than the previous. Compare: https://github.com/gemrb/gemrb/compare/9ec555cdd2d5...bd1600bc2c33 |