7623 Commits
Author SHA1 Message Date
Wanne bc94c319c6 Merged from revision: 7067
- Translated missing French texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7068 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-15 15:50:17 +00:00
Wanne b25f678f4e Merged from revision: 1982
- Added ALL_MEANWHILE_CUTSCENE to Mod_Settings.ini to enable/disable meanwhile cutscenes (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1983 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-14 17:07:00 +00:00
Wanne 1156d646f7 Merged from revision: 7065
Fixes (by Buggler)
- Added ALL_MEANWHILE_CUTSCENE to Mod_Settings.ini to enable/disable meanwhile cutscenes
- Changed LMB behavior to open description box of item-under-mouse for valid attachment in cursor in strategic screen; hold ALT hotkey to swap valid attachment items instead (due to item under mouse will auto-move to higher priority pockets if valid attachment in cursor cannot be swapped in)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7066 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-14 17:05:35 +00:00
Wanne 28f8878a58 - Added missing <ASSIGNMENT> to Military Headquarters
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7064 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-14 13:08:25 +00:00
Wanne d74f1798b0 Merged from revision: 7062
- Translated some French texts (by hrvg)
- Fixed texts in other languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7063 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-14 13:04:27 +00:00
Wanne 3590cd96cc Merged from revision: 7060
- Externalized hardcoded "Player strength / Enemy strength" surrender values display text

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7061 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-13 07:46:22 +00:00
Flugente 679e443b42 Merged revision(s) 1980 from branches/ja2_data_official_2014:
- new background ability: disarm_trap alters effectivity at defusing bombs
- lowered signal shell light duration

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1981 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-12 22:32:22 +00:00
Flugente fddb72a94e Merged revision(s) 7057 from branches/ja2_source_official_2014:
- increased background-based chance to steal to 50%, money/gold/solver will be preferred targets
- lowered exp stat gain for handling tripwire
- new background ability: disarm_trap alters effectivity at defusing bombs
- Fix: incorrectly deleted soldiers could still be counted as jamming/scanning

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-12 22:29:56 +00:00
Wanne 1b0592629d Merged from revision: 7055
- Translated French.PocketPopups.xml (by hrvg)
- Added French translated file CampaignStatsEvents.xml. Currently the game does not support French.CampaignStatsEvents.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-12 17:07:23 +00:00
Flugente f6ffee0583 Merged revision(s) 7052 from branches/ja2_source_official_2014:
- Fix: Assertion if groupsize exceeds garrison size
- Fix: mobile militia never decides to move

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-11 22:48:13 +00:00
Flugente d83ae2a4c8 Merged revision(s) 7049 from branches/ja2_source_official_2014:
Fix: problems with loading IMP profiles between different game versions (checked on IMP from 6670, 6901, 7047) (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-11 21:26:11 +00:00
Flugente 3bf5a1328b Merged revision(s) 1978 from branches/ja2_data_official_2014:
Improved faces for Bob, Doc and Skitz (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1979 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-10 19:57:01 +00:00
Wanne ca35c38b48 Merged from revision: 1976
Feature Improvement: Fast Forward Turn (by Sevenfm)
0 - default behaviour
1 - auto fast forward only invisible
2 - auto fast forward always

AUTO_FAST_FORWARD_CIVS = 0
AUTO_FAST_FORWARD_CREATURES = 0


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1977 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-10 19:20:02 +00:00
Wanne b6796d022c Merged from revision: 7046
Feature Improvement: Fast Forward Turn (by Sevenfm)
0 - default behaviour
1 - auto fast forward only invisible
2 - auto fast forward always

AUTO_FAST_FORWARD_CIVS = 0
AUTO_FAST_FORWARD_CREATURES = 0

- Minor cosmetic fixes/improvements

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-10 19:19:23 +00:00
Wanne 3cc123e4b1 Merged from revision: 7044
Updated language specific gamedir files
- Translated French xml files (by hrvg)
- Fixed comment in *.LoadScreenHints.xml (max characters from 254 to 190)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7045 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-10 07:36:21 +00:00
Wanne fefbbc8e88 Merged from revision: 7042
Translated missing French Texts (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7043 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-10 07:33:13 +00:00
Flugente f2710790c5 Merged revision(s) 7040 from branches/ja2_source_official_2014:
Fix: if using scope modes, basic weapon item boni were always added, even if another scope was currently used.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-09 16:45:09 +00:00
Wanne 03fcdb9a74 Merged from revision: 7038
- Added support for language specific PocketPopups.xml (*.PocketPopups.xml)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-08 13:27:47 +00:00
Wanne 529a9e798a Merged from revision: 7036
- Press 'd' in realtime to activate turn based mode immediately (by Sevenfm)
o This only works if enemies are in the sector
o You will return to realtime if no enemy contact for 2 turns, as usual
o Useful for sneaking in some situations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7037 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-08 13:01:50 +00:00
Flugente be825b9242 Merged revision(s) 1974 from branches/ja2_data_official_2014:
Militia improvement: If MILITIA_TRAINING_CARRYOVER_PROGRESS is set to TRUE, militia training progress is carried over to the next training session once a session finishes. This way no training is lost.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1975 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-07 22:16:16 +00:00
Flugente 3c63b7b08c Merged revision(s) 7032 from branches/ja2_source_official_2014:
Militia improvement: If MILITIA_TRAINING_CARRYOVER_PROGRESS is set to TRUE, militia training progress is carried over to the next training session once a session finishes. This way no training is lost.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-07 22:12:32 +00:00
Wanne b562a39438 Merged from revision: 7030
- Added language version (*.PocketPopups.xml) of PocketPopups.xml
o This xml file is a 1:1 copy of the PocketPopups.xml file for the non English versions of the game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7031 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-07 21:37:46 +00:00
Wanne 17d0261860 Merged from revision: 7028
- Added missing assignment entries for *.FacilityTypes.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7029 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-06 19:56:13 +00:00
Kriplo 5ba65d8377 -fix for older savegames, October 2013 or earlier (thanks to anv).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7026 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-06 19:07:24 +00:00
Flugente 12d45fcfa2 Merged revision(s) 7024 from branches/ja2_source_official_2014:
- If a merc repairs up to a threshold below 100, display a slightly different message
- Due to radio operator jamming, AI red alert can fail (intentional part of the trait). In that case, forbid the soldier from using radio again this turn, as this would be a fruitless waste of APs.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7025 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-04 22:20:32 +00:00
Wanne f03bc8ef23 Merged from revision: 7022
- Added tooltip info for for turning on/off merc light movement (|G) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7023 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-04 17:27:15 +00:00
Flugente b39954aee7 Merged revision(s) 7018 from branches/ja2_source_official_2014:
- Fix: reloading while mercs are exiting the helicopter could lock the gamescreen.cpp
- Fix: helicopter airdrop could lock up if mercs were in a bad animation
- Fix: wrong battle report texts used

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 21:03:36 +00:00
Wanne 0a84d7e7ab Additional Tile Properties - Update
- Moved the global location of the xml files from the "AdditionalProperties" to the "Tilesets\AdditionalProperties" folder because this place fits better
- Of course you can also add special tilesets xml files in the tilesets specific folders "Tilesets\XX"
- Addded missing INI value: COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS
- Updated comments for COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1973 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-03 20:57:16 +00:00
Wanne baca53f566 Additional Tile Properties - Update
- Moved the global location of the xml files from the "AdditionalProperties" to the "Tilesets\AdditionalProperties" folder because this place fits better
- Of course you can also add special tilesets xml files in the tilesets specific folders "Tilesets\XX"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7017 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 20:55:59 +00:00
Flugente 8e06bdaf4c Update (by anv):
- fix: data read from Data/AdditionalProperties,
- new tag: <bTrapBonus> + updated data for tiles, trap level influenced by terrain,
- new feature/option: COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7016 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 20:38:26 +00:00
Flugente 42caadc5f3 Update (by anv):
- fix: data read from Data/AdditionalProperties,
- new tag: <bTrapBonus> + updated data for tiles, trap level influenced by terrain,
- new feature/option: COVER_SYSTEM_STATIC_SHADOWS_DECREASE_BRIGHTNESS.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1972 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-03 20:37:24 +00:00
Flugente 95b1c783eb Merged revision(s) 7014 from branches/ja2_source_official_2014:
- Fix: snitches report mercenaries and vehicles complain about pay even if they receive none
- Fix: if NO_ENEMY_DETECTION_WITHOUT_RECON is FALSE, every sector is reported to contain enemies

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-03 20:23:13 +00:00
Flugente 17ed67f578 Fix: mobile militia no longer moves
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7013 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 16:26:49 +00:00
Flugente fcc2aa6f21 Merged revision(s) 7010 from branches/ja2_source_official_2014:
Fix: when militia picked up items, a wrong item name was displayed


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 15:11:32 +00:00
Flugente f91d1a0be9 Merged revision(s) 7006 from branches/ja2_source_official_2014:
Fix: in certain conditions, radio operators were not correctly identified to be jamming communications

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7007 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 14:12:05 +00:00
Kriplo a665154a62 Brief: //dnl ch86
- Fixing mapeditor move building and improving some related mapeditor stuff.
Details:
- Change the way exit grids are add, remove, save and load through editor, also add undo option for exit grids and you can place unlimited number of them.
- Fix incorrect gridno save in temporary map file for bigmap exit grids.
- Increase maximum number of light sprite from 256 to 4096 per map.
- Using DEL key for QuickEraseMapTile will now erase ItemPool too, and with improved function DeleteStuffFromMapTile will erase light sprites, exit grids and door locks.
- Cliff hang tiles used for middle cliffs are now possible to erase with when erase button is on.
- Add support for undo door locks, also you can now erase them if erase button is on.
- Move building function is completely rewrite and will properly move exit grids, door locks, lights and items too.
- Removing unnecessary tiles during copy building is improved too.
- Fix undo function for light sprites which now will also store all three types and undo them properly.
- Fix CTD situation if tile elements are deleted and after that items too, then undo will crash mapeditor.
- Fix spawning of item pool cursors during when adding items.
- Fix text glitches over door locks form.
- Fix sticky tooltip when loadsave screen or door locks form is active.
- High ground marking cursors will not be drawn in invisible map tiles anymore to increase speed and maybe fix some render problems but I doubt it.
- Move GLOCK_17_ForUseWithLOS item generation from init.cpp to los.cpp to avoid potential problems if global world items array not set.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7004 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 11:25:11 +00:00
Wanne db9ecb102d Merged from revision: 7002
Editor Enhancement (by Buggler)
- Hold shift to select previous merc instead of next merc when using hotkeys or associated buttons

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7003 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-02 09:54:55 +00:00
Flugente 99857261cd Merged revision(s) 1970 from branches/ja2_data_official_2014:
Added sleeping bag item (#1709), as <SleepModifier> was unused.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1971 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 22:26:43 +00:00
Wanne 242b44989c New Feature: Additional Tile Properties (by anv)
- Feature can be completely disabled in .ini as COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES under Tactical Cover System Settings.

- With Additional Tile Properties it's possible to supply all tiles with additional data, just like with .jsd files, except in XML.
Files need to have same name as tile's .sti and .jsd files, and be put in \tilesets\AdditionalProperties\, or in specific \tilesets\xx\.

- With additional properties it's possible to specify which camo type, and how effectively will work on any tile. Only snow camo will work on snow covered roofs, red carpet in palace won't perfectly cooperate with urban camo anymore, thick grass in the middle of the forest will provide better camouflage than sparse grass near the road.

- It's now possible to specify footstep volume and stealth difficulty modifier of any tile. Carpets will absorb noise, tile floors amplify it, twigs laying on the tile will make sneaking harder. Choose your path carefully, taffer. 

- More infos: http://www.bears-pit.com/board/ubbthreads.php/topics/330942.html#Post330942


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1969 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-03-01 09:51:17 +00:00
Wanne d2130494da New Feature: Additional Tile Properties (by anv)
- Feature can be completely disabled in .ini as COVER_SYSTEM_ADDITIONAL_TILE_PROPERTIES under Tactical Cover System Settings.

- With Additional Tile Properties it's possible to supply all tiles with additional data, just like with .jsd files, except in XML.
Files need to have same name as tile's .sti and .jsd files, and be put in \tilesets\AdditionalProperties\, or in specific \tilesets\xx\.

- With additional properties it's possible to specify which camo type, and how effectively will work on any tile. Only snow camo will work on snow covered roofs, red carpet in palace won't perfectly cooperate with urban camo anymore, thick grass in the middle of the forest will provide better camouflage than sparse grass near the road.

- It's now possible to specify footstep volume and stealth difficulty modifier of any tile. Carpets will absorb noise, tile floors amplify it, twigs laying on the tile will make sneaking harder. Choose your path carefully, taffer. 

- More infos: http://www.bears-pit.com/board/ubbthreads.php/topics/330942.html#Post330942


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7001 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-01 09:50:40 +00:00
Flugente 3ae95a6c20 Merged revision(s) 6997-6998 from branches/ja2_source_official_2014:
- Campaign stats take spy actions and SAM sabotages into account
- spy encounters are not reproted if nothing of interest happened
- Fix: error in food system automatic canteen refill
- Fix: if min enemy group size is too high, the AI never replensishes garrisons, thereby severely dumbing down the game.
- Fix: enemy groups do not receive minimum size
- Fix: enemy groups sizes are cut down needlessly


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6999 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-03-01 01:48:43 +00:00
Flugente 618b1c1f8a Merged revision(s) 6995 from branches/ja2_source_official_2014:
Enemy taunt boxes now appear a bit above a soldier, to not interfere with aiming.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 23:14:30 +00:00
Wanne 402933fa52 Merged from revision: 6993
- Bugfix: Changed font for sector loadscreens from FONT12ARIAL to FONT14ARIAL to support more characters (e.g: ')

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6994 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 22:22:30 +00:00
Wanne 94988a2b84 Replaced ` with ' in Items.xml (thx to hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1967 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-27 20:36:42 +00:00
Wanne db61428dd9 Merged from revision: 6991
- Translated texts for Chinese version (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6992 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 15:51:40 +00:00
Wanne 8a9857c26e Merged from revision: 6989
Bugfix (by Buggler)
- Fixed incorrect shipping costs in BobbyR Shipment page
- Duplicate laptop webpage hotkeys (e -> Enter, q -> BACKSPACE)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-27 15:46:37 +00:00
Flugente 8562acde61 Merged revision(s) 1965 from branches/ja2_data_official_2014:
Fix: wrong background number


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1966 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-27 00:42:45 +00:00
Flugente 6ca631008c Merged revision(s) 1963 from branches/ja2_data_official_2014:
Mercs get individual backgrounds, with the same number as their profile number, which is not selectable by IMPs. This allows better ordering and finetuning descriptions.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1964 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-26 23:28:05 +00:00
Flugente 9e393cd5e3 Merged revision(s) 6985 from branches/ja2_source_official_2014:
- Fix: battle reports no longer report that a team came from north if it was already in sector.
- Fix: red lines at wrong locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6986 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 20:59:25 +00:00
Wanne c57e3baba1 Merged from revision: 6983
Changed inventory dialog to hotkey Ctrl+[v] (before Ctrl+[i]) (by Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6984 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-26 19:01:34 +00:00