Menu
▾
▴
[Pcgen-github] [PCGen/pcgen] 7ffa9f: NEWTAG-414
|
From: GitHub <no...@gi...> - 2015-01-25 04:14:40
|
Branch: refs/heads/NEWTAG-414 Home: https://github.com/PCGen/pcgen Commit: 7ffa9fb59a4616c4bf8ff96fd27ba2a85d7bcf8c https://github.com/PCGen/pcgen/commit/7ffa9fb59a4616c4bf8ff96fd27ba2a85d7bcf8c Author: Tom Parker <th...@ya...> Date: 2015-01-23 (Fri, 23 Jan 2015) Changed paths: A code/src/java/pcgen/cdom/base/NonInteractive.java M code/src/java/pcgen/core/BioSet.java M code/src/java/pcgen/core/Campaign.java M code/src/java/pcgen/core/PCAlignment.java M code/src/java/pcgen/core/PCCheck.java M code/src/java/pcgen/core/PCStat.java M code/src/java/plugin/lsttokens/AddLst.java M code/src/java/plugin/lsttokens/ChooseLst.java M code/src/java/plugin/lsttokens/KitLst.java M code/src/java/plugin/lsttokens/RegionLst.java M code/src/java/plugin/lsttokens/RemoveLst.java Log Message: ----------- NEWTAG-414 Eliminate ability for non-interactive objects to use interactive tokens Commit: 44ce8435a9b2b1ee7ab5f74bf13d39e373d5df19 https://github.com/PCGen/pcgen/commit/44ce8435a9b2b1ee7ab5f74bf13d39e373d5df19 Author: Tom Parker <th...@ya...> Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M code/src/java/pcgen/cdom/base/NonInteractive.java Log Message: ----------- Don't not Fix the Javadoc (or something) Commit: 2057bcfd56ce4d41b958aa1a2c1474e13de9b6d4 https://github.com/PCGen/pcgen/commit/2057bcfd56ce4d41b958aa1a2c1474e13de9b6d4 Author: Tom Parker <th...@ya...> Date: 2015-01-24 (Sat, 24 Jan 2015) Changed paths: M .gitignore M .travis.yml M build.gradle M code/pluginbuild.xml M code/src/itest/pcgen/cdom/facet/StatIntegrationTest.java M code/src/itest/pcgen/io/testsupport/AbstractSaveRestoreTest.java A code/src/itest/pcgen/output/FreeMarkerTest.java A code/src/itest/pcgen/output/actor/FactKeyActorTest.java A code/src/itest/pcgen/output/actor/FactSetKeyActorTest.java A code/src/itest/pcgen/output/actor/IntegerKeyActorTest.java A code/src/itest/pcgen/output/actor/ListKeyActorTest.java A code/src/itest/pcgen/output/actor/ObjectKeyActorTest.java A code/src/itest/pcgen/output/actor/StringKeyActorTest.java A code/src/itest/pcgen/output/testsupport/AbstractOutputTestCase.java A code/src/itest/plugin/lsttokens/datacontrol/SelectableTokenIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/DefineIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/DefineStatIntegrationTest.java A code/src/itest/plugin/lsttokens/editcontext/FactIntegrationTest.java A code/src/itest/plugin/lsttokens/editcontext/FactSetIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/deity/AlignIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/equipment/SizeIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/pcclass/BonusSpellStatIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/pcclass/SpellStatIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/race/SizeIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/skill/KeystatIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/spell/StatIntegrationTest.java M code/src/itest/plugin/lsttokens/editcontext/template/SizeIntegrationTest.java M code/src/itest/tokenmodel/AutoWeaponProfTest.java M code/src/itest/tokenmodel/testsupport/AbstractTokenModelTest.java M code/src/java/applicationContext.xml M code/src/java/gmgen/plugin/PcgCombatant.java M code/src/java/gmgen/plugin/PcgSystemInitiative.java M code/src/java/gmgen/plugin/PlayerCharacterOutput.java M code/src/java/gmgen/plugin/SystemHP.java A code/src/java/pcgen/base/geom/GridPoint.java A code/src/java/pcgen/base/lang/NumberUtilities.java A code/src/java/pcgen/base/util/BasicIndirect.java A code/src/java/pcgen/base/util/BasicObjectContainer.java A code/src/java/pcgen/base/util/Indirect.java A code/src/java/pcgen/base/util/ObjectContainer.java M code/src/java/pcgen/cdom/base/BasicChooseInformation.java M code/src/java/pcgen/cdom/base/CDOMObject.java M code/src/java/pcgen/cdom/base/CDOMReference.java M code/src/java/pcgen/cdom/base/ChoiceSet.java M code/src/java/pcgen/cdom/base/Converter.java A code/src/java/pcgen/cdom/base/GroupDefinition.java A code/src/java/pcgen/cdom/base/ItemFacet.java R code/src/java/pcgen/cdom/base/ObjectContainer.java M code/src/java/pcgen/cdom/base/PrimitiveChoiceSet.java M code/src/java/pcgen/cdom/base/PrimitiveCollection.java A code/src/java/pcgen/cdom/base/SetFacet.java M code/src/java/pcgen/cdom/choiceset/CollectionToAbilitySelection.java M code/src/java/pcgen/cdom/choiceset/CollectionToChoiceSet.java M code/src/java/pcgen/cdom/choiceset/CompoundAndChoiceSet.java M code/src/java/pcgen/cdom/choiceset/ModifyChoiceDecorator.java A code/src/java/pcgen/cdom/content/ContentDefinition.java A code/src/java/pcgen/cdom/content/fact/FactDefinition.java A code/src/java/pcgen/cdom/content/fact/FactDefinitionEnforcer.java A code/src/java/pcgen/cdom/content/fact/FactGroup.java A code/src/java/pcgen/cdom/content/fact/FactGroupDefinition.java A code/src/java/pcgen/cdom/content/fact/FactInfo.java A code/src/java/pcgen/cdom/content/fact/FactParser.java A code/src/java/pcgen/cdom/content/factset/FactSetDefinition.java A code/src/java/pcgen/cdom/content/factset/FactSetDefinitionEnforcer.java A code/src/java/pcgen/cdom/content/factset/FactSetGroup.java A code/src/java/pcgen/cdom/content/factset/FactSetGroupDefinition.java A code/src/java/pcgen/cdom/content/factset/FactSetInfo.java A code/src/java/pcgen/cdom/content/factset/FactSetParser.java M code/src/java/pcgen/cdom/converter/AddFilterConverter.java M code/src/java/pcgen/cdom/converter/DereferencingConverter.java M code/src/java/pcgen/cdom/converter/NegateFilterConverter.java A code/src/java/pcgen/cdom/enumeration/FactKey.java A code/src/java/pcgen/cdom/enumeration/FactSetKey.java M code/src/java/pcgen/cdom/enumeration/FormulaKey.java M code/src/java/pcgen/cdom/enumeration/ListKey.java M code/src/java/pcgen/cdom/enumeration/ObjectKey.java M code/src/java/pcgen/cdom/enumeration/StringKey.java M code/src/java/pcgen/cdom/facet/DomainSpellsFacet.java M code/src/java/pcgen/cdom/facet/EquipmentFacet.java M code/src/java/pcgen/cdom/facet/EquippedEquipmentFacet.java M code/src/java/pcgen/cdom/facet/FacetInitialization.java M code/src/java/pcgen/cdom/facet/GrantedAbilityFacet.java M code/src/java/pcgen/cdom/facet/HitPointFacet.java M code/src/java/pcgen/cdom/facet/KitFacet.java M code/src/java/pcgen/cdom/facet/StatCalcFacet.java A code/src/java/pcgen/cdom/facet/WeaponProfFacet.java M code/src/java/pcgen/cdom/facet/analysis/ChallengeRatingFacet.java M code/src/java/pcgen/cdom/facet/analysis/FavoredClassFacet.java M code/src/java/pcgen/cdom/facet/analysis/GlobalToSkillCostFacet.java M code/src/java/pcgen/cdom/facet/analysis/LegalDeityFacet.java M code/src/java/pcgen/cdom/facet/analysis/LoadFacet.java M code/src/java/pcgen/cdom/facet/analysis/MonCSkillToSkillCostFacet.java M code/src/java/pcgen/cdom/facet/analysis/MultiClassFacet.java M code/src/java/pcgen/cdom/facet/analysis/NonStatStatFacet.java M code/src/java/pcgen/cdom/facet/analysis/NonStatToStatFacet.java M code/src/java/pcgen/cdom/facet/analysis/UnlockedStatFacet.java M code/src/java/pcgen/cdom/facet/base/AbstractCNASEnforcingFacet.java M code/src/java/pcgen/cdom/facet/input/AutoListWeaponProfFacet.java M code/src/java/pcgen/cdom/facet/input/BonusWeaponProfFacet.java M code/src/java/pcgen/cdom/facet/model/AlignmentFacet.java M code/src/java/pcgen/cdom/facet/model/CheckFacet.java M code/src/java/pcgen/cdom/facet/model/ClassFacet.java M code/src/java/pcgen/cdom/facet/model/CompanionModFacet.java M code/src/java/pcgen/cdom/facet/model/DeityFacet.java M code/src/java/pcgen/cdom/facet/model/DomainFacet.java M code/src/java/pcgen/cdom/facet/model/LanguageFacet.java M code/src/java/pcgen/cdom/facet/model/RaceFacet.java M code/src/java/pcgen/cdom/facet/model/SizeFacet.java M code/src/java/pcgen/cdom/facet/model/SkillFacet.java M code/src/java/pcgen/cdom/facet/model/StatFacet.java M code/src/java/pcgen/cdom/facet/model/TemplateFacet.java R code/src/java/pcgen/cdom/facet/model/WeaponProfFacet.java A code/src/java/pcgen/cdom/facet/model/WeaponProfModelFacet.java M code/src/java/pcgen/cdom/formula/FixedSizeFormula.java M code/src/java/pcgen/cdom/helper/StatLock.java M code/src/java/pcgen/cdom/primitive/CompoundAndPrimitive.java M code/src/java/pcgen/cdom/primitive/NegatingPrimitive.java A code/src/java/pcgen/cdom/primitive/ObjectContainerPrimitive.java M code/src/java/pcgen/cdom/reference/CDOMGroupRef.java M code/src/java/pcgen/cdom/reference/CDOMSimpleSingleRef.java M code/src/java/pcgen/cdom/reference/CDOMSingleRef.java M code/src/java/pcgen/cdom/reference/FilteredReference.java A code/src/java/pcgen/cdom/util/FactSetKeyMapToList.java M code/src/java/pcgen/core/BonusManager.java M code/src/java/pcgen/core/Deity.java M code/src/java/pcgen/core/Equipment.java M code/src/java/pcgen/core/EquipmentChoice.java M code/src/java/pcgen/core/EquipmentList.java M code/src/java/pcgen/core/GameMode.java M code/src/java/pcgen/core/Globals.java M code/src/java/pcgen/core/PCAlignment.java M code/src/java/pcgen/core/PCClass.java M code/src/java/pcgen/core/PCStat.java M code/src/java/pcgen/core/PlayerCharacter.java M code/src/java/pcgen/core/SizeAdjustment.java M code/src/java/pcgen/core/Skill.java M code/src/java/pcgen/core/SpellSupportForPCClass.java M code/src/java/pcgen/core/analysis/AlignmentConverter.java M code/src/java/pcgen/core/analysis/BonusCalc.java M code/src/java/pcgen/core/analysis/SizeUtilities.java M code/src/java/pcgen/core/analysis/SkillInfoUtilities.java M code/src/java/pcgen/core/analysis/SkillModifier.java M code/src/java/pcgen/core/character/WieldCategory.java M code/src/java/pcgen/core/display/CharacterDisplay.java M code/src/java/pcgen/core/display/NonAbilityDisplay.java M code/src/java/pcgen/core/display/SkillCostDisplay.java M code/src/java/pcgen/core/display/TemplateModifier.java M code/src/java/pcgen/core/kit/KitAlignment.java M code/src/java/pcgen/core/kit/KitGear.java M code/src/java/pcgen/core/kit/KitStat.java M code/src/java/pcgen/core/npcgen/AlignGeneratorOption.java M code/src/java/pcgen/core/npcgen/ClassDataParser.java M code/src/java/pcgen/core/npcgen/Configuration.java M code/src/java/pcgen/core/npcgen/EquipmentItem.java M code/src/java/pcgen/core/npcgen/NPCGenerator.java M code/src/java/pcgen/core/pclevelinfo/PCLevelInfoStat.java M code/src/java/pcgen/core/system/LoadInfo.java M code/src/java/pcgen/core/term/EvaluatorFactory.java M code/src/java/pcgen/core/term/PCBaseSpellStatTermEvaluator.java M code/src/java/pcgen/core/term/PCSPellBaseStatScoreEvaluatorTermEvaluator.java M code/src/java/pcgen/core/term/PCSPellBaseStatTermEvaluator.java M code/src/java/pcgen/core/term/PCScoreTermEvaluator.java M code/src/java/pcgen/core/term/PCStatBaseTermEvaluator.java M code/src/java/pcgen/core/term/PCStatModTermEvaluator.java M code/src/java/pcgen/core/term/PCStatTotalTermEvaluator.java M code/src/java/pcgen/facade/core/StatFacade.java M code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java M code/src/java/pcgen/gui2/facade/Gui2InfoFactory.java M code/src/java/pcgen/io/ExportHandler.java M code/src/java/pcgen/io/PCGVer2Creator.java M code/src/java/pcgen/io/PCGVer2Parser.java M code/src/java/pcgen/io/exporttoken/EqToken.java M code/src/java/pcgen/io/exporttoken/StatToken.java M code/src/java/pcgen/io/exporttoken/WeaponToken.java M code/src/java/pcgen/io/exporttoken/WeaponhToken.java A code/src/java/pcgen/output/actor/FactKeyActor.java A code/src/java/pcgen/output/actor/FactSetKeyActor.java A code/src/java/pcgen/output/actor/IntegerKeyActor.java A code/src/java/pcgen/output/actor/ListKeyActor.java A code/src/java/pcgen/output/actor/ObjectKeyActor.java A code/src/java/pcgen/output/actor/OutputNameActor.java A code/src/java/pcgen/output/actor/SourceActor.java A code/src/java/pcgen/output/actor/StringKeyActor.java A code/src/java/pcgen/output/base/ModelFactory.java A code/src/java/pcgen/output/base/OutputActor.java A code/src/java/pcgen/output/factory/ItemModelFactory.java A code/src/java/pcgen/output/factory/SetModelFactory.java A code/src/java/pcgen/output/library/ObjectWrapperLibrary.java A code/src/java/pcgen/output/model/CDOMObjectModel.java A code/src/java/pcgen/output/model/CDOMObjectWrapperInfo.java A code/src/java/pcgen/output/model/CNAbilitySelectionModel.java A code/src/java/pcgen/output/model/CategoryModel.java A code/src/java/pcgen/output/model/CollectionModel.java A code/src/java/pcgen/output/model/ItemFacetModel.java A code/src/java/pcgen/output/model/SetFacetModel.java A code/src/java/pcgen/output/publish/OutputDB.java A code/src/java/pcgen/output/wrapper/CDOMObjectWrapper.java A code/src/java/pcgen/output/wrapper/CDOMReferenceWrapper.java A code/src/java/pcgen/output/wrapper/CNAbilitySelectionWrapper.java A code/src/java/pcgen/output/wrapper/CategoryWrapper.java A code/src/java/pcgen/output/wrapper/EnumWrapper.java A code/src/java/pcgen/output/wrapper/TypeSafeConstantWrapper.java M code/src/java/pcgen/persistence/GameModeFileLoader.java M code/src/java/pcgen/persistence/SourceFileLoader.java M code/src/java/pcgen/persistence/lst/CampaignLoader.java M code/src/java/pcgen/persistence/lst/utils/VariableReport.java M code/src/java/pcgen/rules/context/AbstractObjectContext.java M code/src/java/pcgen/rules/context/AbstractReferenceContext.java M code/src/java/pcgen/rules/context/ConsolidatedObjectCommitStrategy.java M code/src/java/pcgen/rules/context/LoadContext.java M code/src/java/pcgen/rules/context/LoadContextInst.java M code/src/java/pcgen/rules/context/ObjectCommitStrategy.java M code/src/java/pcgen/rules/context/ReferenceContextUtilities.java R code/src/java/pcgen/rules/persistence/AbbreviatedCreator.java A code/src/java/pcgen/rules/persistence/CDOMControlLoader.java M code/src/java/pcgen/rules/persistence/ChoiceSetLoadUtilities.java M code/src/java/pcgen/rules/persistence/TokenLibrary.java M code/src/java/pcgen/rules/persistence/TokenSupport.java M code/src/java/pcgen/rules/persistence/token/AbstractPCQualifierToken.java M code/src/java/pcgen/rules/persistence/token/AbstractRestrictedSpellPrimitive.java M code/src/java/pcgen/rules/persistence/util/TokenFamily.java M code/src/java/pcgen/rules/persistence/util/TokenFamilySubIterator.java A code/src/java/pcgen/rules/types/FormatManager.java A code/src/java/pcgen/rules/types/FormatManagerLibrary.java M code/src/java/pcgen/util/JepCountType.java M code/src/java/pcgen/util/StringPClassUtil.java M code/src/java/plugin/bonustokens/LockedStat.java M code/src/java/plugin/bonustokens/Stat.java M code/src/java/plugin/exporttokens/AlignmentToken.java M code/src/java/plugin/exporttokens/DeityToken.java M code/src/java/plugin/exporttokens/SkillListModsToken.java M code/src/java/plugin/exporttokens/TemplateToken.java A code/src/java/plugin/format/AlignmentManager.java A code/src/java/plugin/format/BooleanManager.java A code/src/java/plugin/format/GridPointManager.java A code/src/java/plugin/format/NumberManager.java A code/src/java/plugin/format/PCClassManager.java A code/src/java/plugin/format/StatManager.java A code/src/java/plugin/format/StringManager.java M code/src/java/plugin/initiative/gui/Initiative.java M code/src/java/plugin/lsttokens/DefineLst.java M code/src/java/plugin/lsttokens/DefineStatLst.java A code/src/java/plugin/lsttokens/FactLst.java A code/src/java/plugin/lsttokens/FactSetLst.java M code/src/java/plugin/lsttokens/NaturalattacksLst.java A code/src/java/plugin/lsttokens/campaign/DataControlToken.java M code/src/java/plugin/lsttokens/choose/AlignmentToken.java M code/src/java/plugin/lsttokens/choose/PCStatToken.java A code/src/java/plugin/lsttokens/datacontrol/DataFormatToken.java A code/src/java/plugin/lsttokens/datacontrol/DisplayNameToken.java A code/src/java/plugin/lsttokens/datacontrol/ExplanationToken.java A code/src/java/plugin/lsttokens/datacontrol/FactDefToken.java A code/src/java/plugin/lsttokens/datacontrol/FactSetDefToken.java A code/src/java/plugin/lsttokens/datacontrol/RequiredToken.java A code/src/java/plugin/lsttokens/datacontrol/SelectableToken.java A code/src/java/plugin/lsttokens/datacontrol/VisibleToken.java M code/src/java/plugin/lsttokens/deity/AlignToken.java M code/src/java/plugin/lsttokens/equipment/SizeToken.java M code/src/java/plugin/lsttokens/equipmentmodifier/choose/StatBonusToken.java M code/src/java/plugin/lsttokens/kit/AlignToken.java M code/src/java/plugin/lsttokens/kit/StatToken.java M code/src/java/plugin/lsttokens/kit/gear/SizeToken.java M code/src/java/plugin/lsttokens/pcclass/BonusspellstatToken.java M code/src/java/plugin/lsttokens/pcclass/SpellstatToken.java M code/src/java/plugin/lsttokens/race/SizeToken.java M code/src/java/plugin/lsttokens/sizeadjustment/AbbToken.java A code/src/java/plugin/lsttokens/sizeadjustment/DisplayNameToken.java M code/src/java/plugin/lsttokens/skill/KeystatToken.java M code/src/java/plugin/lsttokens/spell/StatToken.java M code/src/java/plugin/lsttokens/statsandchecks/alignment/AbbToken.java M code/src/java/plugin/lsttokens/statsandchecks/stat/AbbToken.java M code/src/java/plugin/lsttokens/template/SizeToken.java M code/src/java/plugin/pretokens/parser/PreAlignParser.java M code/src/java/plugin/pretokens/parser/PreBaseSizeParser.java M code/src/java/plugin/pretokens/parser/PreDeityAlignParser.java A code/src/java/plugin/pretokens/parser/PreFactParser.java A code/src/java/plugin/pretokens/parser/PreFactSetParser.java M code/src/java/plugin/pretokens/parser/PreSizeParser.java M code/src/java/plugin/pretokens/test/PreAlignTester.java M code/src/java/plugin/pretokens/test/PreBaseSizeTester.java M code/src/java/plugin/pretokens/test/PreDeityAlignTester.java A code/src/java/plugin/pretokens/test/PreFactSetTester.java A code/src/java/plugin/pretokens/test/PreFactTester.java M code/src/java/plugin/pretokens/test/PreStatTester.java A code/src/java/plugin/pretokens/writer/PreFactSetWriter.java A code/src/java/plugin/pretokens/writer/PreFactWriter.java M code/src/java/plugin/primitive/deity/AlignToken.java M code/src/java/plugin/primitive/deity/PantheonToken.java M code/src/java/plugin/primitive/equipment/WieldCategoryToken.java M code/src/java/plugin/primitive/language/LangBonusToken.java M code/src/java/plugin/primitive/pcclass/ClassToken.java M code/src/java/plugin/primitive/pcclass/SpellTypeToken.java M code/src/java/plugin/primitive/pcclass/SpellcasterToken.java M code/src/java/plugin/primitive/race/BaseSizeToken.java M code/src/java/plugin/primitive/race/RaceSubTypeToken.java M code/src/java/plugin/primitive/race/RaceTypeToken.java M code/src/java/plugin/primitive/skill/UseUntrainedToken.java M code/src/java/plugin/primitive/spell/DescriptorToken.java M code/src/java/plugin/primitive/spell/ProhibitedToken.java M code/src/java/plugin/primitive/spell/SchoolToken.java M code/src/java/plugin/primitive/spell/SpellBookToken.java M code/src/java/plugin/primitive/spell/SubSchoolToken.java M code/src/java/plugin/qualifier/armorprof/EquipmentToken.java M code/src/java/plugin/qualifier/equipment/CarriedToken.java M code/src/java/plugin/qualifier/equipment/EquippedToken.java M code/src/java/plugin/qualifier/pobject/AnyToken.java M code/src/java/plugin/qualifier/pobject/QualifiedToken.java M code/src/java/plugin/qualifier/shieldprof/EquipmentToken.java M code/src/java/plugin/qualifier/skill/ClassToken.java M code/src/java/plugin/qualifier/skill/CrossClassToken.java M code/src/java/plugin/qualifier/skill/ExclusiveToken.java M code/src/java/plugin/qualifier/skill/NoRankToken.java M code/src/java/plugin/qualifier/skill/RanksToken.java M code/src/java/plugin/qualifier/weaponprof/EquipmentToken.java M code/src/java/plugin/qualifier/weaponprof/SpellCasterToken.java M code/src/test/pcgen/AbstractCharacterTestCase.java M code/src/test/pcgen/AbstractJunit4CharacterTestCase.java M code/src/test/pcgen/core/ChallengeRatingPathfinderTest.java M code/src/test/pcgen/core/EquipmentListTest.java M code/src/test/pcgen/core/EquipmentTest.java M code/src/test/pcgen/core/EquipmentUtilitiesTest.java M code/src/test/pcgen/core/GlobalsTest.java M code/src/test/pcgen/core/PCClassTest.java M code/src/test/pcgen/core/PlayerCharacterSpellTest.java M code/src/test/pcgen/core/PlayerCharacterTest.java M code/src/test/pcgen/core/PrereqHandlerTest.java M code/src/test/pcgen/core/SizeAdjustmentTest.java M code/src/test/pcgen/core/StatListTest.java M code/src/test/pcgen/core/prereq/PreAlignTest.java M code/src/test/pcgen/core/prereq/PreBaseSizeTest.java M code/src/test/pcgen/core/prereq/PreClassTest.java M code/src/test/pcgen/core/prereq/PreDeityAlignTest.java M code/src/test/pcgen/core/prereq/PreDeityDomainTest.java M code/src/test/pcgen/core/prereq/PreDeityTest.java M code/src/test/pcgen/core/prereq/PreDomainTest.java M code/src/test/pcgen/core/prereq/PreEquipBothTest.java M code/src/test/pcgen/core/prereq/PreEquipPrimaryTest.java M code/src/test/pcgen/core/prereq/PreEquipSecondaryTest.java M code/src/test/pcgen/core/prereq/PreEquipTest.java M code/src/test/pcgen/core/prereq/PreEquipTwoWeaponTest.java M code/src/test/pcgen/core/prereq/PreHDTest.java M code/src/test/pcgen/core/prereq/PreMultTest.java M code/src/test/pcgen/core/prereq/PreSizeTest.java M code/src/test/pcgen/core/prereq/PreSpellDescriptorTest.java M code/src/test/pcgen/core/prereq/PreSpellSchoolTest.java M code/src/test/pcgen/core/prereq/PreSpellSubSchoolTest.java M code/src/test/pcgen/core/prereq/PreSpellTypeTest.java M code/src/test/pcgen/core/prereq/PreVarTest.java M code/src/test/pcgen/core/term/EvaluatorFactoryTest.java M code/src/test/pcgen/core/term/PCRacialHDSizeTermEvaluatorTest.java M code/src/test/pcgen/core/term/PCTLTermEvaluatorTest.java M code/src/test/pcgen/gui2/facade/CharacterLevelsFacadeImplTest.java M code/src/test/pcgen/io/ExportHandlerTest.java M code/src/test/pcgen/io/exporttoken/AbilityTokenTest.java M code/src/test/pcgen/io/exporttoken/SpellMemTokenTest.java M code/src/test/pcgen/io/exporttoken/WeaponTokenTest.java M code/src/test/pcgen/persistence/lst/PObjectLoaderTest.java M code/src/test/pcgen/persistence/lst/output/prereq/PrerequisiteWriterTest.java M code/src/test/pcgen/persistence/lst/prereq/PreParserFactoryTest.java M code/src/test/pcgen/util/TestHelper.java M code/src/test/plugin/exporttokens/SkillSitTokenTest.java M code/src/test/plugin/exporttokens/SkillTokenTest.java M code/src/test/plugin/exporttokens/VAbilityTokenTest.java M code/src/test/plugin/jepcommands/ClassLevelCommandTest.java A code/src/testcommon/pcgen/output/OutputSupport.java A code/src/testcommon/plugin/lsttokens/testsupport/BuildUtilities.java M code/src/testcommon/plugin/lsttokens/testsupport/TokenRegistration.java M code/src/utest/actor/add/VFeatTokenTest.java M code/src/utest/actor/choose/AbilityTokenTest.java M code/src/utest/actor/testsupport/AbstractPersistentCDOMChoiceActorTestCase.java A code/src/utest/pcgen/base/geom/GridPointTest.java A code/src/utest/pcgen/base/lang/NumberUtilitiesTest.java M code/src/utest/pcgen/cdom/facet/analysis/StatLockFacetTest.java M code/src/utest/pcgen/cdom/facet/analysis/UnlockedStatFacetTest.java M code/src/utest/pcgen/cdom/facet/model/ClassFacetTest.java M code/src/utest/pcgen/cdom/facet/model/SizeFacetTest.java M code/src/utest/pcgen/cdom/facet/model/WeaponProfFacetTest.java M code/src/utest/pcgen/testsupport/AbstractCharacterUsingTestCase.java M code/src/utest/pcgen/testsupport/TestSupport.java A code/src/utest/plugin/format/GridPointManagerTest.java A code/src/utest/plugin/format/NumberManagerTest.java A code/src/utest/plugin/format/StringManagerTest.java M code/src/utest/plugin/lsttokens/DefineLstTest.java M code/src/utest/plugin/lsttokens/DefineStatLstTest.java A code/src/utest/plugin/lsttokens/FactLstTest.java A code/src/utest/plugin/lsttokens/FactSetLstTest.java A code/src/utest/plugin/lsttokens/campaign/DataControlTokenTest.java M code/src/utest/plugin/lsttokens/choose/AlignmentTokenTest.java M code/src/utest/plugin/lsttokens/choose/PCStatTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/DataTypeTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/DisplayNameTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/ExplanationTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/FactDefTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/FactSetDefTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/RequiredTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/SelectableTokenTest.java A code/src/utest/plugin/lsttokens/datacontrol/VisibleTokenTest.java M code/src/utest/plugin/lsttokens/deity/AlignTokenTest.java M code/src/utest/plugin/lsttokens/equipment/SizeTokenTest.java M code/src/utest/plugin/lsttokens/kit/AlignTokenTest.java M code/src/utest/plugin/lsttokens/kit/StatTokenTest.java M code/src/utest/plugin/lsttokens/kit/gear/SizeTokenTest.java M code/src/utest/plugin/lsttokens/pcclass/AbbTokenTest.java M code/src/utest/plugin/lsttokens/pcclass/BonusSpellStatTokenTest.java M code/src/utest/plugin/lsttokens/pcclass/SpellStatTokenTest.java M code/src/utest/plugin/lsttokens/race/SizeTokenTest.java M code/src/utest/plugin/lsttokens/sizeadjustment/AbbTokenTest.java M code/src/utest/plugin/lsttokens/skill/KeystatTokenTest.java M code/src/utest/plugin/lsttokens/spell/StatTokenTest.java M code/src/utest/plugin/lsttokens/template/SizeTokenTest.java M code/src/utest/plugin/lsttokens/testsupport/AbstractQualifierTokenTestCase.java M code/src/utest/plugin/pretokens/AbstractAlignRoundRobin.java M code/src/utest/plugin/pretokens/AbstractPreRoundRobin.java M code/src/utest/plugin/pretokens/PreBaseSizeRoundRobin.java M code/src/utest/plugin/pretokens/PreSizeRoundRobin.java M code/src/utest/plugin/primitive/deity/AlignTokenTest.java M code/src/utest/plugin/primitive/race/BaseSizeTokenTest.java M data/pathfinder/dreamscarred_press/ultimate_psionics/ultimate_psionics.pcc M data/pathfinder/paizo/adventure_path/mummys_mask/mummys_mask_players_guide/mm_abilities.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/OGL.txt A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67.jpg A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67.pcc A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_abilities.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_abilitycategories.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_equip_arms_armor.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_equip_magic_items.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_kits_races.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_profs_weapon.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_races.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_skills.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_spells.lst A data/pathfinder/paizo/adventure_path/reign_of_winter/ap67/ap67_templates.lst M data/pathfinder/paizo/adventure_path/reign_of_winter/players_guide/_reign_of_winter_players_guide.pcc A data/pathfinder/paizo/player_companion/adventurers_armory/OGL.txt A data/pathfinder/paizo/player_companion/adventurers_armory/_adventurers_armory.pcc A data/pathfinder/paizo/player_companion/adventurers_armory/aa_abilities_traits.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_abilitycategories.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_equip.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_equip_armorshields.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_equip_foci.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_equip_weapons.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_equipmods.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_feats.lst A data/pathfinder/paizo/player_companion/adventurers_armory/aa_profs_weapons.lst A data/pathfinder/paizo/player_companion/adventurers_armory/adventurers_armory.jpeg M data/pathfinder/paizo/roleplaying_game/ultimate_combat/uc_feats.lst M data/pathfinder/paizo/roleplaying_game/ultimate_combat/ultimate_combat.pcc M data/zen_test/pcgen_test_advanced/pcgen_test_advanced_templates_global.lst M system/gameModes/35e/load.lst M system/gameModes/35e/sizeAdjustment.lst M system/gameModes/3e/load.lst M system/gameModes/3e/sizeAdjustment.lst M system/gameModes/3e/statsandchecks.lst M system/gameModes/Darwins_World_2/load.lst M system/gameModes/Darwins_World_2/sizeAdjustment.lst M system/gameModes/Darwins_World_2/statsandchecks.lst M system/gameModes/Deadlands/load.lst M system/gameModes/Deadlands/sizeAdjustment.lst M system/gameModes/Deadlands/statsandchecks.lst M system/gameModes/Fantasy_Craft/sizeAdjustment.lst M system/gameModes/Fantasy_Craft/statsandchecks.lst M system/gameModes/Gaslight/load.lst M system/gameModes/Gaslight/sizeAdjustment.lst M system/gameModes/Immortal/statsandchecks.lst M system/gameModes/Killshot/sizeAdjustment.lst M system/gameModes/Killshot/statsandchecks.lst M system/gameModes/Legends_of_Excalibur/load.lst M system/gameModes/Legends_of_Excalibur/sizeAdjustment.lst M system/gameModes/Legends_of_Excalibur/statsandchecks.lst M system/gameModes/Modern/load.lst M system/gameModes/Modern/sizeAdjustment.lst M system/gameModes/Modern/statsandchecks.lst M system/gameModes/OSRIC/load.lst M system/gameModes/OSRIC/sizeAdjustment.lst M system/gameModes/Pathfinder/load.lst M system/gameModes/Pathfinder_PFS/load.lst M system/gameModes/Pathfinder_PFS/sizeAdjustment.lst M system/gameModes/Sidewinder/load.lst M system/gameModes/Sidewinder/sizeAdjustment.lst M system/gameModes/Sidewinder/statsandchecks.lst M system/gameModes/Spycraft/load.lst M system/gameModes/Spycraft/sizeAdjustment.lst M system/gameModes/Spycraft/statsandchecks.lst M system/gameModes/Xcrawl/load.lst M system/gameModes/Xcrawl/sizeAdjustment.lst M system/gameModes/Xcrawl/statsandchecks.lst M system/gameModes/default/load.lst M system/gameModes/default/sizeAdjustment.lst M system/gameModes/zen_test/load.lst M system/gameModes/zen_test/sizeAdjustment.lst M system/gameModes/zen_test/statsandchecks.lst Log Message: ----------- Merge branch 'master' of https://github.com/PCGen/pcgen into NEWTAG-414 Conflicts: code/src/java/pcgen/core/PCAlignment.java Compare: https://github.com/PCGen/pcgen/compare/7ffa9fb59a46^...2057bcfd56ce |
