Announcement

Collapse
No announcement yet.

PROJECT: Revision Reports

Collapse
This topic is closed.
X
X
Collapse
 
  • Page of 35
  • Filter
  • Time
  • Show
Clear All
new posts
Previous 1 18 24 25 26 27 28 29 30 31 32 35 template Next
  • #406
    Revision 777: Restored ConstDB compatibility, fixed loading of the MP-Window and fixed the customized scenario year names

    Some cleaning:
    modified trunk/ctp2_code/ai/strategy/goals/ctpgoal.cpp
    modified trunk/ctp2_code/ai/strategy/scheduler/Plan.cpp
    modified trunk/ctp2_code/ai/strategy/scheduler/Plan.h
    modified trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
    modified trunk/ctp2_code/gs/slic/SlicBuiltin.cpp
    modified trunk/ctp2_code/ui/aui_common/tech_wllist.h
    modified trunk/ctp2_code/ui/interface/citywindow.cpp
    modified trunk/ctp2_code/ui/netshell/netshell.cpp
    modified trunk/ctp2_code/gs/gameobj/CityData.cpp
    modified trunk/ctp2_code/ui/interface/MainControlPanel.h
    modified trunk/ctp2_code/ui/interface/messagewindow.cpp

    Restored ConstDB compatibility:
    modified trunk/ctp2_code/gs/database/ConstDB.cpp

    Internet multi player window loads again. However I still cannot reach the MP lobby:
    modified trunk/ctp2_code/ui/aui_common/aui_shell.h

    Improved the design of the turn year override mechanism for scenarios and made it work:
    modified trunk/ctp2_code/ctp/civapp.cpp
    modified trunk/ctp2_code/gs/gameobj/Diffcly.cpp
    modified trunk/ctp2_code/ui/interface/loadsavescreen.cpp
    modified trunk/ctp2_code/ui/interface/loadsavewindow.cpp
    modified trunk/ctp2_code/ui/interface/MainControlPanel.cpp
    modified trunk/ctp2_code/ui/interface/spnewgamescreen.cpp
    modified trunk/ctp2_code/ui/interface/TurnYearStatus.cpp
    modified trunk/ctp2_code/ui/interface/TurnYearStatus.h
    Civ2 military advisor: "No complaints, Sir!"

    Comment

    • #407
      Revision 779: Preparations for Const database replacement by new one. This is going to be a change of a lot of files, and I thought this was the work intensive part.

      Some cleanings:
      modified trunk/ctp2_code/ctp/civ3_main.cpp
      modified trunk/ctp2_code/gs/gameobj/GoodyHuts.cpp
      modified trunk/ctp2_code/gs/newdb/DBLexer.cpp
      modified trunk/ctp2_code/gs/world/WorldDistance.cpp
      modified trunk/ctp2_code/robot/pathing/astar.cpp
      modified trunk/ctp2_code/ui/interface/infowin.cpp

      Preparations for replacement of the Const database by new one:
      modified trunk/ctp2_code/ctp/civctp.dsp
      modified trunk/ctp2_code/gs/dbgen/ctpdb.cpp
      modified trunk/ctp2_code/gs/dbgen/ctpdb.h
      modified trunk/ctp2_code/gs/dbgen/ctpdb.l
      modified trunk/ctp2_code/gs/dbgen/ctpdb.y
      modified trunk/ctp2_code/gs/dbgen/RecordDescription.cpp
      modified trunk/ctp2_code/gs/dbgen/RecordDescription.h
      added trunk/ctp2_code/gs/newdb/Const.cdb
      modified trunk/ctp2_code/gs/newdb/DBTokens.h
      Civ2 military advisor: "No complaints, Sir!"

      Comment

      • #408
        Revision 780: Trivial merge from Linux branch: #ifdef guards for HAVE_PRAGMA_ONCE, USE_SDL, WIN32, etc. Whitespace changes.

        147 files in all, so I'm not going to list them here. They are all in ctp2_code/ui.
        Tea: there is nothing it cannot fix.

        Comment

        • #409
          Revision 783:

          Revert r781 - ctp2_code somehow got committed to the project root.

          Changed paths:
          D /trunk/CVS
          D /trunk/GameWatch
          D /trunk/ai
          D /trunk/ctp
          D /trunk/gfx
          D /trunk/gs
          D /trunk/libs
          D /trunk/mapgen
          D /trunk/net
          D /trunk/robot
          D /trunk/robotcom
          D /trunk/sound
          D /trunk/ui
          D /trunk/user-robotcom
          Tea: there is nothing it cannot fix.

          Comment

          • #410
            Revision 784

            scheduler/scheduler.cpp
            - added cajun arson's work around


            spritesys/UnitActor.cpp
            tilesys/tiledraw.cpp
            newdb/building.cdb
            newdb/wonder.cdb
            - Deleted ShowCityIcon from Building and Wonder DB replaced with new flags
            - added ShowCityIconTop Displays this icon on top of a city graphic
            - added ShowCityIconBottom Icon displayed under city graphic


            interface/spnewgametribescreen.cpp
            interface/spnewgametribescreen.h
            layouts/spnewgamepopups.ldl
            - made the civilization start screen a listbox, it works but its functionality has a few issues:
            1) barbarians are selectable (everytime I removed them in the forloop it threw off the index)
            2) adding a name in the tribe window popup wont show up on the start up screen (but you can add your name there)
            3) it appears that the profile save civ name isn't appearing on the start screen
            4) names are not sorted alphabetically

            updated readme

            U trunk/ctp2_code/ai/strategy/scheduler/scheduler.cpp
            U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
            U trunk/ctp2_code/gfx/tilesys/tiledmap.h
            U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
            U trunk/ctp2_code/gs/newdb/building.cdb
            U trunk/ctp2_code/gs/newdb/wonder.cdb
            U trunk/ctp2_code/ui/interface/spnewgametribescreen.cpp
            U trunk/ctp2_code/ui/interface/spnewgametribescreen.h
            U trunk/ctp2_data/english/uidata/layouts/spnewgamepopups.ldl
            U trunk/ctp2_data/french/uidata/layouts/spnewgamepopups.ldl
            U trunk/ctp2_data/german/uidata/layouts/spnewgamepopups.ldl
            U trunk/ctp2_data/japanese/uidata/layouts/spnewgamepopups.ldl
            U trunk/ctp2_data/spanish/uidata/layouts/spnewgamepopups.ldl
            U trunk/doc/user/playtest/Apolyton_README.txt

            Received on Wed Aug 1 02:23:42 2007
            Last edited by Ekmek; August 1, 2007, 17:32.
            Formerly known as "E" on Apolyton

            See me at Civfanatics.com

            Comment

            • #411
              Revision 785:
              Merge SDL changes from Linux branch - should not impact Windows build.
              Remove interface/spwindow.* which are apparently dead. This shouldn't break anything, but the Windows build scripts might need updating...

              Changed paths:
              M ctp2_code/ui/aui_sdl/aui_sdlsurface.h
              M ctp2_code/ui/aui_sdl/aui_sdljoystick.cpp
              M ctp2_code/ui/aui_sdl/aui_sdlkeyboard.cpp
              M ctp2_code/ui/aui_sdl/aui_sdlkeyboard.h
              AM ctp2_code/ui/aui_sdl/aui_sdlblitter.cpp
              AM ctp2_code/ui/aui_sdl/aui_sdlblitter.h
              M ctp2_code/ui/aui_sdl/aui_sdlui.cpp
              M ctp2_code/ui/aui_sdl/aui_sdl.cpp
              M ctp2_code/ui/aui_sdl/aui_sdlui.h
              M ctp2_code/ui/aui_sdl/aui_sdlsurface.cpp
              M ctp2_code/ui/aui_sdl/aui_sdlmouse.cpp
              D ctp2_code/ui/interface/spwindow.cpp
              D ctp2_code/ui/interface/spwindow.h
              Tea: there is nothing it cannot fix.

              Comment

              • #412
                Revision 786: Replaced old const database by new one:

                Some cleanings:
                modified trunk/ctp2_code/gs/gameobj/CityInfluenceIterator.cpp
                modified trunk/ctp2_code/gs/gameobj/Events.cpp
                modified trunk/ctp2_code/gs/gameobj/GoodyHuts.cpp
                modified trunk/ctp2_code/gs/gameobj/TradeRouteData.cpp
                modified trunk/ctp2_code/gs/world/WorldDistance.cpp
                modified trunk/ctp2_code/robot/pathing/astar.cpp
                modified trunk/ctp2_code/robot/pathing/unitastar.cpp

                Replaced old const database by new one:
                modified trunk/ctp2_code/ai/CityManagement/governor.cpp
                modified trunk/ctp2_code/ai/ctpai.cpp
                modified trunk/ctp2_code/ctp/civapp.cpp
                modified trunk/ctp2_code/ctp/civctp.dsp
                modified trunk/ctp2_code/ctp/ctp2_utils/c3cmdline.cpp
                modified trunk/ctp2_code/gs/fileio/GameFile.cpp
                modified trunk/ctp2_code/gs/gameobj/Advances.cpp
                modified trunk/ctp2_code/gs/gameobj/AgreementData.cpp
                modified trunk/ctp2_code/gs/gameobj/ArmyData.cpp
                modified trunk/ctp2_code/gs/gameobj/armyevent.cpp
                modified trunk/ctp2_code/gs/gameobj/bldque.cpp
                modified trunk/ctp2_code/gs/gameobj/CityData.cpp
                modified trunk/ctp2_code/gs/gameobj/CityEvent.cpp
                modified trunk/ctp2_code/gs/gameobj/CTP2Combat.h
                modified trunk/ctp2_code/gs/gameobj/Gold.cpp
                modified trunk/ctp2_code/gs/gameobj/Happy.cpp
                modified trunk/ctp2_code/gs/gameobj/MaterialPool.cpp
                modified trunk/ctp2_code/gs/gameobj/Player.cpp
                modified trunk/ctp2_code/gs/gameobj/PlayHap.cpp
                modified trunk/ctp2_code/gs/gameobj/Pollution.cpp
                modified trunk/ctp2_code/gs/gameobj/terrainutil.cpp
                modified trunk/ctp2_code/gs/gameobj/tradeutil.cpp
                modified trunk/ctp2_code/gs/gameobj/tradeutil.h
                modified trunk/ctp2_code/gs/gameobj/Unit.cpp
                modified trunk/ctp2_code/gs/gameobj/UnitData.cpp
                modified trunk/ctp2_code/gs/gameobj/unitutil.cpp
                modified trunk/ctp2_code/gs/gameobj/Wormhole.cpp
                modified trunk/ctp2_code/gs/newdb/Const.cdb
                modified trunk/ctp2_code/gs/newdb/CTPDatabase.cpp
                modified trunk/ctp2_code/gs/slic/slicfunc.cpp
                modified trunk/ctp2_code/gs/utility/DataCheck.cpp
                modified trunk/ctp2_code/gs/utility/gameinit.cpp
                modified trunk/ctp2_code/gs/utility/newturncount.cpp
                modified trunk/ctp2_code/gs/utility/TurnCnt.cpp
                modified trunk/ctp2_code/gs/world/wldgen.cpp
                modified trunk/ctp2_code/gs/world/WrldPoll.cpp
                modified trunk/ctp2_code/net/general/net_crc.cpp
                modified trunk/ctp2_code/ui/interface/citywindow.cpp
                modified trunk/ctp2_code/ui/interface/controlpanelwindow.cpp
                modified trunk/ctp2_code/ui/interface/custommapscreen.cpp
                modified trunk/ctp2_code/ui/interface/NationalManagementDialog.cpp
                modified trunk/ctp2_code/ui/interface/scenarioeditor.cpp
                Civ2 military advisor: "No complaints, Sir!"

                Comment

                • #413
                  Revision 787

                  tilesys/tiledraw.cpp
                  - outcommented specialcityicon stuff until I added the unseencell bools

                  spnewgametribescreen.cpp
                  - fixed it so barbarians are not displayed
                  - gender buttons update the leadername
                  - saved proile name is called to spnewgame screen
                  - only problem with it is that I cant make the leadername field update when you click on a tribe name

                  aidata/Goals.txt
                  aidata/strategies.txt
                  - added Protra's AI

                  civilisation.txt
                  civ_str.txt
                  concepticon.txt
                  upc068.tga
                  pakistanflag.tga
                  - added jamaica as a civ (because it was in ctp1)
                  - poland now has poland headers
                  - harappan now uses pakistan flags
                  - grek flag changed to easier to see 19th century greek flag

                  updated readme
                  Formerly known as "E" on Apolyton

                  See me at Civfanatics.com

                  Comment

                  • #414
                    Revision 788: Minor cleanups to remove some crud from the Linux diff. Whitespace, some #ifdef guarding. Removed ui/interface/spscreen.cpp, which is apparently no longer needed on voyage. Nothing here should break the Windows build.

                    --This line, and those below, will be ignored--

                    _M ctp2_code/ui/aui_sdl/aui_sdlblitter.h
                    M ctp2_code/ui/interface/creditsscreen.h
                    M ctp2_code/ui/interface/km_screen.cpp
                    M ctp2_code/ui/interface/infowin.cpp
                    M ctp2_code/ui/interface/greatlibrary.h
                    D ctp2_code/ui/interface/spscreen.cpp
                    M ctp2_code/ui/interface/IntroMovieWindow.h
                    M ctp2_code/ui/interface/progresswindow.h
                    M ctp2_code/ui/interface/NationalManagementDialog.h
                    M ctp2_code/ui/interface/infowindow.h
                    M ctp2_code/ui/interface/controlpanel.h
                    M ctp2_code/ui/interface/MainControlPanel.h
                    M ctp2_code/ui/aui_common/aui_stringtable.h
                    M ctp2_code/ui/aui_common/aui_window.h
                    M ctp2_code/ui/aui_ctp2/ctp2_textbuffer.h
                    M ctp2_code/ui/aui_ctp2/c3_button.h
                    M ctp2_code/ui/aui_ctp2/c3scroller.h
                    Tea: there is nothing it cannot fix.

                    Comment

                    • #415
                      Revision 789: Fix newline conventions, set svn properties.

                      MM ctp2_code/ui/interface/SpecialAttackWindow.cpp
                      MM ctp2_code/ui/interface/SpecialAttackWindow.h
                      Tea: there is nothing it cannot fix.

                      Comment

                      • #416
                        Revision 793

                        Fixed save game power graphs:
                        modified trunk/ctp2_code/ui/aui_ctp2/linegraph.cpp
                        Civ2 military advisor: "No complaints, Sir!"

                        Comment

                        • #417
                          Revision 794: Centralized linegraph functionality

                          Some Cleanings:
                          modified trunk/ctp2_code/gs/gameobj/player.h
                          modified trunk/ctp2_code/gs/utility/gstypes.h
                          modified trunk/ctp2_code/ui/interface/screenutils.cpp
                          modified trunk/ctp2_code/ui/interface/timelinetab.h

                          Moved some functionality of the linegraph into the appropiate files:
                          modified trunk/ctp2_code/ui/aui_ctp2/linegraph.cpp
                          modified trunk/ctp2_code/ui/aui_ctp2/linegraph.h
                          modified trunk/ctp2_code/ui/interface/loadsavewindow.cpp
                          modified trunk/ctp2_code/ui/interface/rankingtab.cpp
                          modified trunk/ctp2_code/ui/interface/rankingtab.h
                          modified trunk/ctp2_code/ui/interface/timelinetab.cpp
                          Civ2 military advisor: "No complaints, Sir!"

                          Comment

                          • #418
                            Revision 795: Fixed the automatic coast generation of the map editor

                            Some cleaning:
                            modified trunk/ctp2_code/gs/world/MapPoint.cpp

                            Fixed the automatic coast generation of the map editor:
                            modified trunk/ctp2_code/gfx/tilesys/tiledmap.cpp
                            modified trunk/ctp2_code/gs/world/wldgen.cpp
                            Last edited by Martin Gühmann; September 30, 2007, 19:12.
                            Civ2 military advisor: "No complaints, Sir!"

                            Comment

                            • #419
                              Revision 796

                              bin/Unix2Dos.exe
                              - added utility incase you(I) get a needline error

                              A trunk/bin/Unix2Dos.exe

                              revision 797
                              UnitActor.cpp
                              UnitActor.h
                              - Switch location of unit flags


                              Added a switch so religious units display the religion and not nationalflag world/World.h
                              Added to G_TheWorld IsWonder for point check
                              CityData.cpp
                              citydata.h
                              -Added MergeCivs code - but not implemented
                              -Fixed ShowOnMapTop code - unseencell etc


                              Added Code for CityExpansion and CitySlums
                              Added check for showonmap is cell has a wonder
                              newdb/*.cdb
                              - Added new cdbs: Leader, Culture, UnitPromotion


                              Outcomment ReligionRecord check to units, building and wonders
                              added IsUrban check to TerrainImprovement
                              added religion flags
                              terrainutil.cpp
                              terrainutil.h
                              - added terrainutil_CanPlayerSpecialBuildAt that uses an int instead of a rec


                              tiledraw.cpp
                              UnseenCell.cpp
                              UnseenCell.h
                              - fixed ShowOnTop graphic crash for cities


                              U trunk/ctp2_code/ctp/civctp.dsp
                              U trunk/ctp2_code/gfx/spritesys/UnitActor.cpp
                              U trunk/ctp2_code/gfx/spritesys/UnitActor.h
                              U trunk/ctp2_code/gfx/tilesys/tiledmap.h
                              U trunk/ctp2_code/gfx/tilesys/tiledraw.cpp
                              U trunk/ctp2_code/gs/gameobj/ArmyData.cpp
                              U trunk/ctp2_code/gs/gameobj/CityData.cpp
                              U trunk/ctp2_code/gs/gameobj/CityEvent.cpp
                              U trunk/ctp2_code/gs/gameobj/Player.cpp
                              U trunk/ctp2_code/gs/gameobj/buildingutil.cpp
                              U trunk/ctp2_code/gs/gameobj/buildingutil.h
                              U trunk/ctp2_code/gs/gameobj/citydata.h
                              U trunk/ctp2_code/gs/gameobj/player.h
                              U trunk/ctp2_code/gs/gameobj/terrainutil.cpp
                              U trunk/ctp2_code/gs/gameobj/terrainutil.h
                              U trunk/ctp2_code/gs/gameobj/wonderutil.cpp
                              U trunk/ctp2_code/gs/gameobj/wonderutil.h
                              U trunk/ctp2_code/gs/newdb/Civilisation.cdb
                              U trunk/ctp2_code/gs/newdb/Const.cdb
                              A trunk/ctp2_code/gs/newdb/Leader.cdb
                              U trunk/ctp2_code/gs/newdb/TerrainImprovement.cdb
                              U trunk/ctp2_code/gs/newdb/building.cdb
                              A trunk/ctp2_code/gs/newdb/culture.cdb
                              U trunk/ctp2_code/gs/newdb/unit.cdb
                              A trunk/ctp2_code/gs/newdb/unitpromotion.cdb
                              U trunk/ctp2_code/gs/newdb/wonder.cdb
                              U trunk/ctp2_code/gs/utility/gameinit.cpp
                              U trunk/ctp2_code/gs/world/UnseenCell.cpp
                              U trunk/ctp2_code/gs/world/UnseenCell.h
                              U trunk/ctp2_code/gs/world/World.h
                              U trunk/ctp2_code/gs/world/WrlEnv.cpp

                              revision 798
                              default/gamedata/civilisation.txt
                              [language]/gamedata/civ_str.txt
                              - Added Han, Yamato, Sumer, Kush, and Macedonia Civs from AoM


                              Added Lycian civ (cant beat rock tombs)
                              default/graphics/pictures/
                              - added "unique" religion building graphics


                              default/gamedata/buildings.txt
                              - added unique religion buildings but not available now and will have no bearing on gameplay


                              U trunk/ctp2_data/default/gamedata/Wonder.txt
                              U trunk/ctp2_data/default/gamedata/buildings.txt
                              U trunk/ctp2_data/default/gamedata/civilisation.txt
                              U trunk/ctp2_data/default/gamedata/concepticon.txt
                              U trunk/ctp2_data/default/gamedata/uniticon.txt
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Buddha.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Christian.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Egypt.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Greek.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Hindu.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Islam.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Judaism.tga
                              A trunk/ctp2_data/default/graphics/pictures/shrine-L-Zoroa.tga
                              U trunk/ctp2_data/english/gamedata/civ_str.txt
                              U trunk/ctp2_data/french/gamedata/civ_str.txt
                              U trunk/ctp2_data/german/gamedata/civ_str.txt
                              U trunk/ctp2_data/italian/gamedata/civ_str.txt
                              U trunk/ctp2_data/spanish/gamedata/civ_str.txt


                              something is wrong with my svn - can update and commit only subfolders of trunk, when i run the cleanup it says its finished but any time i try something on trunk it still gives the error
                              Formerly known as "E" on Apolyton

                              See me at Civfanatics.com

                              Comment

                              • #420
                                revision 799

                                I updated the sourcecode readme to include the /tmp folder that needs to be created

                                U trunk/CTP2 Source Code_Readme.txt
                                Formerly known as "E" on Apolyton

                                See me at Civfanatics.com

                                Comment

                                Previous 1 18 24 25 26 27 28 29 30 31 32 35 template Next
                                Working...
                                X