PROJECT: Revision Reports 2

[Maquiladora]

Revision 962:

Resized diplomacy manager and diplomacy proposal window to fit on 600 height resolution again. See here.

Also increased width, and modified layout of diplomacy proposal window, for easier modification later.

added trunk/ctp2_data/default/graphics/pictures/dw_lb.tga
added trunk/ctp2_data/default/graphics/pictures/dw_rb.tga
modified trunk/ctp2_data/english/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/english/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/french/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/french/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/german/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/german/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/italian/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/italian/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/diplomacywindow.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/dipwizard.ldl

The images:
trunk/ctp2_data/default/graphics/pictures/640Lborder.tga
trunk/ctp2_data/default/graphics/pictures/640Lborder.tga
are no longer used, but I didn't remove them, because perhaps they can be used for easier modification again later.

[Maquiladora]

Revision 963:

Tweaking of the diplomacy proposal window, to set up for further changes.

added trunk/ctp2_data/default/graphics/pictures/updg99small.tga
modified trunk/ctp2_data/english/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/french/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/german/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/italian/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/dipwizard.ldl

[Maquiladora]

Revision 964:

Fixed diplomat photo not showing when the AI sends you a proposal:

modified trunk/ctp2_code/ui/interface/dipwizard.cpp

Cleaned up the diplomacy proposal window some more:

modified trunk/ctp2_data/english/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/french/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/german/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/italian/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/dipwizard.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/dipwizard.ldl

[Maquiladora]

Revision 965:

Removed city capture and debugAI options from gameplay options, since they shouldn't be here, and they're already present in other more appropriate windows.

modified trunk/ctp2_code/ui/interface/gameplayoptions.cpp
modified trunk/ctp2_data/english/uidata/layouts/gameplayoptions.ldl
modified trunk/ctp2_data/french/uidata/layouts/gameplayoptions.ldl
modified trunk/ctp2_data/german/uidata/layouts/gameplayoptions.ldl
modified trunk/ctp2_data/italian/uidata/layouts/gameplayoptions.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/gameplayoptions.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/gameplayoptions.ldl

Added good animations option to graphics options window, as it should be. todo: I found this broken when changing it mid-game from the advanced options, so this still needs to work mid-game, not just changing the option before a game.

modified trunk/ctp2_code/ui/interface/graphicsscreen.cpp
modified trunk/ctp2_data/english/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/french/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/german/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/italian/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/graphics.ldl
modified trunk/ctp2_data/english/gamedata/ldl_str.txt
modified trunk/ctp2_data/french/gamedata/ldl_str.txt
modified trunk/ctp2_data/german/gamedata/ldl_str.txt
modified trunk/ctp2_data/italian/gamedata/ldl_str.txt
modified trunk/ctp2_data/japanese/gamedata/ldl_str.txt
modified trunk/ctp2_data/spanish/gamedata/ldl_str.txt

Cleaned up the clutter in the advanced options window by removing options already present in other windows.

modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/ui/interface/ProfileEdit.cpp

Fixed debug AI button in scenario editor.

modified trunk/ctp2_code/ui/interface/scenarioeditor.cpp
modified trunk/ctp2_code/ui/interface/scenarioeditor.h
modified trunk/ctp2_data/english/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/french/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/german/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/italian/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/scenarioeditor.ldl
modified trunk/ctp2_data/english/gamedata/add_str.txt
modified trunk/ctp2_data/french/gamedata/add_str.txt
modified trunk/ctp2_data/german/gamedata/add_str.txt
modified trunk/ctp2_data/italian/gamedata/add_str.txt
modified trunk/ctp2_data/japanese/gamedata/add_str.txt
modified trunk/ctp2_data/spanish/gamedata/add_str.txt

[ctplinuxfan]

Revision 966 (branches/linux)

ctp2_code/os/autoconf/win32_directx.m4
ctp2_code/os/autoconf/win32_dxmedia.m4
- removed executable bit from m4 files

configure.ac
ctp2_code/os/autoconf/Makefile.common
ctp2_code/os/autoconf/sdl_ffmpeg.m4
ctp2_code/ui/aui_common/aui_movie.cpp
- Added SDL_ffmpeg detection

ctp2_code/ctp/ctp2_utils/netconsole.cpp
ctp2_code/gs/fileio/prjfile.cpp
- unistd.h compile fix

Activision CTP2 Source Code_Readme.htm
Apolyton CTP2 Source Code_Readme.txt
Activision CTP2 Source Code_Readme.txt
bin/Unix2dos.exe
Makefile
templates/c
templates/cpp
templates/h
templates/cdb
*/*
- Merged from trunk

[Maquiladora]

Revision 967: Added custom start and end ages option to single-player.

Added start/end age into userprofile:

modified trunk/ctp2_code/gs/database/profileDB.cpp
modified trunk/ctp2_code/gs/database/profileDB.h

Added start/end age effects (same as in MP):

modified trunk/ctp2_code/gs/gameobj/Advances.cpp
modified trunk/ctp2_code/gs/gameobj/CityData.cpp
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Added start/end age stuff for use in single-player (perhaps a new "spagesscreen" should be created for further changes):

modified trunk/ctp2_code/ui/interface/agesscreen.cpp

Added "Ages" button:

modified trunk/ctp2_code/ui/interface/spnewgamerulesscreen.cpp
modified trunk/ctp2_code/ui/interface/spnewgamerulesscreen.h
modified trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/italian/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
modified trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl

Added setting up of start/end ages:

modified trunk/ctp2_code/ui/interface/spnewgamewindow.cpp

[ctplinuxfan]

Revision 968
- partial merge from linux branch

modified GNUmakefile.am
modified Makefile
modified autogen.sh
added configure.ac
modified configure.in
modified ctp2_code/ai/ctp2/ldl_strings.h
modified ctp2_code/ai/ctpai.h
modified ctp2_code/ai/ctpaidebug.h
modified ctp2_code/gfx/layers/citylayer.h
modified ctp2_code/gfx/tilesys/workmap.h
added ctp2_code/os/autoconf/Makefile.common
modified ctp2_code/os/autoconf/os_defs.m4
added ctp2_code/os/autoconf/sdl_ffmpeg.m4
modified ctp2_code/os/include/ctp2_config.h
modified ctp2_code/os/include/ctp2_inttypes.h
modified ctp2_code/os/include/noCOMBase.h
modified ctp2_code/os/linux/civctp2.kdevelop
modified ctp2_code/os/nowin32/windows.h
modified ctp2_code/sound/soundutils.h
modified ctp2_code/ui/aui_common/aui_base.cpp
modified ctp2_code/ui/aui_common/tech_memmap.cpp
modified ctp2_code/ui/aui_common/tech_memmap.h
modified ctp2_code/ui/aui_common/tech_memory.h
modified ctp2_code/ui/aui_common/tech_wllist.h
modified ctp2_code/ui/aui_sdl/aui_sdlkeyboard.cpp
modified doc/user/manual/Makefile
added tools
added tools/fix_data_names.sh

[ctplinuxfan]

Revision 969
- Added Makefiles from linux branch

modified configure.ac
modified ctp2_code/Makefile.am
modified ctp2_code/ctp/Makefile.am
added ctp2_code/gfx/Makefile.am
added ctp2_code/gfx/gfx_utils/Makefile.am
added ctp2_code/gfx/layers/Makefile.am
added ctp2_code/gfx/spritesys/Makefile.am
added ctp2_code/gfx/tilesys/Makefile.am
modified ctp2_code/gs/Makefile.am
added ctp2_code/gs/database/Makefile.am
modified ctp2_code/gs/dbgen/Makefile.am
added ctp2_code/gs/events/Makefile.am
added ctp2_code/gs/fileio/Makefile.am
added ctp2_code/gs/gameobj/Makefile.am
Sending ctp2_code/gs/newdb/Makefile.am
added ctp2_code/gs/outcom/Makefile.am
added ctp2_code/gs/slic/Makefile.am
added ctp2_code/gs/utility/Makefile.am
added ctp2_code/gs/world/Makefile.am
added ctp2_code/libs/Makefile.am
added ctp2_code/libs/anet/GNUmakefile.am
added ctp2_code/libs/anet/demo/GNUmakefile.am
added ctp2_code/libs/anet/demo/gtest/GNUmakefile.am
added ctp2_code/libs/anet/src/3rdparty/GNUmakefile.am
added ctp2_code/libs/anet/src/GNUmakefile.am
added ctp2_code/libs/anet/src/test/GNUmakefile.am
modified ctp2_code/mapgen/Makefile.am
added ctp2_code/os/Makefile.am
added ctp2_code/os/nowin32/Makefile.am
added ctp2_code/sound/Makefile.am
added ctp2_code/ui/Makefile.am
added ctp2_code/ui/interface/Makefile.am

[ctplinuxfan]

Revision 970
- gs/dbgen now uses the same generated lex/yacc filenames in Makefile.am
- gs/newdb: merged std::vector::iterator fix in CTPDatabase.cpp
- gs/outcom: fixed abstract class names (IUnknown)
- merged anet automake files from linux branch
- compiler warning fix for pointerlist.h
- added missing ctp2_code/os/nowin/nowin32.cpp
- added missing svn:ignore properties

modified .
modified ctp2_code
modified ctp2_code/ctp/ctp2_utils/pointerlist.h
modified ctp2_code/gfx
modified ctp2_code/gfx/gfx_utils
modified ctp2_code/gfx/layers
modified ctp2_code/gfx/spritesys
modified ctp2_code/gfx/tilesys
modified ctp2_code/gs/database
modified ctp2_code/gs/dbgen/Makefile.am
modified ctp2_code/gs/dbgen/ctpdb.y
modified ctp2_code/gs/events
modified ctp2_code/gs/fileio
modified ctp2_code/gs/gameobj
modified ctp2_code/gs/newdb/CTPDatabase.cpp
modified ctp2_code/gs/newdb/Makefile.am
modified ctp2_code/gs/outcom
modified ctp2_code/gs/outcom/IC3Rand.h
modified ctp2_code/gs/outcom/Ic3CivArchive.h
modified ctp2_code/gs/slic
modified ctp2_code/gs/utility
modified ctp2_code/gs/world
modified ctp2_code/libs
modified ctp2_code/libs/anet
modified ctp2_code/libs/anet/Makefile
added ctp2_code/libs/anet/README.modifications
added ctp2_code/libs/anet/configure.in
modified ctp2_code/libs/anet/demo
modified ctp2_code/libs/anet/h
added ctp2_code/libs/anet/macros
added ctp2_code/libs/anet/macros/anet_internal.m4
modified ctp2_code/libs/anet/src
modified ctp2_code/libs/anet/src/3rdparty
modified ctp2_code/libs/anet/src/test
modified ctp2_code/os
modified ctp2_code/os/nowin32
added ctp2_code/os/nowin32/nowin32.cpp
modified ctp2_code/sound
modified ctp2_code/ui
modified ctp2_code/ui/interface

[ctplinuxfan]

Revision 971
- Compile fixes for linux

added ctp2_code/gs/gameobj/UnitTypes.h
added ctp2_code/ui/interface/GreatLibraryTypes.h
- enum types from unit.h/greatlibrary.h due to forward definition
problems with gcc

ctp2_code/gs/database/StrDB.cpp:
- merged hashcode function from linux branch

modified configure.ac
modified ctp2_code/GameWatch/gamewatch/GWRecord.h
modified ctp2_code/ai/diplomacy/AgreementMatrix.h
modified ctp2_code/ai/diplomacy/Diplomat.h
modified ctp2_code/ai/diplomacy/Foreigner.h
modified ctp2_code/ai/mapanalysis/mapgrid.h
modified ctp2_code/ai/strategy/goals/Goal.h
modified ctp2_code/ai/strategy/scheduler/Scheduler.h
modified ctp2_code/gfx/spritesys/Action.h
modified ctp2_code/gs/database/DB.h
modified ctp2_code/gs/database/Makefile.am
modified ctp2_code/gs/database/StrDB.cpp
modified ctp2_code/gs/fileio/prjfile.h
modified ctp2_code/gs/gameobj/Army.h
modified ctp2_code/gs/gameobj/BldQue.h
modified ctp2_code/gs/gameobj/Happy.h
modified ctp2_code/gs/gameobj/MessagePool.h
modified ctp2_code/gs/gameobj/ObjPool.h
modified ctp2_code/gs/gameobj/Strengths.h
modified ctp2_code/gs/gameobj/TradeRoute.h
modified ctp2_code/gs/gameobj/Unit.h
modified ctp2_code/gs/gameobj/UnitData.h
added ctp2_code/gs/gameobj/UnitTypes.h
modified ctp2_code/gs/gameobj/message.h
modified ctp2_code/gs/gameobj/player.h
modified ctp2_code/gs/gameobj/pollution.h
modified ctp2_code/gs/slic/Makefile.am
modified ctp2_code/gs/slic/QuickSlic.cpp
modified ctp2_code/gs/slic/SlicContext.h
modified ctp2_code/gs/slic/SlicEngine.cpp
modified ctp2_code/gs/slic/SlicFrame.h
modified ctp2_code/gs/slic/SlicStack.cpp
modified ctp2_code/gs/slic/slic.l
modified ctp2_code/gs/utility/Globals.h
modified ctp2_code/gs/world/Cell.h
modified ctp2_code/os/nowin32/windows.h
modified ctp2_code/robot/aibackdoor/dynarr.h
modified ctp2_code/ui/interface/EndTurnButton.h
added ctp2_code/ui/interface/GreatLibraryTypes.h
modified ctp2_code/ui/interface/TurnYearStatus.h
modified ctp2_code/ui/interface/greatlibrary.h

[Maquiladora]

Revision 972

Stopped map auto-centering on moving stealth units that you can't see:

modified trunk/ctp2_code/gfx/spritesys/directorevent.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h

Elite medal icon now replaces veteran medal icon, rather than sitting below it:

modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp

Fixed expelling so if at least one unit on a tile cannot be expelled, then none from that tile can be:

modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h

[ctplinuxfan]

Revision 973
- added linux code for mmapped io

modified ctp2_code/gs/fileio/prjfile.h
modified ctp2_code/gs/fileio/prjfile.cpp

[Martin Gühmann]

Revision 974: Fixed a garrison problem with newly founded cities and relaxed the unit garrison settings for higher defense levels

Some cleanings:
modified trunk/ctp2_code/gs/gameobj/PlayerEvent.cpp
modified trunk/ctp2_code/gs/gameobj/CityData.cpp

Improved city garrison debug reporting:
modified trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp

New founded cities gets garrison units assigned on the same turn when they are founded if there is a unit inside the city:
modified trunk/ctp2_code/gs/gameobj/Player.cpp

Relaxed the unit garrison requirements for the higher defense levels:
modified trunk/ctp2_data/default/aidata/strategies.txt

[Maquiladora]

Revision 975:

Disabled cargo icon when an enemy transport is carrying only stealth units:

modified trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
modified trunk/ctp2_code/gs/gameobj/ArmyData.h

Fixed bug where your unit or city would not deselect when you clicked on an enemy unit or city (useful bug for finding stealth units, or units in fog):

modified trunk/ctp2_code/ui/aui_ctp2/SelItemClick.cpp

[ctplinuxfan]

Revision 976
- linux compilation fixes

modified ctp2_code/ai/CityManagement/governor.h
modified ctp2_code/gs/gameobj/Happy.cpp
modified ctp2_code/gs/gameobj/Makefile.am
modified ctp2_code/gs/gameobj/Player.cpp
modified ctp2_code/gs/gameobj/TerrImprovePool.cpp
modified ctp2_code/gs/gameobj/unitevent.cpp
modified ctp2_code/gs/gameobj/unitutil.cpp
modified ctp2_code/ui/aui_utils/primitives.h
modified ctp2_code/ui/interface/armymanagerwindow.h