opengs-svn

[OpenGS-svn] SF.net SVN: opengs:[845] branches/newsave

[<sto...@us...>]

Revision: 845
          http://opengs.svn.sourceforge.net/opengs/?rev=845&view=rev
Author:   storchaka
Date:     2011-10-21 19:20:50 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
Merge with trunk

Modified Paths:
--------------
    branches/newsave/docs/batconv.html
    branches/newsave/src/BatSim.java
    branches/newsave/src/batconv.java
    branches/newsave/src/game.properties
    branches/newsave/src/objects/Galaxy.java
    branches/newsave/src/objects/GravicapaFleet.java
    branches/newsave/src/objects/Planet.java
    branches/newsave/src/objects/Race.java
    branches/newsave/src/objects/ShipGroup.java
    branches/newsave/src/objects/battle/Containers.java
    branches/newsave/src/objects/battle/IBattleGenerator.java
    branches/newsave/src/objects/battle/Shot.java
    branches/newsave/src/objects/battle/StandartBattleGenerator.java
    branches/newsave/src/objects/bombing/Bombing.java
    branches/newsave/src/objects/bombing/CaptureBombingGenerator.java
    branches/newsave/src/objects/bombing/PlanetBombings.java
    branches/newsave/src/objects/cargo/COL_CargoType.java
    branches/newsave/src/objects/io/OldGalaxyInput.java
    branches/newsave/src/objects/io/OldGalaxyOutput.java
    branches/newsave/src/objects/io/XmlGalaxyInput.java
    branches/newsave/src/objects/io/XmlGalaxyOutput.java
    branches/newsave/src/objects/production/Gravicapa_Production.java
    branches/newsave/src/objects/production/_Container_Production.java
    branches/newsave/src/objects/util/GameInfoOldXml.java
    branches/newsave/src/objects/util/GameInfoText.java
    branches/newsave/src/objects/util/GameInfoXml.java
    branches/newsave/src/report/AliensShipTypesParameter.java
    branches/newsave/src/report/BombingsParameter.java
    branches/newsave/src/report/RaceListParameter.java
    branches/newsave/src/report/ShipTypesParameter.java
    branches/newsave/src/server/OGSserver.java
    branches/newsave/src/server/actions/RLFinish.java
    branches/newsave/src/server/actions/SendStatisticsMail.java
    branches/newsave/src/server/commands/ContinueGame.java
    branches/newsave/src/server/commands/DumpPlayers.java
    branches/newsave/src/server/commands/EditGame.java
    branches/newsave/src/server/commands/RollBackGame.java
    branches/newsave/src/server/commands/SendAnonymousMessage.java
    branches/newsave/src/server/commands/SendBroadcastMessage.java
    branches/newsave/src/server/commands/SendGlobalBroadcastMessage.java
    branches/newsave/src/server/commands/SendHypercastMessage.java
    branches/newsave/src/server/commands/SendPrivateMessage.java
    branches/newsave/src/server/commands/SendTeamMessage.java
    branches/newsave/src/server/commands/StopGame.java
    branches/newsave/src/server/commands/TestGame.java
    branches/newsave/src/server/options/Address.java
    branches/newsave/src/server/options/ReportName.java
    branches/newsave/src/server/options/ReportParameters.java
    branches/newsave/src/server/order/AbstractOrderCommand.java
    branches/newsave/src/server/order/BreakGroupOrFleet.java
    branches/newsave/src/server/order/DefineScience.java
    branches/newsave/src/server/order/GetReport.java
    branches/newsave/src/server/order/GiftPlanet.java
    branches/newsave/src/server/order/GiftShips.java
    branches/newsave/src/server/order/InterceptShips.java
    branches/newsave/src/server/order/JoinGroups.java
    branches/newsave/src/server/order/LoadShips.java
    branches/newsave/src/server/order/Production.java
    branches/newsave/src/server/order/QuitGame.java
    branches/newsave/src/server/order/RecallShips.java
    branches/newsave/src/server/order/RenameShipType.java
    branches/newsave/src/server/order/ScrapShips.java
    branches/newsave/src/server/order/SendShips.java
    branches/newsave/src/server/order/UnloadShips.java
    branches/newsave/src/server/order/UpgradeShips.java
    branches/newsave/src/server/phase/BombPhase.java
    branches/newsave/src/server/phase/CollapsePhase.java
    branches/newsave/src/server/phase/ExpandPhase.java
    branches/newsave/src/server/phase/FightPhase.java
    branches/newsave/src/server/phase/MovePhase.java
    branches/newsave/src/server/phase/QuitBySleepPhase.java
    branches/newsave/src/server/phase/RotatePhase.java
    branches/newsave/src/util/SuperProperties.java
    branches/newsave/src/util/Utils.java

Added Paths:
-----------
    branches/newsave/src/extra/
    branches/newsave/src/extra/DGNonlinearExperience.java
    branches/newsave/src/extra/hyperbomb/
    branches/newsave/src/extra/hyperbomb/HyperbombArrivePhase.java
    branches/newsave/src/extra/hyperbomb/HyperbombBattleFilter.java
    branches/newsave/src/extra/hyperbomb/HyperbombPhase.java
    branches/newsave/src/objects/bombing/SiegeBombingGenerator.java
    branches/newsave/src/objects/production/SpecialShipType_Production.java
    branches/newsave/src/server/finish/ComplementaryPairVictory.java
    branches/newsave/src/server/order/DefineMonoAttackShipType.java

Removed Paths:
-------------
    branches/newsave/src/extra/DGNonlinearExperience.java
    branches/newsave/src/extra/hyperbomb/
    branches/newsave/src/extra/hyperbomb/HyperbombArrivePhase.java
    branches/newsave/src/extra/hyperbomb/HyperbombBattleFilter.java
    branches/newsave/src/extra/hyperbomb/HyperbombPhase.java
    branches/newsave/src/objects/production/PseudoProductionType.java

Property Changed:
----------------
    branches/newsave/
    branches/newsave/src/

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[OpenGS-svn] SF.net SVN: opengs:[846] branches/newsave

[<sto...@us...>]

Revision: 846
          http://opengs.svn.sourceforge.net/opengs/?rev=846&view=rev
Author:   storchaka
Date:     2011-10-24 16:35:42 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
?\208?\159?\208?\181?\209?\128?\208?\181?\208?\186?\208?\187?\209?\142?\209?\135?\208?\181?\208?\189?\208?\184?\208?\181 ?\208?\189?\208?\176 ?\209?\132?\208?\190?\209?\128?\208?\188?\208?\176?\209?\130 ?\209?\129?\208?\190?\209?\133?\209?\128?\208?\176?\208?\189?\208?\181?\208?\189?\208?\184?\209?\143 ?\208?\178 XML.

Modified Paths:
--------------
    branches/newsave/build.xml
    branches/newsave/src/MapGen.java
    branches/newsave/src/objects/Galaxy.java
    branches/newsave/src/objects/Planet.java
    branches/newsave/src/objects/Race.java
    branches/newsave/src/objects/ShipType.java
    branches/newsave/src/objects/io/XmlGalaxyInput.java
    branches/newsave/src/objects/io/XmlGalaxyOutput.java
    branches/newsave/src/objects/production/AbstractProduction.java
    branches/newsave/src/objects/production/CAP_Production.java
    branches/newsave/src/objects/production/Cloning_Production.java
    branches/newsave/src/objects/production/CustomProduction.java
    branches/newsave/src/objects/production/Gravicapa_Production.java
    branches/newsave/src/objects/production/IProduction.java
    branches/newsave/src/objects/production/IProductionType.java
    branches/newsave/src/objects/production/IScience.java
    branches/newsave/src/objects/production/MAT_Production.java
    branches/newsave/src/objects/production/Medicine_Production.java
    branches/newsave/src/objects/production/MovePlanet2_Production.java
    branches/newsave/src/objects/production/MovePlanetSargona_Production.java
    branches/newsave/src/objects/production/PostStandardProduction.java
    branches/newsave/src/objects/production/Science_Production.java
    branches/newsave/src/objects/production/Ship_Production.java
    branches/newsave/src/objects/production/SpecialShipType_Production.java
    branches/newsave/src/objects/production/StandardProduction.java
    branches/newsave/src/objects/production/Terraforming_Production.java
    branches/newsave/src/objects/production/TurboScience_Production.java
    branches/newsave/src/objects/production/_Container_Production.java
    branches/newsave/src/objects/util/GameInfoOldXml.java
    branches/newsave/src/report/ShipsInProductionParameter.java
    branches/newsave/src/server/OGSserver.java
    branches/newsave/src/server/actions/CreateNewGame.java
    branches/newsave/src/server/commands/ConfirmGameAddress.java
    branches/newsave/src/server/commands/CreateNewGame.java
    branches/newsave/src/server/commands/JoinRaceToGame.java
    branches/newsave/src/server/commands/WithdrawRequest.java
    branches/newsave/src/server/order/DefineShipType.java
    branches/newsave/src/server/order/RenameShipType.java

Removed Paths:
-------------
    branches/newsave/src/objects/io/OldGalaxyInput.java
    branches/newsave/src/objects/io/OldGalaxyOutput.java

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.