This is an automated email from the git hooks/post-receive script. vivicoder-guest pushed a commit to branch master in repository gm-assistant.
commit 696b86b2068bfa4c7f6ebdf33cdd970dddffba2c Merge: a4a4af9 7ce9a2b Author: Vincent Prat <[email protected]> Date: Sun Jan 10 18:48:51 2016 +0100 Merge tag 'upstream/1.2.0' Upstream version 1.2.0 .gitignore | 6 + CHANGELOG | 22 + COPYRIGHT | 2 + README | 12 +- README.install | 4 +- configure | 154 ++- data/images/down.svg | 126 ++ data/images/up.svg | 127 ++ doc/gm-assistant.6 | 9 +- doc/userguide/en/images/add_item.png | Bin 0 -> 20498 bytes doc/userguide/en/images/combat_fight.png | Bin 0 -> 11753 bytes doc/userguide/en/images/combat_preparation.png | Bin 0 -> 19407 bytes doc/userguide/en/images/dice_simulator.png | Bin 0 -> 8382 bytes doc/userguide/en/images/full_scenario.png | Bin 0 -> 64038 bytes doc/userguide/en/images/sample_scenario.png | Bin 0 -> 24765 bytes doc/userguide/en/userguide.tex | 354 +++++ doc/userguide/fr/images/add_item.png | Bin 0 -> 22228 bytes doc/userguide/fr/images/gestion_combat_fight.png | Bin 0 -> 11446 bytes .../fr/images/gestionnaire_combat_prep.png | Bin 0 -> 19721 bytes doc/userguide/fr/images/scenario_complet.png | Bin 0 -> 63368 bytes doc/userguide/fr/images/scenario_type.png | Bin 0 -> 22906 bytes doc/userguide/fr/images/simulateur_de_des.png | Bin 0 -> 8587 bytes doc/userguide/fr/userguide.tex | 425 ++++++ dox.conf | 361 +++-- gm-assistant.desktop.src | 6 +- ressource.qrc | 2 + sources/engine/Branch.cpp | 33 +- sources/engine/Branch.h | 72 +- sources/engine/Character.cpp | 118 +- sources/engine/Character.h | 113 +- sources/engine/CharacterList.cpp | 58 +- sources/engine/CharacterList.h | 39 +- sources/engine/Engine.cpp | 231 ---- sources/engine/FileMapping.cpp | 88 ++ sources/engine/FileMapping.h | 130 ++ sources/engine/IOConfig.cpp | 130 ++ sources/engine/IOConfig.h | 344 +++++ sources/engine/Item.h | 83 -- sources/engine/Metadata.cpp | 157 +++ sources/engine/Metadata.h | 275 ++++ sources/engine/PropertyList.cpp | 136 ++ sources/engine/{SkillList.h => PropertyList.h} | 40 +- sources/engine/QCustomThread.cpp | 57 - sources/engine/Scenario.cpp | 395 ++++++ sources/engine/{Engine.h => Scenario.h} | 83 +- sources/engine/SkillList.cpp | 107 -- sources/engine/SoundEngine.cpp | 180 --- sources/engine/SoundEngine.h | 71 - sources/engine/SoundItem.cpp | 76 -- sources/engine/SoundItem.h | 88 -- sources/engine/Tree.cpp | 127 +- sources/engine/Tree.h | 103 +- sources/engine/Version.cpp | 84 ++ sources/engine/Version.h | 85 ++ sources/engine/{ => items}/FileItem.cpp | 50 +- sources/engine/{ => items}/FileItem.h | 70 +- .../{PictureItem.cpp => items/ImageItem.cpp} | 11 +- .../engine/{PictureItem.h => items/ImageItem.h} | 31 +- sources/engine/{ => items}/Item.cpp | 88 +- sources/engine/items/Item.h | 142 ++ sources/engine/{ => items}/ItemFactory.cpp | 18 +- sources/engine/{ => items}/ItemFactory.h | 8 +- sources/{version.h => engine/items/SoundItem.cpp} | 19 +- .../engine/{PictureItem.h => items/SoundItem.h} | 30 +- .../engine/modifications/CharacterModification.cpp | 241 ++++ .../engine/modifications/CharacterModification.h | 160 +++ .../MetadataModification.cpp} | 38 +- .../modifications/MetadataModification.h} | 42 +- .../Modification.cpp} | 14 +- sources/engine/modifications/Modification.h | 88 ++ sources/engine/modifications/ModificationQueue.cpp | 106 ++ sources/engine/modifications/ModificationQueue.h | 94 ++ sources/engine/modifications/NoteModification.cpp | 113 ++ sources/engine/modifications/NoteModification.h | 103 ++ sources/engine/modifications/TreeModification.cpp | 232 ++++ sources/engine/modifications/TreeModification.h | 232 ++++ sources/main.cpp | 28 +- sources/misc/FileDetector.cpp | 64 + .../{windows/AboutDialog.h => misc/FileDetector.h} | 42 +- sources/misc/QAudioProxyModel.cpp | 52 + .../QAudioProxyModel.h} | 50 +- sources/misc/QSoundEngine.cpp | 110 ++ sources/misc/QSoundEngine.h | 93 ++ sources/widgets/QCustomHeaderView.cpp | 14 +- sources/widgets/QCustomHeaderView.h | 22 +- sources/widgets/QCustomSlider.h | 4 +- sources/widgets/QCustomTableWidget.cpp | 625 ++++++--- sources/widgets/QCustomTableWidget.h | 180 ++- sources/widgets/QCustomTextEdit.cpp | 325 +++++ sources/widgets/QCustomTextEdit.h | 177 +++ sources/widgets/QCustomTreeWidget.cpp | 628 ++++++--- sources/widgets/QCustomTreeWidget.h | 107 +- sources/widgets/QCustomTreeWidgetItem.cpp | 46 +- sources/widgets/QCustomTreeWidgetItem.h | 6 +- sources/windows/AboutDialog.cpp | 15 +- sources/windows/AboutDialog.h | 12 +- sources/windows/AboutDialog.ui | 15 +- sources/windows/ChangeCharacterDialog.cpp | 26 +- sources/windows/ChangeCharacterDialog.h | 32 +- sources/windows/ChangeCharacterDialog.ui | 6 +- ...ngeSkillDialog.cpp => ChangePropertyDialog.cpp} | 22 +- ...{ChangeSkillDialog.h => ChangePropertyDialog.h} | 22 +- ...hangeSkillDialog.ui => ChangePropertyDialog.ui} | 12 +- sources/windows/CombatDialog.cpp | 130 ++ sources/windows/CombatDialog.h | 84 ++ sources/windows/CombatDialog.ui | 91 ++ sources/windows/DiceDialog.cpp | 82 ++ .../windows/{ChangeSkillDialog.h => DiceDialog.h} | 52 +- sources/windows/DiceDialog.ui | 162 +++ .../windows/{PictureWindow.cpp => ImageWindow.cpp} | 12 +- sources/windows/{PictureWindow.h => ImageWindow.h} | 8 +- sources/windows/ItemDialog.cpp | 55 +- sources/windows/ItemDialog.h | 38 +- sources/windows/ItemDialog.ui | 4 +- sources/windows/MainWindow.cpp | 693 +++++++--- sources/windows/MainWindow.h | 222 +++- sources/windows/MainWindow.ui | 176 ++- sources/windows/MetadataDialog.cpp | 73 + .../{ChangeCharacterDialog.h => MetadataDialog.h} | 57 +- sources/windows/MetadataDialog.ui | 170 +++ sources/windows/SelectCharacterDialog.cpp | 105 ++ sources/windows/SelectCharacterDialog.h | 82 ++ sources/windows/SelectCharacterDialog.ui | 159 +++ translations/gmassistant_fr.ts | 1395 +++++++++----------- translations/languages | 2 + 125 files changed, 10509 insertions(+), 3121 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gm-assistant.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
