Commit Graph
7602 Commits
Author SHA1 Message Date
Wanne 298c33d36c - Added alternate shooting animation for big merc (M_SR_AM2.sti) (by Sandro)
- Added alternate shooting animation for big merc when standing in water (MW_SR_AM.sti) (by Sandro)
- Added and renamed the original animations with a *.original" suffix

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1363 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-15 09:23:06 +00:00
Wanne 2a3f2f97cb - Fixed Terry's 064_099 sound files ( by Buggler)
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=301454#Post301454


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1362 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-03-15 08:58:51 +00:00
Wanne 4dabdc5363 - Updated German texts (by Farmer_Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-04 02:07:26 +00:00
Wanne ab80b4e191 MERGED bugfix from revision: 5007
- Bugfix: Speck did not send Email when one of his merc leveled up
TODO: We have to add text from the Email.edt file to the externalized XML files in "TableData\Email" folder

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-01 15:54:58 +00:00
Wanne 95547fe620 MERGED bugfixes from revision: 4987
- Bugfix: Fixed crash, when you are in tactical turn based and you show the item description from a sector inventory item and then you close the sector inventory when the item description is still open
o Now you have to close the item description box first. A message box will output you the error and you can't close the sector inventory when the item description box is open

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-03-01 12:53:42 +00:00
Wanne 2ade2707a6 - Fixed a few wording errors in Polish.EncyclopediaQuests.xml (by Asthner)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4981 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 09:58:01 +00:00
Wanne d1b02dd028 - Translated EncyclopediaQuests.xml to English (by Asthner)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1361 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-29 09:57:28 +00:00
Wanne 9e84dc989e MERGED bugfixes from revision: 4966
- Nullpointer check-fix (by tazpn)
o random null pointer check

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4978 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:57:48 +00:00
Wanne b95ae8b528 MERGED bugfixes from revision: 4935
- Changed encoding of Email.cpp to UTF8, because of compilation problems for our Chinese friends

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:57:14 +00:00
Wanne 5d5dd0defa MERGED bugfixes from revision: 4927
- Bugfix: IMP pool already reduced before actual payment & character creation are done (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4976 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:56:21 +00:00
Wanne 8252af65a4 Reverted the merged bugfix from revision 4920, because it is a development trunk only bugfix
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4975 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:52:37 +00:00
Wanne 133a48dd41 MERGED bugfixes from revision: 4919
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4974 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:43:09 +00:00
Wanne 74e8ecae8c MERGED bugfixes from revision: 4917
- Bugfix: Bobby Ray: Shipments were not cleared when restarting a game 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:34:23 +00:00
Wanne 1bb9ed5be5 MERGED bugfixes from revision: 4916
- Bugfix: If DISABLE_LAPTOP_TRANSITION is TRUE, some laptop initialization methods (e.g: BobbyR methods) were not executed
- Removed the hardcoded setting from 3 ja2_options.ini values for a multiplayer game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:28:03 +00:00
Wanne a1e58c31aa - Bugfix: Fixed Fatima not leaving the sector (Bug was introduced in the development trunk in revision 4687 when "improved interrupt system (IIS)" was merged
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4971 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-29 00:22:05 +00:00
Wanne 82c708445d - Reworked the comments block in the Vehicles.xml file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1360 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-26 16:10:34 +00:00
Wanne 765088d430 - Fixed a few Chinese translations (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4946 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-12 21:26:40 +00:00
Wanne a40a8878a8 - Updated Chinese.EnemyRank.xml (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4942 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-11 18:55:38 +00:00
Wanne 081435b993 - Translated missing text for Chinese version (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4941 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-11 18:54:45 +00:00
Wanne 2a6d06284c - Updated Chinese texts (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-10 21:09:27 +00:00
Wanne b7b61f917d - Fixed "Hummer" going hostile when encountered in a sector
o The <neutral> tag was set to 0 (enemy) instead of 1 (neutral, friendly)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1359 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-08 12:11:37 +00:00
Wanne b2a85f80e4 - Fixed typo mistakes in English text files (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4913 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-03 10:52:32 +00:00
Wanne ca9bd76792 - Bugfix: Added missing "SMALLPOCK1POS" to switch-case (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-01 16:35:53 +00:00
Wanne 431a7011a3 - Updated comments for the 3 new item size properties
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1358 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-01 16:31:21 +00:00
Wanne 467b91e355 - New Externalization: Item size and weapon limits (by JMich)
o 3 new ja2_options.ini properties: MAX_ITEM_SIZE, MAX_WEAPON_SIZE, OLD_INVENTORY_ITEM_NUMBER
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=276115&page=1

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1357 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-02-01 16:16:55 +00:00
Wanne 873e716ec1 - New Externalization: Item size and weapon limits (by JMich)
o 3 new ja2_options.ini properties: MAX_ITEM_SIZE, MAX_WEAPON_SIZE, OLD_INVENTORY_ITEM_NUMBER
o see here: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=276115&page=1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4907 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-02-01 16:15:35 +00:00
Wanne fce6a88f1a Display add. screen msg when pressing 'v' due to settings not being easily observable & changeable during gameplay (by Buggler)
- Progress Speed of Item Choices, Number of Terrorists, Secret Weapon Caches


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4905 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-31 10:47:21 +00:00
Wanne ca3034db1d - Changed a few default starting / settings options:
o Set default IMP charaters to 1 in the start new game screen
o Set default game style to "SCI-FI" in the start new game screen
o Disabled "NCTH" in the default ingame options

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1356 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-31 10:21:06 +00:00
Wanne 32edc4e6f4 - Changed a few default starting / settings options:
o Set default IMP charaters to 1 in the start new game screen
o Set default game style to "SCI-FI" in the start new game screen
o Disabled "NCTH" in the default ingame options

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4902 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-31 10:20:54 +00:00
Wanne 39162ea56a Bugfix: IIS: Fixed endless loop on interrupt when IIS is enabled in the ja2_options.ini (by Sandro)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4901 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-31 09:59:08 +00:00
Wanne 425443ab37 Fix for NPC Inventory Tabledata (by Buggler)
- NPC Inventory Tabledata IndexNo sort according to ItemID
- Removed double entries for same Item ID


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1355 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-29 19:11:21 +00:00
Wanne f2554b4eff Bugfix: Fixed gender mixed up in the IMP Analysis email at the Portrait section (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4899 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-28 18:09:07 +00:00
inshy 0abf538a3d Small fixes for french text
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4898 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-28 12:49:15 +00:00
inshy 2ce9aa0236 -Fix small mistakes in Russian texts
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4897 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-28 08:45:03 +00:00
Wanne 259a1edbb4 - GameDir fixes (by Buggler)
o Removed error entries for GM-94 launchable attachments
o Corrected Hitman Kit 2 Ammo


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1354 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-27 11:52:10 +00:00
Wanne e39b43a956 Bugfix: Fixed crash when entering a sector in tactical and the rotting corpses from the temporary file has an invalid high value -> just set rotting corpses to 0
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4894 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-26 16:49:26 +00:00
Wanne 65814140d4 Bugfix: Multiplayer: The choosen difficulty was not used. For example, when selecting INSANE the game uses Expert difficulty.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4890 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-20 10:19:53 +00:00
Wanne b74dcd2b46 Chinese Version: Translated email xml files (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-19 15:23:44 +00:00
Wanne c196f10b2d MERGED language specific GameDir files from the development GameDir folder from revision 4545 up to 4882
Language specific development GameDir folder: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP/GameDir_LanguageSpecific



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4886 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-18 12:10:01 +00:00
Wanne f647e94f49 MERGED GameDir files from the development GameDir folder from revision 4545 up to 4882
Development GameDir folder: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP/GameDir




git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1353 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-18 11:58:16 +00:00
Wanne e64d5a2fa6 MERGED source code from development trunk revision 4545 up to latest current revision 4882
Development Trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP
A detailed list of all the features (changes) is visible in the history log of the development trunk:

INFO: The source code for the official 2011 release (4870) has been branched here:
https://ja2svn.dyndns.org/source/ja2/branches/JA2_rev.4870_2011

This commit contains the following features:

*** Externalized Vehicles ***
o Now with this feature we can add/remove vehicles
o New XML File: TableData\Vehicles.xml
o Added a new function parameter to lua file Scripts\Overhead lua to set up the helicopter in method: SetUpHelicopterForPlayer()
o Added example mini (Docs\Externalized Vehicles Example.zip) mod which adds 2 additional vehicles (hummer and ice-cream truck to sector A9)

*** Up to 255 save slots ***
- There is a "Next" and "Prev" button where you can scroll through the save slots
- It is now possible to load the automatic save (SAVE_EVERY_N_HOURS) from the load screen. This is the first slot after the quickload slot
- Added the 2 alternate players end turn saves (which can be enabled/disabled in option screen) to the save/load game form

*** New Feature: Externalized emails from Emails.edt to XML***
o This feature can be enabled/disabled in the Source:
--> See email.cpp: If "ReadXMLEmail" == FALSE, then normal way (read from Email.edt) otherwise read from XML files
o 2 new XML files: TableData\Email\EmailMercAvailable.xml and EmailMercLevelUp.xml
o Renamed SenderNamesList.xml to EmailSenderNamesList.xml and moved from TableData folder to TableData\Email folder
o Names for mercenaries are get from the file MercProfiles.xml and different names get from the file EmailSenderNamesList.xml

*** Externalized Hidden Towns (Tixa, Orta) ***
o Now it is possible to add new hidden towns (locations)
o See file: TableData/Map/Cities.xml
o New variable in TableData/Map/Cities.xml
- hiddenTown:   0 = show on strategy map, 1 = Hide on strategy map
- townIcon:     1 = on, 0 = off (This is the icon you see on the strategy map)
- szIconFile:   The path to the sti icon file (eg: interface\prison.sti, interface\my_icon.sti)
- iconPosition: The x,y position of the icon on the strategy map

*** Encyclopedia and Briefing Room, reachable from the laptop ***
o 2 new ja2_options.ini properties: BRIEFING_ROOM, ENCYCLOPEDIA
o demonstration video: http://www.youtube.com/watch?v=7CIXdXWLrAo
o Added Example usage of the Briefing Room
- Extract it in your JA2 1.13 folder and use the latest development executable
- The briefing room can be reached from the laptop. Enter SN5631 for the code and then click the "Exit" button
- See "Info_BriefingRoom.txt" and "BriefingRoom_Mission1.png"

*** Improved interrupt system (IIS) ***
o This system changes the way interrupts work. See: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=290787#Post290787
o Option system (see ja2_options.ini: IMPROVED_INTERRUPT_SYSTEM)
o A few more settings for the interrupt system in ja2_options.ini
o INFO: Multiplayer games always use the "old" interrupt system, not matter what the user selects in the ja2_options.ini

*** Walking and sidestepping with weapon raised ***
o Enable/disable the walking/sidestepping with raised weapon in ja2_options.ini: ALLOW_WALKING_WITH_WEAPON_RAISED
o You can set an AP/BP modifier when walking/sidestepping with weapon raised in APBPConstants.ini: AP_MODIFIER_WEAPON_READY
o The following feature apply when you walk/sidestep with weapon raised:
-> limited angle of view, but you can see more farther when the weapon has a scope
-> better change for interrupts if you see an enemy
-> less APs and BPs when shooting, because the weapon is already raised
-> It should cost more APs when walking. Maybe you can export the additional AP and BP modifier to the APBPConstants.ini

*** Increase squad size to 8 (800x600) and 8 and 10 (1024x768) ***
o Squad sizes (dependend on the screen resolution) can be selected in the start new game screen
o In a multiplayer game, the squad size will always be 6, because it does not work with more soldiers/squad

*** Added UB-1.13 source code ***
o Merged the UB-1.13 source code (Revision: 4721) from svn: http://subversion.assembla.com/svn/ub-source113
o If you want to build UB-EXE or UB-MapEditor, just enable the 2 defines (JA2UB and JA2UBMAPS) in "builddefines.h"
o The UB-Verion reads from "ja2_UB.ini" instead of "ja2.ini"
o There are 2 new XML files
- Layout\LayoutMainMenu.xml
- MapAction\ActionItems.xml
o There are 2 new LUA-Script files
- Scripts\ExplosionControl.lua
- Scripts\InterfaceDialogue.lua

*** Hide enemy health text / enemy hit count ***
o ja2_options.ini: HIDE_ENEMY_HEALTH_TEXT, HIDE_ENEMY_HIT_COUNT
o both new settings only have effect in a singleplayer game
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=128840&page=1


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4885 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-18 11:19:01 +00:00
inshy f6d24a5ff7 -Pack folder Russian to SLF file.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@4884 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-13 14:49:45 +00:00
Wanne c42d68ff0f - Fixed possible assertion in Scheduling.cpp
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4881 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-09 11:13:25 +00:00
Wanne a68e81086b - Bugfix: Allow the game to use 0 KB files for faking missing WAV speeches
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4879 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-09 10:40:47 +00:00
inshy 3b393b7953 -Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1352 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-07 21:02:31 +00:00
inshy b17bb900ea -Fixed some problems with russian letters in IMP page (by ViSoR)
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4877 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-07 20:49:51 +00:00
Wanne 1fc32aa472 - Updated alternate shooting pistol animation for small merc (by PasHancock)
o To use this new animation, just rename it to "S_N_SHOT.sti"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1351 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-01-02 10:40:44 +00:00
Wanne 8da8548db2 - Bugfix: Hotkey 'ENTER' hiring screen fix to exclude conditions for dead mercs in AIM & MERC & when MERC accounts are suspended (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4874 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-01-02 10:20:44 +00:00
Wanne 1e1363c6ad 2011 Release Version: 4870
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4870 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-28 10:51:54 +00:00
Wanne 7ba509cd40 New "mini" Feature: Added possibility to set optional Tag <mAbsolutePrice> in MercStartingGear.xml to define absolute prices for gearkits (by Tais)
- I put both (startup and gearkit selection in BR's) the initializations for gearkit prices into if's that will check if the absolute price is higher than -1 and lower or equal to 32000 (INT16)
- I also added the reading of the tag in xml_mercstartinggear.cpp, to be able to support zero priced gearkits in absolute prices I set the absolute price of a gearkit to -1 on opening tag of a gearkit, if there's an mAbsolutePrice tag set in the gearkit it will override the value, if not nothing happens and all will behave normal
- so nothing will change in 1.13 as it is, it will just give modders the ability to set absolute prices with a new tag

TODO: Maybe we should also add this optional <mAbsolutePrice> tag to the XML Editor in the future.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4868 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2011-12-27 15:39:52 +00:00