Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[18915] branches/6.00.x/pcgen
|
From: <jde...@us...> - 2012-12-31 01:14:36
|
Revision: 18915
http://sourceforge.net/p/pcgen/code/18915
Author: jdempsey
Date: 2012-12-31 01:14:32 +0000 (Mon, 31 Dec 2012)
Log Message:
-----------
PRERACE Error in Pathfinder since moving Default to Stats and Checks
* Merge back into 6.0 branch
Issue#: CODE-1935
Modified Paths:
--------------
branches/6.00.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
Property Changed:
----------------
branches/6.00.x/pcgen/code/src/java/pcgen/core/
branches/6.00.x/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
branches/6.00.x/pcgen/data/
branches/6.00.x/pcgen/data/alpha/battlefieldpress/
branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/adventurers_handbook/
branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/outcastia_campaign_setting/players_guidebook/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/princes_of_darkness/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/orcs_of_golarion/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_combat/
branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_magic/
branches/6.00.x/pcgen/data/alpha/wizardsofthecoast/unearthedarcana/variant_classes/paladin/
branches/6.00.x/pcgen/data/d20ogl/paizo/pathfinder_adventure_path/rise_of_the_runelords/rise_of_the_runelords_ae_players_guide/
branches/6.00.x/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
branches/6.00.x/pcgen/docs/listfilepages/lstfileclass/
branches/6.00.x/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html
branches/6.00.x/pcgen/system/gameModes/default/tips.txt
Index: branches/6.00.x/pcgen/code/src/java/pcgen/core
===================================================================
--- branches/6.00.x/pcgen/code/src/java/pcgen/core 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/code/src/java/pcgen/core 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/code/src/java/pcgen/core
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,2 ##
+/Trunk/pcgen/code/src/java/pcgen/core:18305,18571,18609,18617,18672,18708,18710-18711,18719,18722,18772-18773,18886
+/sandbox/uisync/code/src/java/pcgen/core:14608-15990
\ No newline at end of property
Modified: branches/6.00.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- branches/6.00.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2012-12-31 01:14:32 UTC (rev 18915)
@@ -377,9 +377,6 @@
private boolean processLevelAbilities = true;
- // store most recent value of bonus to skill points
- private int modSkillPointsBuffer = (int) getStatBonusTo("MODSKILLPOINTS", "NUMBER");
-
/**
* This map stores any user bonuses (entered through the GUI) to the
* corresponding ability pool.
@@ -417,16 +414,18 @@
{
ageSetKitSelections[i] = false;
}
+ //Do BilSet first, since required by Race
+ bioSetFacet.set(id, Globals.getBioSet());
+ //Set Race before Stat/Check due to Default object in Pathfinder/RSRD
+ setRace(Globals.s_EMPTYRACE);
statFacet.addAll(id, Globals.getContext().ref.getOrderSortedCDOMObjects(PCStat.class));
checkFacet.addAll(id, Globals.getContext().ref.getOrderSortedCDOMObjects(PCCheck.class));
- bioSetFacet.set(id, Globals.getBioSet());
campaignFacet.addAll(id, loadedCampaigns);
setXPTable(SettingsHandler.getGame().getDefaultXPTableName());
setCharacterType(SettingsHandler.getGame().getDefaultCharacterType());
- setRace(Globals.s_EMPTYRACE);
setName(Constants.EMPTY_STRING);
setFeats(0);
rollStats(SettingsHandler.getGame().getRollMethod());
@@ -11820,20 +11819,20 @@
public void checkSkillModChange()
{
- int modSkillPointsCurrent = (int) getStatBonusTo("MODSKILLPOINTS", "NUMBER");
- if (modSkillPointsBuffer != modSkillPointsCurrent)
+ for (PCClass pcClass : getClassSet())
{
- modSkillPointsBuffer = modSkillPointsCurrent;
-
- for (PCClass pcClass : getClassSet())
+ for (PCLevelInfo pi : getLevelInfo())
{
- for (PCLevelInfo pi : getLevelInfo())
+ PCClassLevel classLevel =
+ getActiveClassLevel(pcClass, pi.getClassLevel());
+ final int newSkillPointsGained =
+ pcClass.getSkillPointsForLevel(this, classLevel,
+ getTotalLevels());
+ if (pi.getClassKeyName().equals(pcClass.getKeyName()))
{
- PCClassLevel classLevel = getActiveClassLevel(pcClass, pi.getClassLevel());
- final int newSkillPointsGained = pcClass.getSkillPointsForLevel(this, classLevel, getTotalLevels());
- if (pi.getClassKeyName().equals(pcClass.getKeyName()))
+ final int formerGained = pi.getSkillPointsGained(this);
+ if (newSkillPointsGained != formerGained)
{
- final int formerGained = pi.getSkillPointsGained(this);
pi.setSkillPointsGained(this, newSkillPointsGained);
pi.setSkillPointsRemaining(pi.getSkillPointsRemaining() + newSkillPointsGained - formerGained);
setAssoc(pcClass, AssociationKey.SKILL_POOL, pcClass.getSkillPool(this) + newSkillPointsGained
Index: branches/6.00.x/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
===================================================================
--- branches/6.00.x/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
-/Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties:14608-15988
+/Trunk/pcgen/code/src/java/pcgen/resources/lang/LanguageBundle.properties:14608-15988,18305,18571,18609,18617,18672,18708,18719,18722
/sandbox/cdomui/code/src/java/pcgen/resources/lang/ErrorsBundle.properties:11598-14625
/sandbox/uisync/code/src/java/pcgen/resources/lang/LanguageBundle.properties:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data
===================================================================
--- branches/6.00.x/pcgen/data 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
+/Trunk/pcgen/data:18305,18571,18609,18617,18672,18708,18719,18722
/branches/5.16.x/pcgen/data:12804,12808-12809,12826,12838-12844,12855,12860-12866
/sandbox/uisync/data:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/battlefieldpress
===================================================================
--- branches/6.00.x/pcgen/data/alpha/battlefieldpress 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/battlefieldpress 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/battlefieldpress
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
+/Trunk/pcgen/data/alpha/battlefieldpress:18305,18571,18609,18617,18672,18708,18719,18722
/branches/5.16.x/pcgen/data:12863-12864
/branches/5.16.x/pcgen/data/alpha/battlefieldpress:12804,12808-12809,12826,12838-12844,12855,12860-12866
/sandbox/uisync/data/alpha/battlefieldpress:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/adventurers_handbook
===================================================================
--- branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/adventurers_handbook 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/adventurers_handbook 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/adventurers_handbook
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/nitehawkinteractivegames/adventurers_handbook:11352-18054
+/Trunk/pcgen/data/alpha/nitehawkinteractivegames/adventurers_handbook:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/outcastia_campaign_setting/players_guidebook
===================================================================
--- branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/outcastia_campaign_setting/players_guidebook 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/outcastia_campaign_setting/players_guidebook 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/nitehawkinteractivegames/outcastia_campaign_setting/players_guidebook
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/nitehawkinteractivegames/ocs_book_2:15569-18055
+/Trunk/pcgen/data/alpha/nitehawkinteractivegames/outcastia_campaign_setting/players_guidebook:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,6 ##
/Trunk/content/notfordistribution/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh:16726-16776
/Trunk/content/notfordistribution/paizo/pathfinder_chronicles/dark_markets_a_guide_to_katapesh:12603-16721
/Trunk/content/notfordistribution/paizo/pathfinder_rpg/pathfinder_chronicles/dark_markets_a_guide_to_katapesh:12601-12602
+/Trunk/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh:18305,18571,18609,18617,18672,18708,18719,18722
/branches/5.16.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh:12804,12808-12809,12826,12838-12844,12855,12860-12866
/sandbox/uisync/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion
___________________________________________________________________
Modified: svn:mergeinfo
## -1,5 +1,6 ##
/Trunk/content/notfordistribution/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion:16726-16777
/Trunk/content/notfordistribution/paizo/pathfinder_chronicles/dark_markets_a_guide_to_katapesh/pathfinder_conversion:12603-16721
/Trunk/content/notfordistribution/paizo/pathfinder_rpg/pathfinder_chronicles/dark_markets_a_guide_to_katapesh/pathfinder_conversion:12601-12602
+/Trunk/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion:18305,18571,18609,18617,18672,18708,18719,18722
/branches/5.16.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion:12804,12808-12809,12826,12838-12844,12855,12860-12866
/sandbox/uisync/data/alpha/paizo/pathfinder_campaign_setting/dark_markets_a_guide_to_katapesh/pathfinder_conversion:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/princes_of_darkness
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/princes_of_darkness 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/princes_of_darkness 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_campaign_setting/princes_of_darkness
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,3 ##
/Trunk/content/notfordistribution/paizo/pathfinder_campaign_setting/princes_of_darkness:16726-17568
/Trunk/content/notfordistribution/paizo/pathfinder_chronicles/princes_of_darkness:14433-16222
+/Trunk/pcgen/data/alpha/paizo/pathfinder_campaign_setting/princes_of_darkness:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/Trunk/content/notfordistribution/paizo/pathfinder_player_companion/faiths_of_purity:14792-16661
+/Trunk/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity:18305,18571,18609,18617,18672,18708,18719,18722
/branches/5.16.x/pcgen/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity:12804,12808-12809,12826,12838-12844,12855,12860-12866
/sandbox/uisync/data/alpha/paizo/pathfinder_player_companion/faiths_of_purity:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/orcs_of_golarion
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/orcs_of_golarion 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/orcs_of_golarion 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/orcs_of_golarion
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/paizo/pathfinder_player_companion/orcs_of_golarion:16854-17177
+/Trunk/pcgen/data/alpha/paizo/pathfinder_player_companion/orcs_of_golarion:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,4 ##
/Trunk/content/notfordistribution/paizo/pathfinder_player_companion/pirates_of_the_inner_sea:16656-16793
+/Trunk/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea:18305,18571,18609,18617,18672,18708,18719,18722
/branches/5.16.x/pcgen/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea:12804,12808-12809,12826,12838-12844,12855,12860-12866
/sandbox/uisync/data/alpha/paizo/pathfinder_player_companion/pirates_of_the_inner_sea:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_combat
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_combat 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_combat 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_combat
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_combat:15981-17478
+/Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_combat:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_magic
===================================================================
--- branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_magic 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_magic 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_magic
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/paizo/pathfinder_rpg/ultimate_magic:14965-17335
+/Trunk/pcgen/data/alpha/paizo/pathfinder_rpg/ultimate_magic:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/alpha/wizardsofthecoast/unearthedarcana/variant_classes/paladin
===================================================================
--- branches/6.00.x/pcgen/data/alpha/wizardsofthecoast/unearthedarcana/variant_classes/paladin 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/alpha/wizardsofthecoast/unearthedarcana/variant_classes/paladin 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/alpha/wizardsofthecoast/unearthedarcana/variant_classes/paladin
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/wizardsofthecoast/unearthedarcana/variant_classes/paladin:16306-16773
+/Trunk/pcgen/data/alpha/wizardsofthecoast/unearthedarcana/variant_classes/paladin:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/data/d20ogl/paizo/pathfinder_adventure_path/rise_of_the_runelords/rise_of_the_runelords_ae_players_guide
===================================================================
--- branches/6.00.x/pcgen/data/d20ogl/paizo/pathfinder_adventure_path/rise_of_the_runelords/rise_of_the_runelords_ae_players_guide 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/data/d20ogl/paizo/pathfinder_adventure_path/rise_of_the_runelords/rise_of_the_runelords_ae_players_guide 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/data/d20ogl/paizo/pathfinder_adventure_path/rise_of_the_runelords/rise_of_the_runelords_ae_players_guide
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
/Trunk/content/notfordistribution/paizo/pathfinder_adventure_path/rise_of_the_runelords_ae:17751-17753
+/Trunk/pcgen/data/d20ogl/paizo/pathfinder_adventure_path/rise_of_the_runelords/rise_of_the_runelords_ae_players_guide:18305,18571,18609,18617,18672,18708,18719,18722
\ No newline at end of property
Index: branches/6.00.x/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
===================================================================
--- branches/6.00.x/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
-/Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html:18631
+/Trunk/pcgen/docs/listfilepages/globalfilestagpages/globalfilesbonus.html:18305,18571,18609,18617,18631,18672,18708,18710-18711,18719,18722
/sandbox/uisync/docs/listfilepages/globalfilestagpages/globalfilesbonus.html:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/docs/listfilepages/lstfileclass
===================================================================
--- branches/6.00.x/pcgen/docs/listfilepages/lstfileclass 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/docs/listfilepages/lstfileclass 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/docs/listfilepages/lstfileclass
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
-/Trunk/pcgen/docs/listfilepages/lstfileclass:18745
+/Trunk/pcgen/docs/listfilepages/lstfileclass:18305,18571,18609,18617,18672,18708,18710-18711,18719,18722,18745
/sandbox/uisync/docs/listfilepages/lstfileclass:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html
===================================================================
--- branches/6.00.x/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
-/Trunk/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html:18738
+/Trunk/pcgen/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html:18305,18571,18609,18617,18672,18708,18710-18711,18719,18722,18738
/sandbox/uisync/docs/listfilepages/lstfileclass/lfc_lesson14_deities.html:14608-15990
\ No newline at end of property
Index: branches/6.00.x/pcgen/system/gameModes/default/tips.txt
===================================================================
--- branches/6.00.x/pcgen/system/gameModes/default/tips.txt 2012-12-31 00:52:58 UTC (rev 18914)
+++ branches/6.00.x/pcgen/system/gameModes/default/tips.txt 2012-12-31 01:14:32 UTC (rev 18915)
Property changes on: branches/6.00.x/pcgen/system/gameModes/default/tips.txt
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
-/Trunk/pcgen/system/gameModes/default/tips.txt:18257-18629
+/Trunk/pcgen/system/gameModes/default/tips.txt:18257-18629,18672,18708,18710-18711,18719,18722
/sandbox/uisync/system/gameModes/default/tips.txt:14608-15990
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|