Wanne 0e078dd386 * Merged Source Code from MP branch Revision 3025 * ...

- Shipment Bugfix: Stop time compression when shipment and email arrives
- Shipment Bugfix: Fixed duplication of items from shipment. This bug occured, when loading a savegame with at least 2 depending shipment orders



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@3036 3b4a5df2-a311-0410-b5c6-a8a6f20db521

2009-06-26 16:18:05 +00:00

..

AI Viewer.cpp

Bugfix: No we have the working "AI Viewer". The needed files are already in SVN GameDir.

2009-02-10 19:10:37 +00:00

Assignments.cpp

- Bugfix: Need for soldier sleep was calculated wrong (fix by Headrock)

2009-06-22 11:35:46 +00:00

Assignments.h

Added Headrock's HAM 2.8

2009-04-01 12:20:30 +00:00

Auto Resolve.cpp

Added Headrock's HAM 2.8

2009-04-01 12:20:30 +00:00

Auto Resolve.h

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Campaign Init.cpp

- Fixed compilation errors in VS 2005

2009-06-10 10:13:02 +00:00

Campaign Init.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Campaign Types.h

Add "USE_AGGRESSIVE_ASSERTIONS" define

2009-03-28 00:13:12 +00:00

Creature Spreading.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Creature Spreading.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Clock.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Game Clock.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Event Hook.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Game Event Hook.h

- Added Dealtar's and Zilpin's Airport Externalization

2009-04-21 20:27:56 +00:00

Game Events.cpp

- Added Dealtar's and Zilpin's Airport Externalization

2009-04-21 20:27:56 +00:00

Game Events.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Game Init.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Game Init.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Hourly Update.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Map Screen Helicopter.cpp

- Bugfix: Stop Time when Skyrider arrives in the destination sector (fix by Headrock)

2009-06-22 19:39:44 +00:00

Map Screen Helicopter.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Border.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Border.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Bottom.cpp

Bugfix: Problems with refreshing fast help text in mapscreen (by jones bearpit)

2009-05-07 20:07:22 +00:00

Map Screen Interface Bottom.h

Merged Multiplayer UI patch from Zathras:

2009-03-19 15:31:55 +00:00

Map Screen Interface Map Inventory.cpp

- Bugfix: On "sell all" also unreachable items were sold (fix by Headrock)

2009-06-25 18:20:08 +00:00

Map Screen Interface Map Inventory.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface Map.cpp

Bugfix: Problems with refreshing fast help text in mapscreen (by jones bearpit)

2009-05-07 20:07:22 +00:00

Map Screen Interface Map.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Map Screen Interface TownMine Info.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Map Screen Interface TownMine Info.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Map Screen Interface.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Map Screen Interface.h

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

mapscreen.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

mapscreen.h

Added Headrock's HAM 2.8

2009-04-01 12:20:30 +00:00

Meanwhile.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Meanwhile.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Merc Contract.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Merc Contract.h

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

MilitiaSquads.cpp

Fix problem with invalid X,Y coordinates

2009-04-27 23:50:45 +00:00

MilitiaSquads.h

Added Headrock's HAM 2.8

2009-04-01 12:20:30 +00:00

Player Command.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Player Command.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

PreBattle Interface.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

PreBattle Interface.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Queen Command.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Queen Command.h

Fix from Heinz:

2009-03-01 18:22:56 +00:00

Quest Debug System.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Quest Debug System.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Quests.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Quests.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

QuestText.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

QuestText.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Reinforcement.cpp

Fix from Heinz:

2009-03-01 18:22:56 +00:00

Reinforcement.h

Fix for mouse movement when clicking on mercs. In windowed mode would move the cursor to odd places on screen

2007-08-04 04:19:18 +00:00

Scheduling.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Scheduling.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic AI.cpp

*** Merged Code from Multiplayer Branch Revision 2993 ***

2009-06-09 11:40:08 +00:00

Strategic AI.h

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Strategic All.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Event Handler.cpp

* Merged Source Code from MP branch Revision 3025 *

2009-06-26 16:18:05 +00:00

Strategic Event Handler.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic Merc Handler.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Strategic Merc Handler.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Mines.cpp

Added Headrock's HAM 2.8

2009-04-01 12:20:30 +00:00

Strategic Mines.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Movement Costs.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Strategic Movement.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Strategic Movement.h

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

Strategic Pathing.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Pathing.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Status.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Status.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Town Loyalty.cpp

Added Headrock's HAM 2.8

2009-04-01 12:20:30 +00:00

Strategic Town Loyalty.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

strategic town reputation.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

strategic town reputation.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic Turns.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic Turns.h

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic_2005Express.vcproj

New Map Editor Release (Build: 2975)

2009-06-06 22:28:46 +00:00

Strategic_VS2008.vcproj

SpaceViking forgot to add a new CPP file to the Strategic Project. The game compiles now.

2009-01-15 22:56:34 +00:00

strategic.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic.dep

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic.dsp

- Added INI options for RESTRICT_ROAMING and REVEAL_ITEMS_AFTER_COMBAT

2007-04-25 22:45:10 +00:00

strategic.h

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

Strategic.mak

Original Source for 1.13 Mod High Resolution version from 12/06/05

2006-04-19 11:32:51 +00:00

Strategic.vcproj

Fixes for VS2003

2008-05-31 11:56:39 +00:00

strategicmap.cpp

- Fixed compilation errors in VS 2005

2009-06-10 10:13:02 +00:00

strategicmap.h

- Bugfix: CTD when enemies retreat (by Heinz)

2009-02-02 17:55:46 +00:00

Town Militia.cpp

*** Merged Code from Multiplayer Branch Revision 2960 ***

2009-06-04 21:01:45 +00:00

Town Militia.h

bug fixes from Overhaul:

2007-05-09 13:16:37 +00:00

XML_Army.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00

XML_ExtraItems.cpp

Space Viking's many mercs changes plus numerous generic bug fixes

2009-01-15 01:26:13 +00:00

XML_Roaming.cpp

Merged New Inventory Project into main branch

2008-03-08 15:15:25 +00:00