From 0c7f40975a6b9c67db716ae81fe84121777a7c3a Mon Sep 17 00:00:00 2001 From: Nils Kneuper Date: Sun, 6 Nov 2011 11:46:09 +0000 Subject: [PATCH] removal of khalifate (part2): * add entries to changelogs and release_notes --- RELEASE_NOTES | 4 ++++ changelog | 2 ++ players_changelog | 2 ++ 3 files changed, 8 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index a82488d1d82..44cdbdbb2f6 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -18,6 +18,10 @@ CHANGES The AMLA requirements have changed from 150 XP for all units to 50 times the unit's level (25 for level 0 units). [/section] +[section="Removal of the 'Khalifate'"] +The Khalifate were a new race/faction added as part of a multiplayer era during the 1.9 development process. The original plan was to have them stabilized before 1.10, but further balancing and string changes are required which will not be ready in time for the planned 1.10. Because of this the development of this faction will continue as an addon which is hopefully merge into trunk shortly after the release of 1.10 (and will be part of the 1.12 series). +[/section] + [section="Another Change"] [/section] diff --git a/changelog b/changelog index 12a09a284fe..e7ec2cfa8b4 100644 --- a/changelog +++ b/changelog @@ -28,6 +28,7 @@ Version 1.9.9+svn: * Tall encampment keep can now be placed next to the tent encampment keep * Forest/hill terrain combinations no longer appear black on the minimap * Default team color always applied last; fixes bug #18817 + * Removal of Khalifate unit images * Language and i18n: * Made it so that all of the Hangul Syllables block is covered by the font-loading code. @@ -61,6 +62,7 @@ Version 1.9.9+svn: * The XP required for an AMLA is now 50*level (and 25 for level 0) instead of always 150. * Increased the HP of the Great Mage from 55 to 60. + * Removal of the Khalifate units, faction and era * User interface * Removed waypoints UI feature * Added an option to disable the "loading save from a different version" diff --git a/players_changelog b/players_changelog index e1f029a330b..3d4bf418a33 100644 --- a/players_changelog +++ b/players_changelog @@ -22,6 +22,7 @@ Version 1.9.9+svn: * Tall encampment keep can now be placed next to the tent encampment keep. * Forest/hill terrain combinations no longer appear black on the minimap * Default team color always applied last; fixes bug #18817 + * Removal of Khalifate unit images. * Language and i18n: * Made it so that all of the Hangul Syllables block is covered by the @@ -42,6 +43,7 @@ Version 1.9.9+svn: * The XP required for an AMLA is now 50*level (and 25 for level 0) instead of always 150. * Increased the HP of the Great Mage from 55 to 60. + * Removal of the Khalifate units, faction and era. * User interface: * Removed waypoints UI feature ('w' key) since the whiteboard provides