7623 Commits
Author SHA1 Message Date
Wanne 688ee04242 Changed default screen resolution to 1024x768
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-19 13:50:59 +00:00
Wanne 80b08d53d2 Merged from revision: 2073
Changed default screen resolution to 1024x768

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2074 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-19 13:50:25 +00:00
Wanne f086611d21 Merged from revision: 7344
Fixes (by Buggler)
- Centered strategic screen in non-standard resolutions
- Fixed message log disappearing when clicking map border buttons
- Minor fix for increased MAX_BUILDINGS limit 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-19 13:48:27 +00:00
Wanne 615c561dc1 Merged from revision: 7342
Fixes (by Buggler)
- Fixed roof issues for explored rooms in big maps not properly saved
- Increased MAX_CLIMBSPOTS_PER_BUILDING and MAX_BUILDINGS to 255

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-17 21:04:02 +00:00
Flugente 05cb329230 - Fix: Tanks take damage even when crushing down simple wooden fence. (by anv)
- dynamic opinion events no longer happen for non-player or vehicular characters
- renamed a flag

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-15 21:00:59 +00:00
Wanne 64bd7f3f07 Merged from revision: 7338
- Translated _ChineseText.cpp (by Jason Lejardo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-15 20:03:02 +00:00
Flugente e4c01d20ff Throwing knifes can get bloody again.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2071 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-14 21:02:12 +00:00
Flugente 24a78e5dc3 If <BloodiedItem> is set on a blade, the blade weapon wil be replaced with th specified item when a person is hit with it.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-14 20:55:26 +00:00
Wanne 0d8a159b72 Merged from revision: 2069
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2070 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-14 19:38:46 +00:00
Wanne 696e9ccdff Merged from revision: 7335
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-14 19:38:20 +00:00
Wanne db66e12e83 Merged from revision: 7333
- Added missing email merc availability texts (currently only English and French) for the new DG mercs (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-12 20:56:31 +00:00
Wanne 02cc79a3e5 Merged from revision: 2067
- Added missing email merc availability texts for the new DG mercs (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2068 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-12 20:55:29 +00:00
Wanne 3628b26e69 Merged from revision: 7331
- Fixed wrong translated French text (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-12 19:33:39 +00:00
Wanne 0a16af6fe2 Merged from revision: 7329
- Fixed Movement box and Militia Popup box x-coordinates in non-standard resolutions (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-12 10:10:13 +00:00
silversurfer 3aa6e6e200 New modifier for NCTH to alter the behaviour of the scope penalty:
- AIM_TOO_CLOSE_THRESHOLD = 0.8

This defines the point within scope range where the penalty starts.

http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334158/Re:_(Potential)_NCTH_Code_Chan#Post334158


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7328 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-11 15:22:37 +00:00
silversurfer 9d12563ca1 New modifier for NCTH to alter the behaviour of the scope penalty:
- AIM_TOO_CLOSE_THRESHOLD = 0.8

This defines the point within scope range where the penalty starts.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2066 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-11 15:17:40 +00:00
Flugente c3a4cb2cce - Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- prisoners now require less interrogation points, and mercs have less interrogation points

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2065 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-10 21:20:45 +00:00
Flugente 0efc3b7241 - 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.
- Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- various prisoner fixes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-10 21:19:26 +00:00
Wanne 7fb31cc9c8 Merged from revision: 7325
- Fixed too long text in French Map Editor texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-10 19:28:04 +00:00
Wanne 7691ca7602 Merged from revision: 7323
- Added HUGEFONT.STI (from English JA2 Fonts.slf) so we can run English Map Editor EXE on non English JA2 1.13 version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-10 19:24:43 +00:00
Flugente 3389f3fb24 Fix: overflow in EliminateAllEnemies(...) (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-08 23:12:26 +00:00
Wanne c20581039f Merged from revision: 7319
- Added support for multilanguage INTERFACE/ITEMINFOADVANCEDICONS.sti (e.g: GERMAN\ITEMINFOADVANCEDICONS_GERMAN.sti, FRENCH\ITEMINFOADVANCEDICONS_FRENCH.sti, ..

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-08 20:34:41 +00:00
Wanne 8ddeff6988 Merged from revision: 7318
- Added support for multilanguage INTERFACE/ITEMINFOADVANCEDICONS.sti (e.g: GERMAN\ITEMINFOADVANCEDICONS_GERMAN.sti, FRENCH\ITEMINFOADVANCEDICONS_FRENCH.sti, ...)
- Fixed compilation errors in GERMAN version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-08 20:32:42 +00:00
Wanne 06560df4b3 Merged from revision: 7316
- Fixed invalid XML for German.Items.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-08 20:19:03 +00:00
Flugente f52302527b Fix: settings appeared twice
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2064 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-08 20:01:35 +00:00
Flugente 2b63a5b568 Fix: mercs got opinion events on themselves.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-08 19:00:24 +00:00
Flugente c4c6895cef - Adjusted military headquarter description.
- Extended SquadNames.xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2063 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-08 18:58:43 +00:00
Flugente 2f1dcdaa47 Added icons for enemy tanks in strategic map.
Requires GameDir >= r2062.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-07 21:59:47 +00:00
Wanne 1736d546d6 Merged from revision: 7312
- Fixed compilation error in French MapEditor build

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-07 20:23:52 +00:00
Wanne 3954dc618f Merged from revision: 2060
- Added French translation to the INI Editor xml files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2061 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-07-07 19:38:54 +00:00
Wanne f66842fe9b - Added missing EDT files for French version (by hrvg)
- Translated xml files for French version (by hrvg)
- Added missing STI for French version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7310 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-07 19:33:57 +00:00
Wanne dfb67dac75 - Translated missing texts for French version (by hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-07-07 19:30:22 +00:00
Wanne 09fea2685d Fixed compilation error in VS 2010 (by cocsackie)
- The new dynamic opinion cpp files were added to the VS project as "include" instead of type "compile"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7302 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-30 20:15:09 +00:00
Wanne 1eaea26f79 - Fixed compilation error for Polish EXE
- Fixed missing entries in VS2010 filters, but the EXE does not compile in VS 2010 (VS 2005 and VS 2008 works fine)
o I get 28 errors regarding methods of the Dynamic Opinions (
-> Unresolved external symbols: RefreshBoxes(), InitMyBoxes(), SaveDynamicDialogue(), ...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-30 19:02:05 +00:00
Flugente b1148f9040 set language back to english
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-30 17:28:26 +00:00
Wanne b856eece9d - Added new texts for feature "dynamic dialogue" to the language specific cpp files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-29 17:07:03 +00:00
Flugente a83f38a36e Dynamic Dialogue update: pressing 'ESC' in tactical also fast forwards the dialogue boxes.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-28 10:15:02 +00:00
Flugente 3a9cb5ecc3 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.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-27 22:12:29 +00:00
Flugente 91d5e4d094 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.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2059 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-27 22:11:13 +00:00
Wanne b083314318 Merged from revision: 7295
- fix: bug with static structures display shifted when viewing top left corner of map in certain resolutions (1440x900, 1600x900, possibly others) (by anv & Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-27 06:43:57 +00:00
Wanne 75ddf38ece Vehicle Bugfixes (by anv)
- fix: problem with ctrl not swapping passengers on seats further than 6
- fix: vehicle ramming people not working properly when driving in non-diagonal directions

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-27 06:41:55 +00:00
Wanne d6a3e34d1f Merged from revision: 7292
- Fixes in _Ja25ChineseText.cpp (by Lejardo)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-25 17:57:53 +00:00
Wanne 4f0ee82ccb Merged from revision: 7290
- Fixed inaccessible or lost items for moving items from mercs to sector inventory when a different tactical map is loaded (by Buggler & anv)
- Revert fix on queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-25 17:53:15 +00:00
Wanne ff34f538d9 Merged from revision: 7287
Fixes (by Buggler)
- Disabled calling reinforcements from patrol groups when queen wakes up as they will not be replenished (thanks anv)
- Fixed queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting
- Alternative hotkey ~ (tilde) to toggle merc inventory in strategic screen like in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-23 17:46:10 +00:00
silversurfer 9419e1b8b9 Bugfix: In tactical right-clicking on a merc portrait with the squad list open instead of minimap crashed the game. Inventory view only allows display of minimap therefore the view will now be reset to minimap whenever a merc portrait is right-clicked.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-21 17:15:55 +00:00
Wanne b24e323dd4 Vehicle Update: Roadkill with vehicles and ramming (by anv)
- new feature: ramming people - set with Tactical Gameplay Settings > ALLOW_CARS_DRIVING_OVER_PEOPLE and Tactical Gameplay Settings > ALLOW_TANKS_DRIVING_OVER_PEOPLE - when shift is pressed planned vehicle route will go through people. Those who will stay on its path will be hit, causing wounds and knock-outs.
- new feature: ramming structures - when shift is pressed planned vehicle route will go through obstacles. When vehicle hits the structure on its path it will be destroyed, causing small damage to vehicle too (with exception of tank). Tactical Gameplay Settings > CARS_RAMMING_MAX_STRUCTURE_ARMOUR and Tactical Gameplay Settings > TANKS_RAMMING_MAX_STRUCTURE_ARMOUR settings control how well armoured structure can be driven through and amount of potential damage for vehicle.
- see: http://www.ja-galaxy-forum.com/ubbthreads.php/topics/333829/Drivable_Vehicles#Post333829


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2058 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-21 10:07:43 +00:00
Wanne dbc852ea74 Vehicle Update: Roadkill with vehicles and ramming (by anv)
- new feature: ramming people - set with Tactical Gameplay Settings > ALLOW_CARS_DRIVING_OVER_PEOPLE and Tactical Gameplay Settings > ALLOW_TANKS_DRIVING_OVER_PEOPLE - when shift is pressed planned vehicle route will go through people. Those who will stay on its path will be hit, causing wounds and knock-outs.
- new feature: ramming structures - when shift is pressed planned vehicle route will go through obstacles. When vehicle hits the structure on its path it will be destroyed, causing small damage to vehicle too (with exception of tank). Tactical Gameplay Settings > CARS_RAMMING_MAX_STRUCTURE_ARMOUR and Tactical Gameplay Settings > TANKS_RAMMING_MAX_STRUCTURE_ARMOUR settings control how well armoured structure can be driven through and amount of potential damage for vehicle.
- see: http://www.ja-galaxy-forum.com/ubbthreads.php/topics/333829/Drivable_Vehicles#Post333829


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-21 10:07:11 +00:00
Wanne fc78fb6031 Merged from revision: 7282
- Bugfix: AP_JUMPWALL and AP_JUMPOFFWALL were swapped when read from ini. (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-21 10:02:22 +00:00
silversurfer a56dc9107b Bugfix: Replacing one attachment with another will now cost AP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-06-20 18:42:54 +00:00
Wanne 54372ff40c Updated APBPConstants.ini comments (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2056 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-06-20 12:34:14 +00:00