Wanne 05fdcb5d2e Merged from revision: 7363 ...

- Map Editor now properly handles all available items without empty placeholders in between (by anv)
- Added item compare popup help text (by Buggler)
- Enemy icons will not be shown as 10x icons in 640x480 due to visibility issues (the rest remains as it is) (by Buggler)

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

2014-07-26 13:07:32 +00:00

..

AI Viewer.cpp

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Assignments.cpp

Merged from revision: 7344

2014-07-19 13:48:27 +00:00

Assignments.h

- When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer.

2014-07-10 21:19:26 +00:00

Auto Resolve.cpp

Merged from revision: 7344

2014-07-19 13:48:27 +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

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +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

- When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer.

2014-07-10 21:19:26 +00:00

Creature Spreading.cpp

Externalizations (by Buggler)

2014-01-06 15:35:52 +00:00

Creature Spreading.h

- Externalized creature feeding sector CREPITUS_FEEDING_SECTOR (by Buggler)

2014-01-02 07:42:24 +00:00

Facilities.cpp

Merged from revision: 7199

2014-05-11 05:58:07 +00:00

Facilities.h

Merged from revision: 7199

2014-05-11 05:58:07 +00:00

Game Clock.cpp

Bugfix for game clock mouse region in map screen (by Moa)

2013-09-25 06:47:17 +00:00

Game Clock.h

Game clock improvements (by Moa)

2013-08-25 13:38:21 +00:00

Game Event Hook.cpp

New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.

2014-02-18 21:26:46 +00:00

Game Event Hook.h

New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.

2014-02-18 21:26:46 +00:00

Game Events.cpp

Helicopter features (by anv):

2013-12-19 22:01:44 +00:00

Game Events.h

Merged New Inventory Project into main branch

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

Game Init.cpp

- New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.

2014-05-01 13:28:33 +00:00

Game Init.h

- New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.

2014-05-01 13:28:33 +00:00

Hourly Update.cpp

New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player.

2014-06-27 22:12:29 +00:00

Ja25 Strategic Ai.cpp

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Ja25 Strategic Ai.h

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Luaglobal.cpp

Externalized (by Buggler)

2013-10-14 11:57:08 +00:00

Luaglobal.h

New Lua Externalization (Quests.lua) (by Jazz)

2013-06-19 11:19:57 +00:00

LuaInitNPCs.cpp

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

LuaInitNPCs.h

- New Externalization: Externalized the used music to an OPTIONAL "Scripts\Music.lua" file (by Jazz)

2013-08-20 07:15:30 +00:00

Map Screen Helicopter.cpp

Merged revision(s) 7166-7177 from branches/ja2_source_official_2014:

2014-04-30 21:36:18 +00:00

Map Screen Helicopter.h

increased possible number of helicopter refuel sites from 2 to 30

2014-05-18 16:05:12 +00:00

Map Screen Interface Border.cpp

Merged from revision: 7344

2014-07-19 13:48:27 +00:00

Map Screen Interface Border.h

Code Cleanup (by Buggler)

2013-12-22 02:58:17 +00:00

Map Screen Interface Bottom.cpp

New Feature: 2 new Iron Man game modes (by anv)

2014-04-27 16:16:14 +00:00

Map Screen Interface Bottom.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

Map Screen Interface Map Inventory.cpp

Merged from revision: 7363

2014-07-26 13:07:32 +00:00

Map Screen Interface Map Inventory.h

Merged from revision: 7123

2014-03-28 20:20:47 +00:00

Map Screen Interface Map.cpp

Merged from revision: 7363

2014-07-26 13:07:32 +00:00

Map Screen Interface Map.h

New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.

2014-02-18 21:26:46 +00:00

Map Screen Interface TownMine Info.cpp

- When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer.

2014-07-10 21:19:26 +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 from revision: 7344

2014-07-19 13:48:27 +00:00

Map Screen Interface.h

Merged from revision: 7344

2014-07-19 13:48:27 +00:00

MapScreen Quotes.cpp

- UB Improvements / Cleanup (by Jazz)

2013-08-28 17:06:43 +00:00

MapScreen Quotes.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

mapscreen.cpp

Merged from revision: 7350

2014-07-21 18:07:47 +00:00

mapscreen.h

Merged from revision: 7134

2014-04-06 14:43:48 +00:00

Meanwhile.cpp

Merged from revision: 7065

2014-03-14 17:05:35 +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 from revision: 7344

2014-07-19 13:48:27 +00:00

Merc Contract.h

New Trait: Snitch (Trait 22) (by anv)

2014-01-01 12:02:23 +00:00

MilitiaSquads.cpp

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

MilitiaSquads.h

New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.

2014-02-18 21:26:46 +00:00

Player Command.cpp

- Fixed compilation error for JA2UB define (by anv)

2013-12-28 18:27:09 +00:00

Player Command.h

*************************

2010-02-20 15:49:46 +00:00

PreBattle Interface.cpp

Merged from revision: 7344

2014-07-19 13:48:27 +00:00

PreBattle Interface.h

Merged New Inventory Project into main branch

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

Queen Command.cpp

Added icons for enemy tanks in strategic map.

2014-07-07 21:59:47 +00:00

Queen Command.h

Added icons for enemy tanks in strategic map.

2014-07-07 21:59:47 +00:00

Quest Debug System.cpp

Merged from revision: 7114

2014-03-24 20:08:42 +00:00

Quest Debug System.h

**********************************************************

2010-02-28 18:38:52 +00:00

Quests.cpp

Merged from revision: 7262

2014-06-03 18:42:29 +00:00

Quests.h

Merged from revision: 7262

2014-06-03 18:42:29 +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

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Reinforcement.h

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Scheduling.cpp

cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman)

2013-05-27 21:01:04 +00:00

Scheduling.h

**********************************************************

2010-02-28 18:38:52 +00:00

Strategic AI.cpp

New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player.

2014-06-27 22:12:29 +00:00

Strategic AI.h

**********************************************************

2010-02-28 18:38:52 +00:00

Strategic All.h

Merged New Inventory Project into main branch

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

Strategic Event Handler.cpp

- Fixed compilation error for JA2UB define (by anv)

2013-12-28 18:27:09 +00:00

Strategic Event Handler.h

- Externalized Kingpin money sector and Hospital sector (by Buggler)

2013-09-20 08:19:56 +00:00

Strategic Merc Handler.cpp

New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player.

2014-06-27 22:12:29 +00:00

Strategic Merc Handler.h

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

Strategic Mines LUA.cpp

************************************************************

2011-01-18 09:11:09 +00:00

Strategic Mines LUA.h

************************************************************

2011-01-18 09:11:09 +00:00

Strategic Mines.cpp

Merged from revision: 7267

2014-06-05 14:37:32 +00:00

Strategic Mines.h

************************************************************

2011-01-18 09:11:09 +00:00

Strategic Movement Costs.cpp

MERGED source code from development trunk revision 4545 up to latest current revision 4882

2012-01-18 11:19:01 +00:00

Strategic Movement.cpp

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Strategic Movement.h

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Strategic Pathing.cpp

significantly cleaned up includes (by IoP)

2013-05-02 22:42:08 +00:00

Strategic Pathing.h

Merged New Inventory Project into main branch

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

Strategic Status.cpp

- New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.

2014-05-01 13:28:33 +00:00

Strategic Status.h

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

Strategic Town Loyalty.cpp

New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player.

2014-06-27 22:12:29 +00:00

Strategic Town Loyalty.h

- Prisoners of war are now spawned in prison sectors. They have fitting dialogue etc. Harming them slightly lowers global loyalty.

2013-03-05 01:02:59 +00:00

strategic town reputation.cpp

************************************************************

2011-01-18 09:11:09 +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

Improve loading speed of stash (by Moa)

2013-09-23 06:59:29 +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_VS2005.vcproj

Creatures Externalizations (by Buggler)

2014-01-01 12:41:16 +00:00

Strategic_VS2008.vcproj

Creatures Externalizations (by Buggler)

2014-01-01 12:41:16 +00:00

Strategic_VS2010.vcxproj

Creatures Externalizations (by Buggler)

2014-01-01 12:41:16 +00:00

Strategic_VS2010.vcxproj.filters

Creatures Externalizations (by Buggler)

2014-01-01 12:41:16 +00:00

Strategic_VS2013.vcxproj

Creatures Externalizations (by Buggler)

2014-01-01 12:41:16 +00:00

Strategic_VS2013.vcxproj.filters

Creatures Externalizations (by Buggler)

2014-01-01 12:41:16 +00:00

strategic.cpp

New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.

2014-02-18 21:26:46 +00:00

strategic.h

- New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior.

2014-05-01 13:28:33 +00:00

strategicmap.cpp

- When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer.

2014-07-10 21:19:26 +00:00

strategicmap.h

- externalized samsite coordinates concerning strategic AI action and Skyrider dialogue (by Buggler)

2013-09-17 14:44:55 +00:00

Town Militia.cpp

Merged from revision: 7199

2014-05-11 05:58:07 +00:00

Town Militia.h

************************************************************

2011-01-18 09:11:09 +00:00

UndergroundInit.cpp

Moving Tanks Feature (by anv)

2014-06-18 18:10:07 +00:00

UndergroundInit.h

************************************************************

2011-01-18 09:11:09 +00:00

XML_Army.cpp

Merged New Inventory Project into main branch

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

XML_Bloodcats.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_CoolnessBySector.cpp

Forgot to commit the source changes in the last commit. Sorry. So, here they are.

2013-04-14 15:54:56 +00:00

XML_Creatures.cpp

Merged from revision: 7270

2014-06-10 19:41:04 +00:00

XML_DynamicRestrictions.cpp

************************************************************

2011-01-18 09:11:09 +00:00

XML_ExtraItems.cpp

Brief: //dnl ch75

2013-11-03 16:26:30 +00:00

XML_Facilities.cpp

*************************

2010-02-20 15:49:46 +00:00

XML_FacilityTypes.cpp

Merged from revision: 7197

2014-05-08 18:48:42 +00:00

XML_Minerals.cpp

New Feature: Different Mineral Types for Mines (by Jazz & Buggler)

2013-11-12 09:58:18 +00:00

XML_Roaming.cpp

**********************************************************

2010-02-28 18:38:52 +00:00

XML_SectorNames.cpp

New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.

2013-10-30 23:05:37 +00:00

XML_SquadNames.cpp

- externalised squad names

2013-02-25 22:25:45 +00:00

XML_UniformColors.cpp

************************************************************

2011-01-18 09:11:09 +00:00