Commit Graph

  • 8cbdbf18b5 Fix: STR stat damage from starvation was not read correctly Flugente 2014-02-23 16:58:59 +00:00
  • 916bf88b9d Merged revision(s) 6965 from branches/ja2_source_official_2014: - [CTRL] + [i] in tactical calls a dialogue for sector inventory manipulations (by Sevenfm) - [CTRL] + [c] in tactical calls a dialogue for cover/trap display modes (by Sevenfm) - changed min value for SCOPE_RANGE_MULTIPLIER from 0.5 to 0.1 (by Sevenfm) Flugente 2014-02-22 19:32:13 +00:00
  • 71d85d8bb5 Fix: soldiers without a face index should not use Character Dialogue that uses face index Flugente 2014-02-22 19:02:26 +00:00
  • 201fcf4001 Merged from revision: 6961 - Bugfix: John Kulba (and other NPCs) did not show up on MERC website even if MERC_WEBSITE_ALL_MERC_AVAILABLE = TRUE (by anv) Wanne 2014-02-22 16:44:15 +00:00
  • 94bbd43c71 Merged from revision: 6959 - Trimmed texts for LoadScreenHints.xml to a maximum of 190 characters o French and Chinese was not trimmed, because it is already translated. The translators have to trim them Wanne 2014-02-21 21:25:34 +00:00
  • 01f0a43161 Merged from revision: 1953 - Trimmed texts in LoadScreenHints.xml to max. 190 characters Wanne 2014-02-21 21:24:24 +00:00
  • 47cbae3352 Merged revision(s) 1951 from branches/ja2_data_official_2014: Fix: Sam Garver had wrong ammo in Kits 2 & 4 Flugente 2014-02-21 20:33:26 +00:00
  • d888067d81 Merged revision(s) 6957 from branches/ja2_source_official_2014: reverted length of loadscreenhints back to 190. Flugente 2014-02-21 18:21:20 +00:00
  • f564b48501 Merged from revision: 6955 - Reworked *.LoadScreenHints.xml files o The xml files now only contain the <uiIndex> and the <szName> attributes Wanne 2014-02-21 09:03:58 +00:00
  • 7f2ec17f9b Merged from revision: 6953 - Increased text limit for load screen hints from 190 to 254 o Hopefully this does not cause any problems when rendering on the loadscreens. Tests resulted in success - Support for localization of LoadScreenHints.xml (*.LoadScreenHints.xml) o Now the language specific xmls only have the <uiIndex> and <szName> attributes. All other attributes are in the LoadScreenHints.xml Wanne 2014-02-21 09:02:17 +00:00
  • 36131f3bf1 Merged from revision: 6949 - Multiplayer: Only output the notification info message about stucking enemy in a CO-OP game! Wanne 2014-02-20 13:12:53 +00:00
  • 1e90e7447a Merged from revision: 6946 - Bugfix: Fixed wrong IMP mail result entry for Radio Operator skill Wanne 2014-02-20 08:17:00 +00:00
  • 4a3ac749e9 Print out warning if militia moe is aborted due to no merc on COMMAND assignment Flugente 2014-02-19 21:03:54 +00:00
  • c7bc997835 Merged from revision: 1949 - Added missing ini properties for UB-Version Wanne 2014-02-19 13:50:52 +00:00
  • cee17f5651 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment. Flugente 2014-02-18 21:26:46 +00:00
  • c152eaacd4 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment. Flugente 2014-02-18 21:23:44 +00:00
  • e04bff6f61 Merged from revision: 6941 - Map Editor Bugfix: Fixed corruption of gpItem variable in Map Editor Build (by Kriplo) Wanne 2014-02-18 07:47:19 +00:00
  • 0c82f3bb26 Merged from revision: 6939 - Bugfix: Fixed crash (Access violation popup) in Release build (VS2005/2008) when quitting the game (thx Kriplo) Wanne 2014-02-18 07:21:55 +00:00
  • 4eb243c21d Merged from revision: 6937 - Added support for language specific *.AttachmentSlots.xml files Wanne 2014-02-18 07:14:17 +00:00
  • 12f1fecfa4 - Reverted last commit (rev. 6935), because it was a wrong commit... Wanne 2014-02-17 09:38:29 +00:00
  • 977f71596a - Added support for language specific *.AttachmentSlots.xml files Wanne 2014-02-17 08:54:50 +00:00
  • 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 Wanne 2014-02-15 21:14:42 +00:00
  • 66d7be7378 Merged from revision: 6930 - Added EnemyTaunts xml files o Only French taunts are translated (by hrvg) Wanne 2014-02-15 20:47:46 +00:00
  • b690da2bf0 Merged from revision: 6926 - Translated Chinese source code files (by John_5696) Wanne 2014-02-14 07:42:08 +00:00
  • 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... Wanne 2014-02-14 07:37:51 +00:00
  • 6cc3476b89 Merged from revision: 1944 - Splitted big file "EnemyTaunts.xml" into several action specific Taunt files (by hrvg) Wanne 2014-02-14 07:33:35 +00:00
  • cc75ac481e Merged from revision: 6922 - Bugfix: Localization not working for multiple *.EnemyTaunts_*.xml files Wanne 2014-02-14 07:28:56 +00:00
  • 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 Wanne 2014-02-13 17:10:09 +00:00
  • e0509df8d2 Merged from revision: 6916 - Fixed compilation error for JA2UB Wanne 2014-02-13 13:11:21 +00:00
  • 42de98a9b6 Merged from revision: 6914 - Translated German.Pockets.xml Wanne 2014-02-13 12:58:51 +00:00
  • e6ae03cee3 Merged from revision: 6912 - Allow reading of language specific *.MercStartingGear.xml Kit names - Fixed *.Pockets.xml not working - Reworked a few German texts Wanne 2014-02-13 12:57:01 +00:00
  • 98b1af7c23 Merged from revision: 6910 - Removed *.EnemyTaunts_Attack.xml file, because the structure is not completed - Updated French GameDir files (by hrvg) Wanne 2014-02-13 08:13:02 +00:00
  • 93c9242827 Merged from revision: 1941 - Removed EnemyTaunts_Attack.xml, because it is missing the action xml tags. I will add the complete file later Wanne 2014-02-13 08:04:45 +00:00
  • 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 Wanne 2014-02-12 17:23:44 +00:00
  • 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 Wanne 2014-02-12 17:22:40 +00:00
  • fd1a09834c Merged from revision: 6902 - Translated Polish.Items.xml (by micand1989) - Added missing name for Speck in French UB Version (by hrvg) Wanne 2014-02-12 12:03:26 +00:00
  • 3c95f4c9c2 Merged from revision: 6900 - Translated missing Chinese texts (by John_5696) Wanne 2014-02-12 11:53:13 +00:00
  • 06a832a7ab Merged from revision: 6898 - Fixed wrong/missing texts Wanne 2014-02-12 11:45:29 +00:00
  • 94deceec84 Merged from revision: 6896 - Added new Enemy Taunts "Attack" file for (by hrvg) Wanne 2014-02-12 11:04:54 +00:00
  • 7d67ad85d9 Merged from revision: 1937 - Added new Enemy Taunts "Attack" file (by hrvg) Wanne 2014-02-12 11:00:27 +00:00
  • 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 Flugente 2014-02-10 00:28:04 +00:00
  • 8d07ebccc0 fixed Skyrider missing face and sticky dialogue text in strategic map silversurfer 2014-02-09 08:36:11 +00:00
  • 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. Kriplo 2014-02-08 15:20:13 +00:00
  • 553171b717 Bugfix for number of minor traits (by anv) silversurfer 2014-02-07 15:02:45 +00:00
  • 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 Flugente 2014-02-06 18:28:29 +00:00
  • 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) Flugente 2014-02-06 18:21:58 +00:00
  • 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 Flugente 2014-02-04 18:47:07 +00:00
  • 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. silversurfer 2014-02-03 16:15:08 +00:00
  • 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 silversurfer 2014-02-02 10:20:34 +00:00
  • 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 silversurfer 2014-02-02 10:02:13 +00:00
  • a21c8dc7d2 Merged revision(s) 1928 from branches/ja2_data_official_2014: Meduna SAM site terminal restoration orientation was wrong Flugente 2014-02-01 02:18:09 +00:00
  • 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. Kriplo 2014-01-31 20:49:35 +00:00
  • bc03adf9f0 Merged from revision: 6864 - Updated French.AttachmentSlots.xml (by hrvg) Wanne 2014-01-31 16:05:15 +00:00
  • bf451b0697 Fix for AI opponent finding silversurfer 2014-01-31 09:07:04 +00:00
  • 3f02b4c295 Merged from revision: 6860 - Added new *.AttachmentSlots.xml file - Updated French.AttachmentSlots.xml Wanne 2014-01-31 08:13:15 +00:00
  • 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 Wanne 2014-01-31 07:47:32 +00:00
  • 4c5e98c801 Fix for AI CTH evaluation with NCTH silversurfer 2014-01-30 15:20:40 +00:00
  • 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) Flugente 2014-01-29 21:31:41 +00:00
  • 04bf4cff61 Merged from revision: 6849 - Some Polish EDT translations (by anv) Wanne 2014-01-29 20:55:06 +00:00
  • a9008cf53d Merged from revision: 6850 - Translated text to French (by hrvg) Wanne 2014-01-29 20:42:32 +00:00
  • 64efff67fa Merged from revision: 6846 and 6847 - Fixed missing text entry in _FrenchText.cpp - Bugfix: Fixed initialization not working for foreign language *.EnemyTaunts.xml Wanne 2014-01-29 20:32:04 +00:00
  • 72c4a77598 Merged from revision: 6844 - Fixed French texts (by hrvg) Wanne 2014-01-29 09:35:38 +00:00
  • 67f1f2771a Merged from revision: 6840 Added the new 4 molle items (just in English) Wanne 2014-01-28 08:24:48 +00:00
  • 33571338f0 Merged from revision: 1926 4 new MOLLE items (by Off_Topic) - 1 MOLLE Backpack/Combat Combo, - 1 Stand alone MOLLE Combat pack and 1 stand alone MOLLE Backpack see: http://www.bears-pit.com/board/ubbthreads.php/topics/329539/Creating_a_MOLLE_backpack_set_.html#Post329539 Wanne 2014-01-28 08:13:03 +00:00
  • df4cdfdab2 Added transformations from map-editor tripwire to standard tripwire (#1524). Flugente 2014-01-27 21:37:54 +00:00
  • 461cfc405e Merged revision(s) 6836 from branches/ja2_source_official_2014: Fix: incorrect gridno calculation Flugente 2014-01-26 22:07:28 +00:00
  • 0c4f5c5df5 Merged revision(s) 6833 from branches/ja2_source_official_2014: Fix: on certain conditions, gpCurrentTalkingFace gets garbage values assigned. If BOOLEAN fTalking then does get a value > 0, the incorrect face does not get cleaned. Flugente 2014-01-26 18:15:09 +00:00
  • d6186aca15 Merged revision(s) 6826-6828 from branches/ja2_source_official_2014: - Minor code improvements and cleanup - Fix from r6775 is no longer necessary. - Code improvement: Instead of calling inv.size() repeatedly, just call it once and remember that value Flugente 2014-01-26 12:18:43 +00:00
  • d4aa35a66e Merged from revision: 6824 Map Editor Fixes/Improvements (by Buggler) - Better UI feedback after last item deleted from item stack in editor item mode - Improved editor room number increment code. 'Shift + LMB' when drawing room numbers will reuse same room number on next input - externalized hardcoded button tooltip text in editor tile selection window Wanne 2014-01-26 08:15:40 +00:00
  • 405b073416 Merged revision(s) 6822 from branches/ja2_source_official_2014: - Fix: autoresolve battle reports sector wrong - Fix: reports over #255 are not accessible Flugente 2014-01-25 17:11:25 +00:00
  • 518ae3d56b Merged from revision: 6820 Fix: unable to load savegame if more than 255 incidents occured Flugente 2014-01-25 16:20:03 +00:00
  • 515d17e408 Merged from revision: 6818 Updated French Files (by hrvg) Wanne 2014-01-25 15:37:28 +00:00
  • 491050e8c8 Merged from revision: 6814 - Fix: HOURS_BETWEEN_STRATEGIC_DECAY was not read from ini (by anv) - Fix: squads exceeding 20 cannot be accessed Flugente 2014-01-22 21:37:13 +00:00
  • e3bc68948e Merged from revision: 6812 Reworked Sectory actions menu (CTRL + .) (by Sevenfm) - Also added support for 16 medium size buttons dialog. - see: http://www.bears-pit.com/board/ubbthreads.php/topics/329932.html#Post329932 Wanne 2014-01-22 13:28:48 +00:00
  • 581c1cc3c5 Merged from revision: 1922 - Updated Ja2_Options.INI and INIEditorJA2Options.xml comments (by Buggler) Wanne 2014-01-22 08:05:51 +00:00
  • 8f07164e78 Updated French Files (by hrvg) Wanne 2014-01-21 17:14:33 +00:00
  • 8cca415daa Merged from revision: 6804 - Updated French text files (by hrvg) Wanne 2014-01-20 19:41:19 +00:00
  • c47f8cb8fc Merged from revision: 6804 - Updated / added French files (by hrvg) Wanne 2014-01-20 19:40:05 +00:00
  • 603550b5ae Fix for ammo icon in description box which showed another shifted description box when ammo type was invalid. silversurfer 2014-01-20 17:38:35 +00:00
  • 762f1074f3 Fixed bug with merc swap feature which was introduced with Waldo the mechanic. Faces were swapped incorrectly. silversurfer 2014-01-20 12:00:26 +00:00
  • 850a53b75f Merged from revision: 6795 - UB crashing after helicopter crash in new game (junk variables removed) (by anv) Wanne 2014-01-20 09:02:21 +00:00
  • b63b43f648 Merged from revision: 1920 Fixes (by Buggler) - removed IMPROVED_BOMB_PLANTING option, enabled by default - removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim Wanne 2014-01-20 08:50:35 +00:00
  • d643847f42 Merged from revision: 6792 Fixes (by Buggler) - draw NCTH cursor indicator after health bar indicator due to potential overlap (thanks to Sevenfm) - removed IMPROVED_BOMB_PLANTING option, enabled by default - removed AIMED_BURST_ALTERNATE_KEY option, enabled by default. Alternate Aiming Hotkey reassigned to ',' (comma) for increasing aim - streamlined burst & auto mode right click aim mechanism Wanne 2014-01-20 08:49:56 +00:00
  • 056e5e31c5 Thanks to Flugente, he perform quick fix for overhead map crash after sector is cleared from enemy, but actual problem was created by me in r6744, I overwrite one condition by mistake, so this will fix the real source of problem. Kriplo 2014-01-19 18:17:58 +00:00
  • b038ab4f0d Merged from revision: 6786 Added missing text line in French version - L"Refuel site" Wanne 2014-01-19 18:14:51 +00:00
  • 49cba321b5 Fix: M.E.R.C. accounting displayed too many mercs per page (page 2 and following) Flugente 2014-01-19 14:21:04 +00:00
  • f5dfddb0fc FixFix: non-merc planted explosives that fire fragments caused crashes. A few functions had to be fixed. Flugente 2014-01-19 14:14:30 +00:00
  • 4541487c3b Fix: Opening up sector map could cause crashes. Flugente 2014-01-19 14:12:04 +00:00
  • e1b1712205 Fixed dropdown menu glitches Flugente 2014-01-19 14:06:50 +00:00
  • 27db170b39 Fix: overly long loadscreen hints caused crashes when displayed in log. Maximum loadscreen length is now 190 (was 256). Flugente 2014-01-19 14:05:59 +00:00
  • 83be50c97c Merged from revision: 6767 - Moved hard coded "Next page" button text for Alumni site to language files Wanne 2014-01-17 07:49:21 +00:00
  • 5f92048f5a Merged from revision: 6764 Fixes (by Buggler) - fixed hotkey switch weapons AP cost and empty hand swap - adjusted colors for militia equipment item shading - fixed IMP background button states and previous button array list Wanne 2014-01-15 13:20:31 +00:00
  • 8d5ed89e14 Merged from revision: 6761 - Campaign Stats: Externalized hard coded "and" text to language specific text files Wanne 2014-01-13 20:30:39 +00:00
  • 56056b8841 Merged from revision: 1917 - Added missing updated snitch traits for some mercs. This feature was added in GameDir revision: 1906 (by anv) Beth Bud Buzz Carp Ears Gary Hurl Lance Leon Weasel Wanne 2014-01-13 16:32:19 +00:00
  • 3804ef6650 Merged from revision: 6759 - Updated French texts (by hrvg) Wanne 2014-01-13 07:59:56 +00:00
  • e51b013da1 Merged from revision: 6756 Bugfix: Fixed old (unsupported map version error) A1 map in French version - Added the English A1 map, which works fine Wanne 2014-01-12 15:33:59 +00:00
  • 59c4dfc8f7 Spotter ini settings were lost in previous commit Flugente 2014-01-10 18:39:21 +00:00
  • 06123089bb Bugfixes (by anv) - Fixed Dimitri's recruitment, - Fixed proper morale gains/losses Wanne 2014-01-10 16:27:21 +00:00
  • 8503fc26c2 Visual tactical improvements (by Sevenfm) 1) Improved cover indicator: SHOW_COVER_INDICATOR 0 - nothing 1 - show as small square to the right of health bar 2 - show using color of merc's name 3 - same as 1, show only in stealth or when disguised 4 - same as 2, show only in stealth or when disguised Wanne 2014-01-10 16:22:25 +00:00
  • 7782384be5 Visual tactical improvements (by Sevenfm) 1) Improved cover indicator: SHOW_COVER_INDICATOR 0 - nothing 1 - show as small square to the right of health bar 2 - show using color of merc's name 3 - same as 1, show only in stealth or when disguised 4 - same as 2, show only in stealth or when disguised Wanne 2014-01-10 16:21:59 +00:00