Wanne 8fa1c2a4e6 Merged Multiplayer UI patch from Zathras: ...

New Features
- Added hits, misses, accuracy to scoreboard
- Added in-game chat with history
- Added more options from the ini to the host screen, Use NIV and Enable
civillians
bugfixes
- Clients connecting at the same time controlling the wrong client
- Team Deathmatch working again
- Refreshing the player list after a player changes team / edge
- AI is always on for Co-op now
- There is now always a scoreboard in Co-op even when you lose.
- scores on the Co-op scoreboard have been fixed for all deaths including
bleeding
- Start Game button now only appears for server
- Fixed cleaning up game resources on disconnection
- Disabled the 1,2,3,4 keys for connecting / disconnecting
- Fixed victory conditions for all game modes
- Fixed players names getting copied into TeamTurnString each game resulting
in multiple names
- Fixed Assertion bug caused by the game sometimes calling
SetCurrentWorldSector more than once before placement of mercs
- Fixed a bug that was possible when merging items such as M14 and EBR stock
on mapscreen.
- Fixed bug with game starting while a player was in chat, closes chat
window when game is starting
- Fixed bug with game starting while a player was in the options screen, if
the player leaves the mapscreen while ready, they are set to unready
- Team and Spawn direction popups changed to use buttons to open/close them
- Disabled players joining after the laptop has been unlocked, as they would
be out of state with any hires


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

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

..

Action Items.h

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

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

Air Raid.cpp

Merged New Inventory Project into main branch

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

Air Raid.h

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

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

Animation Cache.cpp

Merged New Inventory Project into main branch

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

Animation Cache.h

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

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

Animation Control.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

Animation Control.h

100AP project integration

2008-11-06 00:46:54 +00:00

Animation Data.cpp

Merged New Inventory Project into main branch

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

Animation Data.h

Merged New Inventory Project into main branch

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

Arms Dealer Init.cpp

Fix for Bug#99

2008-05-16 17:25:46 +00:00

Arms Dealer Init.h

Merged New Inventory Project into main branch

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

ArmsDealerInvInit.cpp

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

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

ArmsDealerInvInit.h

Merged New Inventory Project into main branch

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

AStarPathfinder.cpp

Fixes for VS2003

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

AStarPathfinder.h

Merged New Inventory Project into main branch

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

Auto Bandage.cpp

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

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

Auto Bandage.h

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

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

BinaryHeap.hpp

Fixed appearance of save game corruption when a game with different inventory set is loaded. Note that such games can still cause odd behavior and CTD's

2007-10-20 08:09:03 +00:00

Boxing.cpp

Merged New Inventory Project into main branch

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

Boxing.h

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

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

bullets.cpp

* fixed bullet artifacts and removal !

2008-05-16 08:36:19 +00:00

Bullets.h

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Campaign.cpp

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

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

Campaign.h

Merged New Inventory Project into main branch

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

Civ Quotes.cpp

- Added Chinese language support (thx to Noword from TBS)

2008-11-20 07:43:57 +00:00

Civ Quotes.h

New attack busy system

2007-06-09 09:01:04 +00:00

Dialogue Control.cpp

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

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

Dialogue Control.h

Merged New Inventory Project into main branch

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

DisplayCover.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

DisplayCover.h

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

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

Drugs And Alcohol.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

Drugs And Alcohol.h

100AP project integration

2008-11-06 00:46:54 +00:00

End Game.cpp

Merged New Inventory Project into main branch

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

End Game.h

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

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

Enemy Soldier Save.cpp

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

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

Enemy Soldier Save.h

Merged New Inventory Project into main branch

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

EnemyItemDrops.cpp

Merged New Inventory Project into main branch

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

EnemyItemDrops.h

- added a militia drop rate to the xml-drop files.obj

2006-08-26 12:28:27 +00:00

Faces.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

faces.h

100AP project integration

2008-11-06 00:46:54 +00:00

fov.cpp

Merged New Inventory Project into main branch

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

fov.h

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

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

GAP.cpp

Merged New Inventory Project into main branch

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

GAP.H

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

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

Handle Doors.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

Handle Doors.h

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

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

Handle Items.cpp

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

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

Handle Items.h

Merged New Inventory Project into main branch

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

Handle UI Plan.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

Handle UI Plan.h

Merged New Inventory Project into main branch

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

Handle UI.cpp

Updates / Fixes by Arynn

2009-02-28 09:16:25 +00:00

Handle UI.h

Merged New Inventory Project into main branch

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

Interface Control.cpp

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

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

Interface Control.h

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

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

Interface Cursors.cpp

Merged New Inventory Project into main branch

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

Interface Cursors.h

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

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

Interface Dialogue.cpp

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

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

interface Dialogue.h

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

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

Interface Enhanced.cpp

Externalized Chinese specific (unicode) texts to _ChineseText.cpp and saved the Unicode files back to ASCII (thx to Kriplo)

2009-02-03 19:19:33 +00:00

Interface Enhanced.h

Enhanced Description Box, v1.3. By Headrock

2008-11-13 01:11:59 +00:00

Interface Items.cpp

Fix was lot by merging

2009-03-02 16:07:48 +00:00

Interface Items.h

Merged the two parts of RenderItemDescriptionBox function (strategic and tactical) into a single function. Now any change automatically effects both version of the box.

2008-12-04 22:00:29 +00:00

Interface Panels.cpp

Fix from Heinz:

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

Interface Panels.h

Bugfix: Corrected the shopkeeper interface so that the clock and town strings are displayed in the correct location.

2009-01-08 16:41:34 +00:00

Interface Utils.cpp

Merged New Inventory Project into main branch

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

Interface Utils.h

Merged New Inventory Project into main branch

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

Interface.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

Interface.h

Merged New Inventory Project into main branch

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

Inventory Choosing.cpp

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

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

Inventory Choosing.h

Merged New Inventory Project into main branch

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

Item Types.cpp

Added a condition which should stop the blue asterisk from appearing on an item unless that item is of item class IC_LBEGEAR.

2009-03-12 18:16:26 +00:00

Item Types.h

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Items.cpp

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

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

Items.h

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

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

Keys.cpp

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

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

Keys.h

Merged New Inventory Project into main branch

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

LOS.cpp

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

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

LOS.h

Merged New Inventory Project into main branch

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

Map Information.cpp

Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE.

2008-09-11 14:57:12 +00:00

Map Information.h

Merged New Inventory Project into main branch

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

Merc Entering.cpp

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

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

merc entering.h

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

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

Merc Hiring.cpp

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

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

Merc Hiring.h

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

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

Militia Control.cpp

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

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

Militia Control.h

Editor: Disable light sprites that are not in bounds. Actually happens in some sectors (ie Drassen)

2007-08-01 08:58:34 +00:00

Morale.cpp

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

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

Morale.h

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

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

opplist.cpp

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

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

opplist.h

Merged New Inventory Project into main branch

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

Overhead Types.h

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

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

Overhead.cpp

Merged Multiplayer UI patch from Zathras:

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

Overhead.h

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

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

PATHAI.cpp

Fix movement cost problems in 100AP. Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use.

2009-03-09 23:14:43 +00:00

PATHAI.H

100AP project integration

2008-11-06 00:46:54 +00:00

PathAIDebug.h

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

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

Points.cpp

Fix movement cost problems in 100AP. Externalized the movement cost modifiers and changed the run modifier from a divisor to a flat modifier like other forms of movement use.

2009-03-09 23:14:43 +00:00

Points.h

100AP project integration

2008-11-06 00:46:54 +00:00

QARRAY.cpp

Merged New Inventory Project into main branch

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

qarray.h

New attack busy system

2007-06-09 09:01:04 +00:00

Rain.cpp

Merged New Inventory Project into main branch

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

Rain.h

Fixed appearance of save game corruption when a game with different inventory set is loaded. Note that such games can still cause odd behavior and CTD's

2007-10-20 08:09:03 +00:00

Real Time Input.cpp

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

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

Rotting Corpses.cpp

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

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

Rotting Corpses.h

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

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

rt time defines.h

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

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

ShopKeeper Interface.cpp

Fix from Heinz:

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

ShopKeeper Interface.h

Merged New Inventory Project into main branch

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

ShopKeeper Quotes.h

Merged New Inventory Project into main branch

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

SkillCheck.cpp

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

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

SkillCheck.h

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

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

Soldier Add.cpp

Quickfix: New option "Force turn mode" is always disabled when playing a multiplayer game

2009-03-14 16:32:44 +00:00

Soldier Add.h

Merged New Inventory Project into main branch

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

Soldier Ani.cpp

Merged Multiplayer UI patch from Zathras:

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

Soldier Ani.h

Fixed buffer overrun for LUA strings

2007-09-11 11:19:03 +00:00

Soldier Control.cpp

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

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

Soldier Control.h

100AP project integration

2008-11-06 00:46:54 +00:00

Soldier Create.cpp

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

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

Soldier Create.h

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

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

Soldier Find.cpp

Merged New Inventory Project into main branch

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

Soldier Find.h

Merged New Inventory Project into main branch

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

Soldier Functions.h

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

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

Soldier Init List.cpp

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

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

Soldier Init List.h

Merged New Inventory Project into main branch

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

Soldier macros.h

Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit.

2008-08-12 17:09:29 +00:00

soldier profile type.h

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

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

Soldier Profile.cpp

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

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

Soldier Profile.h

Merged New Inventory Project into main branch

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

Soldier Tile.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

soldier tile.h

Merged New Inventory Project into main branch

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

SoldierTooltips.cpp

Merged New Inventory Project into main branch

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

Spread Burst.cpp

Merged New Inventory Project into main branch

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

Spread burst.h

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

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

Squads.cpp

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

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

Squads.h

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

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

Strategic Exit GUI.cpp

Merged New Inventory Project into main branch

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

Strategic Exit GUI.h

Merged New Inventory Project into main branch

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

Structure Wrap.cpp

Merged New Inventory Project into main branch

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

Structure Wrap.h

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

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

Tactical All.h

Merged New Inventory Project into main branch

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

Tactical Save.cpp

Merged New Inventory Project into main branch

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

Tactical Save.h

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

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

Tactical Turns.cpp

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

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

Tactical Turns.h

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

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

Tactical_2005Express.vcproj

Enhanced Description Box, v1.3. By Headrock

2008-11-13 01:11:59 +00:00

Tactical_VS2008.vcproj

VS 2008 project files update

2008-12-12 20:21:32 +00:00

Tactical.dep

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

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

Tactical.dsp

Adding VC6 compatibility

2006-09-23 19:42:41 +00:00

Tactical.mak

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

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

Tactical.vcproj

Fixes for VS2003

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

TeamTurns.cpp

Merged Multiplayer UI patch from Zathras:

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

TeamTurns.h

Merged Multi Player Project into main branch

2008-05-12 08:20:47 +00:00

Turn Based Input.cpp

Merged Multiplayer UI patch from Zathras:

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

UI Cursors.cpp

Merged New Inventory Project into main branch

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

UI Cursors.h

Merged New Inventory Project into main branch

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

Vehicles.cpp

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

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

Vehicles.h

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

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

Weapons.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

Weapons.h

100AP project integration

2008-11-06 00:46:54 +00:00

World Items.cpp

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

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

World Items.h

Merged New Inventory Project into main branch

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

XML_AmmoStrings.cpp

Merged New Inventory Project into main branch

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

XML_AmmoTypes.cpp

Merged New Inventory Project into main branch

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

XML_Armour.cpp

Merged New Inventory Project into main branch

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

XML_AttachmentInfo.cpp

Merged New Inventory Project into main branch

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

XML_Attachments.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

XML_BurstSounds.cpp

Merged New Inventory Project into main branch

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

XML_ComboMergeInfo.cpp

Merged New Inventory Project into main branch

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

XML_CompatibleFaceItems.cpp

Merged New Inventory Project into main branch

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

XML_EnemyAmmoDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyArmourDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyExplosiveDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyItemChoice.cpp

Merged New Inventory Project into main branch

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

XML_EnemyMiscDrops.cpp

Merged New Inventory Project into main branch

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

XML_EnemyWeaponChoice.cpp

Merged New Inventory Project into main branch

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

XML_EnemyWeaponDrops.cpp

Merged New Inventory Project into main branch

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

XML_Explosive.cpp

Merged New Inventory Project into main branch

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

XML_IMPItemChoices.cpp

Merged New Inventory Project into main branch

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

XML_IncompatibleAttachments.cpp

Merged New Inventory Project into main branch

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

XML_Launchable.cpp

Merged New Inventory Project into main branch

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

XML_LBEPocket.cpp

Setup failsafe to block NIV Mode if "Data" is specified as the CUSTOM_DATA_LOCATION.

2008-03-31 19:02:34 +00:00

XML_LoadBearingEquipment.cpp

Merged New Inventory Project into main branch

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

XML_Magazine.cpp

Merged New Inventory Project into main branch

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

XML_MercStartingGear.cpp

Merged New Inventory Project into main branch

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

XML_Merge.cpp

100AP project integration

2008-11-06 00:46:54 +00:00

XML_SectorLoadscreens.cpp

Merged New Inventory Project into main branch

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

XML_Sounds.cpp

Merged New Inventory Project into main branch

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

XML_TonyInventory.cpp

Merged New Inventory Project into main branch

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

XML.h

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

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