opengs-svn

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

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

Revision: 812
          http://opengs.svn.sourceforge.net/opengs/?rev=812&view=rev
Author:   storchaka
Date:     2010-07-09 20:42:32 +0000 (Fri, 09 Jul 2010)

Log Message:
-----------
Merge with trunk

Modified Paths:
--------------
    branches/newsave/src/objects/Galaxy.java
    branches/newsave/src/objects/Race.java
    branches/newsave/src/objects/battle/Battle.java
    branches/newsave/src/objects/battle/BattleRace.java
    branches/newsave/src/objects/battle/StandartBattleGenerator.java
    branches/newsave/src/objects/geom/CircleMapGeometry.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/CAP_Production.java
    branches/newsave/src/objects/production/MAT_Production.java
    branches/newsave/src/server/OGSserver.java
    branches/newsave/src/server/commands/AbstractServerCommand.java
    branches/newsave/src/server/commands/CreateNewGame.java
    branches/newsave/src/server/commands/DumpPlayers.java
    branches/newsave/src/server/order/DefineShipType.java
    branches/newsave/src/server/order/GetReport.java

Added Paths:
-----------
    branches/newsave/src/game.properties
    branches/newsave/src/server/commands/BanRace.java

Property Changed:
----------------
    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:[847] branches/newsave/src

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

Revision: 847
          http://opengs.svn.sourceforge.net/opengs/?rev=847&view=rev
Author:   storchaka
Date:     2011-11-03 15:44:27 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
?\208?\161?\208?\181?\209?\128?\209?\140?\209?\145?\208?\183?\208?\189?\208?\176?\209?\143 ?\208?\191?\208?\181?\209?\128?\208?\181?\209?\128?\208?\176?\208?\177?\208?\190?\209?\130?\208?\186?\208?\176 ?\208?\184?\208?\181?\209?\128?\208?\176?\209?\128?\209?\133?\208?\184?\208?\184 ?\208?\186?\208?\187?\208?\176?\209?\129?\209?\129?\208?\190?\208?\178 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\176.
?\208?\146 ?\209?\129?\208?\191?\208?\184?\209?\129?\208?\186?\208?\181 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\176 ?\209?\131?\208?\186?\208?\176?\208?\183?\209?\139?\208?\178?\208?\176?\208?\181?\209?\130?\209?\129?\209?\143 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\190 ?\208?\186?\208?\190?\209?\128?\208?\176?\208?\177?\208?\187?\208?\181?\208?\185 ?\208?\184 ?\208?\189?\208?\176?\209?\131?\208?\186.
?\208?\162?\209?\131?\209?\128?\208?\177?\208?\190?\208?\189?\208?\176?\209?\131?\208?\186?\208?\184 ?\208?\184 ?\208?\180?\208?\178?\208?\184?\208?\182?\208?\181?\208?\189?\208?\184?\208?\181 ?\208?\191?\208?\187?\208?\176?\208?\189?\208?\181?\209?\130 ?\209?\131?\208?\186?\208?\176?\208?\183?\209?\139?\208?\178?\208?\176?\209?\142?\209?\130?\209?\129?\209?\143 ?\208?\186?\208?\176?\208?\186 ?\208?\190?\209?\130?\208?\180?\208?\181?\208?\187?\209?\140?\208?\189?\209?\139?\208?\185 ?\209?\130?\208?\184?\208?\191 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\176, ?\208?\191?\208?\176?\209?\128?\208?\176?\208?\188?\208?\181?\209?\130?\209?\128?\209?\139 Galaxy.ScienceImplementation ?\208?\184 Galaxy.MovePlanet.Implementation ?\209?\131?\208?\191?\209?\128?\208?\176?\208?\183?\208?\180?\208?\189?\208?\181?\208?\189?\209?\139.
?\208?\161?\208?\191?\208?\181?\209?\134?\208?\184?\208?\176?\208?\187?\209?\140?\208?\189?\209?\139?\208?\181 ?\209?\130?\208?\184?\208?\191?\209?\139 ?\208?\186?\208?\190?\209?\128?\208?\176?\208?\177?\208?\187?\208?\181?\208?\185 ?\208?\183?\208?\176?\208?\180?\208?\176?\209?\142?\209?\130?\209?\129?\209?\143 ?\208?\190?\209?\130?\208?\180?\208?\181?\208?\187?\209?\140?\208?\189?\208?\190 (?\208?\191?\208?\176?\209?\128?\208?\176?\208?\188?\208?\181?\209?\130?\209?\128 Galaxy.ShipTypes), ?\208?\176 ?\208?\189?\208?\181 ?\209?\135?\208?\181?\209?\128?\208?\181?\208?\183 ?\208?\191?\209?\129?\208?\181?\208?\178?\208?\180?\208?\190?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\176.
?\208?\160?\208?\181?\208?\176?\208?\187?\208?\184?\208?\183?\208?\190?\208?\178?\208?\176?\208?\189?\208?\190 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\190 ?\208?\186?\208?\190?\209?\128?\208?\176?\208?\177?\208?\187?\208?\181?\208?\185 ?\209?\129 ?\208?\189?\208?\181?\208?\191?\208?\190?\208?\187?\208?\189?\209?\139?\208?\188?\208?\184 ?\209?\130?\208?\181?\209?\133?\208?\189?\208?\190?\208?\187?\208?\190?\208?\179?\208?\184?\209?\143?\208?\188?\208?\184.
?\208?\152?\209?\129?\209?\129?\208?\187?\208?\181?\208?\180?\208?\190?\208?\178?\208?\176?\208?\189?\208?\184?\208?\181 ?\209?\130?\208?\181?\209?\133?\208?\189?\208?\190?\208?\187?\208?\190?\208?\179?\208?\184?\208?\185 ?\208?\190?\208?\177?\209?\138?\209?\145?\208?\180?\208?\184?\208?\189?\208?\181?\208?\189?\208?\190 ?\208?\178 ?\208?\190?\208?\180?\208?\184?\208?\189 ?\209?\130?\208?\184?\208?\191 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178?\208?\176 (?\208?\190?\208?\179?\209?\128?\208?\176?\208?\189?\208?\184?\209?\135?\208?\181?\208?\189?\208?\184?\209?\143 ?\208?\188?\208?\190?\208?\182?\208?\189?\208?\190 ?\208?\183?\208?\176?\208?\180?\208?\176?\208?\178?\208?\176?\209?\130?\209?\140 ?\208?\190?\209?\130?\208?\180?\208?\181?\208?\187?\209?\140?\208?\189?\208?\190 ?\209?\134?\208?\181?\208?\189?\208?\190?\208?\185 ?\208?\184 ?\208?\187?\208?\184?\208?\188?\208?\184?\209?\130?\208?\190?\208?\188 ?\209?\130?\208?\181?\209?\133?\208?\189?\208?\190?\208?\187?\208?\190?\208?\179?\208?\184?\208?\185).
?\208?\152?\208?\188?\208?\181?\208?\189?\208?\176 ?\208?\191?\209?\128?\208?\190?\208?\184?\208?\183?\208?\178?\208?\190?\208?\180?\209?\129?\209?\130?\208?\178 ?\208?\184?\208?\183?\208?\188?\208?\181?\208?\189?\208?\181?\208?\189?\209?\139 (Capital, TerraForming ?\208?\184 ?\209?\130.?\208?\191.).

Modified Paths:
--------------
    branches/newsave/src/MapGen.java
    branches/newsave/src/game.properties
    branches/newsave/src/mapgen/AbstractMapGenerator.java
    branches/newsave/src/mapgen/FileMapGenerator.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/TechBlock.java
    branches/newsave/src/objects/bombing/PlanetBombings.java
    branches/newsave/src/objects/io/XmlGalaxyInput.java
    branches/newsave/src/objects/io/XmlGalaxyOutput.java
    branches/newsave/src/objects/production/IScience.java
    branches/newsave/src/objects/production/PostStandardProduction.java
    branches/newsave/src/objects/production/StandardProduction.java
    branches/newsave/src/report/AliensShipTypesParameter.java
    branches/newsave/src/report/BombingsParameter.java
    branches/newsave/src/report/MyPlanetsParameter.java
    branches/newsave/src/report/SciencesParameter.java
    branches/newsave/src/report/ShipTypesParameter.java
    branches/newsave/src/report/ShipsInProductionParameter.java
    branches/newsave/src/server/order/DefineScience.java
    branches/newsave/src/server/order/DefineShipType.java
    branches/newsave/src/server/order/Production.java
    branches/newsave/src/server/order/RenameShipType.java
    branches/newsave/src/server/order/ScrapShipsToTech.java
    branches/newsave/src/server/phase/ProducePhase.java
    branches/newsave/src/util/Utils.java

Added Paths:
-----------
    branches/newsave/src/objects/production/AbstractProducing.java
    branches/newsave/src/objects/production/AbstractProductionFabric.java
    branches/newsave/src/objects/production/CapitalProduction.java
    branches/newsave/src/objects/production/CloningProduction.java
    branches/newsave/src/objects/production/IProducing.java
    branches/newsave/src/objects/production/IProduction.java
    branches/newsave/src/objects/production/MaterialsProduction.java
    branches/newsave/src/objects/production/MedicineProduction.java
    branches/newsave/src/objects/production/MovePlanet2Production.java
    branches/newsave/src/objects/production/MovePlanetProduction.java
    branches/newsave/src/objects/production/PartialTechShipProduction.java
    branches/newsave/src/objects/production/ScienceProduction.java
    branches/newsave/src/objects/production/ShipProduction.java
    branches/newsave/src/objects/production/TechnologyProduction.java
    branches/newsave/src/objects/production/TerraFormingProduction.java
    branches/newsave/src/objects/production/TurboScienceProduction.java

Removed Paths:
-------------
    branches/newsave/src/objects/production/AbstractProduction.java
    branches/newsave/src/objects/production/CAP_Production.java
    branches/newsave/src/objects/production/Cargo_Production.java
    branches/newsave/src/objects/production/Cloning_Production.java
    branches/newsave/src/objects/production/CustomProduction.java
    branches/newsave/src/objects/production/Drive_Production.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/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/Science_Production.java
    branches/newsave/src/objects/production/Shields_Production.java
    branches/newsave/src/objects/production/Ship_Production.java
    branches/newsave/src/objects/production/SpecialShipType_Production.java
    branches/newsave/src/objects/production/Technology_Production.java
    branches/newsave/src/objects/production/Terraforming_Production.java
    branches/newsave/src/objects/production/TurboScience_Production.java
    branches/newsave/src/objects/production/Weapons_Production.java
    branches/newsave/src/objects/production/_Container_Production.java

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