7604 Commits
Author SHA1 Message Date
Wanne 36131f3bf1 Merged from revision: 6949
- Multiplayer: Only output the notification info message about stucking enemy in a CO-OP game!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6950 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-20 13:12:53 +00:00
Wanne 1e90e7447a Merged from revision: 6946
- Bugfix: Fixed wrong IMP mail result entry for Radio Operator skill

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6947 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-20 08:17:00 +00:00
Flugente 4a3ac749e9 Print out warning if militia moe is aborted due to no merc on COMMAND assignment
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6944 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-19 21:03:54 +00:00
Wanne c7bc997835 Merged from revision: 1949
- Added missing ini properties for UB-Version

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1950 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-19 13:50:52 +00:00
Flugente cee17f5651 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.
requires GameDir >= r1946

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 21:26:46 +00:00
Flugente c152eaacd4 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1946 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-18 21:23:44 +00:00
Wanne e04bff6f61 Merged from revision: 6941
- Map Editor Bugfix: Fixed corruption of gpItem variable in Map Editor Build (by Kriplo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6942 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 07:47:19 +00:00
Wanne 0c82f3bb26 Merged from revision: 6939
- Bugfix: Fixed crash (Access violation popup) in Release build (VS2005/2008) when quitting the game (thx Kriplo)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 07:21:55 +00:00
Wanne 4eb243c21d Merged from revision: 6937
- Added support for language specific *.AttachmentSlots.xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6938 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-18 07:14:17 +00:00
Wanne 12f1fecfa4 - Reverted last commit (rev. 6935), because it was a wrong commit...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6936 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-17 09:38:29 +00:00
Wanne 977f71596a - Added support for language specific *.AttachmentSlots.xml files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-17 08:54:50 +00:00
Wanne 6254a4aa51 Merged from revision: 6932
- Added german.slf file, so it is possible to play German 1.13 version of a non German JA2 installation

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-15 21:14:42 +00:00
Wanne 66d7be7378 Merged from revision: 6930
- Added EnemyTaunts xml files
o Only French taunts are translated (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6931 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-15 20:47:46 +00:00
Wanne b690da2bf0 Merged from revision: 6926
- Translated Chinese source code files (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6927 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:42:08 +00:00
Wanne 0a36e31407 Merged from revision: 6924
- Deleted "Data-1.13/TableData/EnemyTaunts", because all the taunts are now in the "Data/TableData/EnemyTaunts" folder
- Updated *.EnemyTaunts.xml files for all languages
- INFO: All the action specific *.EnemyTaunts_*.xml" files will be committed soon, when they are ready...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6925 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:37:51 +00:00
Wanne 6cc3476b89 Merged from revision: 1944
- Splitted big file "EnemyTaunts.xml" into several action specific Taunt files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1945 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-14 07:33:35 +00:00
Wanne cc75ac481e Merged from revision: 6922
- Bugfix: Localization not working for multiple *.EnemyTaunts_*.xml files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6923 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-14 07:28:56 +00:00
Wanne fd761555e6 Merged from revision: 6918
UB-Fixes
- Fixed crash when opening IMP (BSE) Email for German version
o Wrong <NEWLINE> text in EMAIL25.EDT (Line 90)
- Deleted unused AIMBIOS.EDT and MERCBIOS.EDT for French version

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6919 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 17:10:09 +00:00
Wanne e0509df8d2 Merged from revision: 6916
- Fixed compilation error for JA2UB

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6917 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 13:11:21 +00:00
Wanne 42de98a9b6 Merged from revision: 6914
- Translated German.Pockets.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6915 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 12:58:51 +00:00
Wanne e6ae03cee3 Merged from revision: 6912
- Allow reading of language specific *.MercStartingGear.xml Kit names
- Fixed *.Pockets.xml not working
- Reworked a few German texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 12:57:01 +00:00
Wanne 98b1af7c23 Merged from revision: 6910
- Removed *.EnemyTaunts_Attack.xml file, because the structure is not completed
- Updated French GameDir files (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6911 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-13 08:13:02 +00:00
Wanne 93c9242827 Merged from revision: 1941
- Removed EnemyTaunts_Attack.xml, because it is missing the action xml tags. I will add the complete file later

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1942 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-13 08:04:45 +00:00
Wanne ecc24e1466 Merged from revision: 1939
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1940 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-12 17:23:44 +00:00
Wanne 11037729f0 Merged from revision: 6905
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 17:22:40 +00:00
Wanne fd1a09834c Merged from revision: 6902
- Translated Polish.Items.xml (by micand1989)
- Added missing name for Speck in French UB Version (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6903 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 12:03:26 +00:00
Wanne 3c95f4c9c2 Merged from revision: 6900
- Translated missing Chinese texts (by John_5696)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:53:13 +00:00
Wanne 06a832a7ab Merged from revision: 6898
- Fixed wrong/missing texts

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:45:29 +00:00
Wanne 94deceec84 Merged from revision: 6896
- Added new Enemy Taunts "Attack" file for (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-12 11:04:54 +00:00
Wanne 7d67ad85d9 Merged from revision: 1937
- Added new Enemy Taunts "Attack" file (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1938 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-12 11:00:27 +00:00
Flugente cb3304e93f Merged revision(s) 6894 from branches/ja2_source_official_2014:
Fixes (by Buggler)
- IMPPrejudice page not showing when reviewing in finish mode
- Added message when minor traits are unselectable due to all IMP available slots taken up by major traits
- Display message when pressing hotkey 'G' to toggle artificial merc light
- refactor hotkey weapon switching and make function available in OIV too
- hold ALT key to swap item instead of opening description box for valid attachment on cursor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6895 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-10 00:28:04 +00:00
silversurfer 8d07ebccc0 fixed Skyrider missing face and sticky dialogue text in strategic map
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6892 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-09 08:36:11 +00:00
Kriplo ab5bfe2bf3 Brief: //dnl ch85
- Some fixing and adding position in overhead map to be in center of big map.
Details:
- Calculate overhead map cords from your current position on big maps.
- Fix incorrect placing room numbers in maps with cliffs.
- Fix CTD during deletion of sector items using CTRL+D or CTRL+Del.
- Remove light, door and item cursor and item tiles after coping building.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6888 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-08 15:20:13 +00:00
silversurfer 553171b717 Bugfix for number of minor traits (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-07 15:02:45 +00:00
Flugente a3fd17b5d8 Merged revision(s) 1932-1933 from branches/ja2_data_official_2014:
- Enlarged move item toggle button in sector inventory (by anv)
- switched performance bonus of Hospital and Combat Support Hospital

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1934 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-06 18:28:29 +00:00
Flugente 5635e84e15 Merged revision(s) 6881 from branches/ja2_source_official_2014:
- close item description box when autoplace item from sector inventory (by Buggler)
- allow toggling of item restriction only when move item button is activated (by Buggler)
- sector inventory item filter buttons now shows in 640x480 too (by Buggler)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6882 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-06 18:21:58 +00:00
Flugente f3b4b46751 Merged revision(s) 6879 from branches/ja2_source_official_2014:
Editor fixes (by Buggler):
- fixed incorrect item display after deleting map-placed item in stack
- revert r5949 code for item deletion from item pool


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6880 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-04 18:47:07 +00:00
silversurfer ec646ba426 Minor improvement/fix for "Improved Bomb Planting" feature. (by Sevenfm)
1. Now you don't need to hold shift all the time while planting bomb, just shift+click is enough.
2. If successfully taken new bomb from inventory (or using Tripwire Roll), cursor is not changed back to MOVE after planting bomb. 
This means one less right-click for each bomb when making big minefields/tripwire networks.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-03 16:15:08 +00:00
silversurfer 4b1ccbca19 - values added for scope effectiveness mechanism
- new defaults:
IRON_SIGHT_PERFORMANCE_BONUS = 20.0
LASER_PERFORMANCE_BONUS_HIP = 25.0
LASER_PERFORMANCE_BONUS_IRON = 15.0
LASER_PERFORMANCE_BONUS_SCOPE = 10.0
GRAVITY_COEFFICIENT = 6.0
SCOPE_RANGE_MULTIPLIER = 0.7
MAX_EFFECTIVE_RANGE_MULTIPLIER = 1.4
MAX_EFFECTIVE_RANGE_REDUCTION = 0.5
MAX_EFFECTIVE_USE_GRADIENT = TRUE


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1930 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-02 10:20:34 +00:00
silversurfer 5d953b550c - updated NCTH targeting optics in Interface.cpp to use the same order and formulas as LOS.cpp. It's easier to read and compare this way.
- added scope effectiveness which defines the maximum magnification bonus a shooter can get using scopes. With the default settings a poor shooter like Juan will not benefit much from scopes while a good shooter will use the full potential. See also:
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/330194/Re:_Cth/INI_Settings_for_new_s.html#Post330194
http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/330236/Re:_Cth/INI_Settings_for_new_s.html#Post330236


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-02-02 10:02:13 +00:00
Flugente a21c8dc7d2 Merged revision(s) 1928 from branches/ja2_data_official_2014:
Meduna SAM site terminal restoration orientation was wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1929 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-02-01 02:18:09 +00:00
Kriplo 25952e5c50 Brief: //dnl ch84
- Solve issues related to my recent editor fixes.
Details:
- Fix missing condition when using keyboard for load any map from listed profiles in CTRL+L list box.
- Fix CTD during gWorldItems resize after adding certain amount of items.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-31 20:49:35 +00:00
Wanne bc03adf9f0 Merged from revision: 6864
- Updated French.AttachmentSlots.xml (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6865 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-31 16:05:15 +00:00
silversurfer bf451b0697 Fix for AI opponent finding
AI will now ignore empty player vehicles and instead look for real threats.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6863 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-31 09:07:04 +00:00
Wanne 3f02b4c295 Merged from revision: 6860
- Added new *.AttachmentSlots.xml file
- Updated French.AttachmentSlots.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6861 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-31 08:13:15 +00:00
Wanne 1f7b676c72 Merged from revision: 6858
Added *.MercStartingGear.xml (thx to hrvg)
- Not used in game, because source code has to be altered to get it working

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6859 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-31 07:47:32 +00:00
silversurfer 4c5e98c801 Fix for AI CTH evaluation with NCTH
The assumed target area was much to small for the calculated aperture so AI got abysmal CTH values all of the time and wouldn't use guns from far away because of that.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6855 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-30 15:20:40 +00:00
Flugente 0c03bd402a Merged revision(s) 6853 from branches/ja2_source_official_2014:
- Fix: with a very large team in dire circumstances, accumulated snitch events corrupted memory
- Fix: missing morale event handling (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 21:31:41 +00:00
Wanne 04bf4cff61 Merged from revision: 6849
- Some Polish EDT translations (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6852 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 20:55:06 +00:00
Wanne a9008cf53d Merged from revision: 6850
- Translated text to French (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6851 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-01-29 20:42:32 +00:00