Commit Graph
7634 Commits
Author SHA1 Message Date
Wanne c54e61ce75 Bugfix: Morale and ice-cream truck (by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 19:10:04 +00:00
inshy 434a45c4d3 Translated new text for Russian version.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2820 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 12:35:50 +00:00
Wanne bd6448278c - Forgot to add the "," character after a text line
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2819 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 11:57:02 +00:00
Wanne 43e4bb5892 Updated chinese files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2817 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 11:33:11 +00:00
Wanne 753dc7d605 - Merged/updated text files from multiplayer project branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2816 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-07 11:31:56 +00:00
Wanne 4596b79383 Added ShippingDestinations.xml files for Chinese, Dutch, Italian and Polish version (but they are all in English yet)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1125 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 13:26:06 +00:00
Wanne b169986d98 - Added German.ShippingDestinations.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1124 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 13:22:53 +00:00
Wanne 0f75db42e1 - new Russian.ShippingDestinations.xml for Data-1.13\TableData\Map folder
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1123 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 12:43:01 +00:00
inshy 4f729c8275 Added ShippingDestinations.xml for russian language.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1122 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 11:17:34 +00:00
Wanne 6824994f6f Deleted "old" ja2.exe files, because a lot of player are confused which exe to use
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1121 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-05-06 07:55:09 +00:00
Wanne 1ec9fda897 - Merged/updated text files from multiplayer project branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2806 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-06 07:54:04 +00:00
Wanne a0a79078ab - Bugfix: Wrong savegame version (104 instead of 106) was used for Daeltar's Airport externalization and so we could not load older savegames (without airport externalization)
- Enabled USE_AGGRESSIVE_ASSERTIONS in Debug.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2804 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-05 20:25:02 +00:00
Wanne a93c08a1b5 Bugfix: Game crashes at startup when Release version is compiled, ONLY with Visual Studio 2008 (by birdflu)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2799 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-03 08:59:07 +00:00
SpaceViking a55dd4154d Fix signed/unsigned problem.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2797 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-02 15:34:52 +00:00
Wanne 51d3771927 - Bugfix: NIV fix with displaying town names (by jonas bearpit)
- Removed the RakNet warnings when building a Release version (I added the missing PDB file)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2795 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-02 15:19:30 +00:00
SpaceViking 3cb0624342 Change to use vector for pre-RNG array
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2792 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-02 05:44:25 +00:00
SpaceViking e1a56677f4 Move random functions to .h and inline them. This will speed up the code overall given their high usage.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2788 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-05-01 03:08:54 +00:00
Wanne 1c28b04c9c Bugfix: Glitch with NIV mouse region (by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2787 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-30 13:08:55 +00:00
Wanne a9b029e854 - Corrected spelling mistakes in _GermanText.cpp (thx to Scheinworld)
- Merged text files from multiplayer branch

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2786 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-30 12:27:27 +00:00
Wanne 8935f20145 - Merged/updated text files from multiplayer project branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-28 19:47:30 +00:00
SpaceViking 6f6ffe91f8 Fix problem with invalid X,Y coordinates
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-27 23:50:45 +00:00
Wanne 5840adc4ec Bugfix: negative APs didn't actually have any effect on the next turn because they were being reset to 0 before they could have any effect (by Headrock)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-24 16:00:41 +00:00
Starwalker 985adf8d7e color correction on ammo pic
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1120 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:28:26 +00:00
Starwalker d739afed6b added ammo (9x18mm AP and 7.62x54mm Match)
decreased size of Extended Ears
changed Destruction-merges so that the result is a rag, to avoid CTDs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1119 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:23:04 +00:00
Starwalker 1f938f9820 added pics for some ammo (9x18mm AP and 7.62x54mm Match)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1118 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-22 07:20:45 +00:00
Wanne 7a39fa6d22 - Added new files for Dealtar's and Zilpin's Airport Externalization (no new EXE build yet)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1115 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-21 20:31:57 +00:00
Wanne 598709f33d - Added Dealtar's and Zilpin's Airport Externalization
- Needed GameDir files are already committet to SVN GameDir

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-21 20:27:56 +00:00
Wanne d393b157b0 - Added EMAIL.EDT for German Version, because we now have the Aiport Names externalized.
.) The only record that is changed is Record 200 in EMAIL.EDT. Just replace the hardcoded "Drassen" name with $DESTINATIONNAME$
.) In this case the airport town names are dynamically read from the new XML file
.) @INSHY: Please also add the updated EMAIL.EDT file for the other languages into the Data\BinaryData folder

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-21 20:21:50 +00:00
ChrisL ffcbf940e2 Forgot to include these updated ini files with the build.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1114 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-16 15:23:13 +00:00
ChrisL dffb0fc7fe Found a bug in the russian text file that was preventing the creation of russian builds.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2738 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 22:31:39 +00:00
ChrisL b69207b743 Disabled some of the charges associated with the Increased Aiming Costs option.
Corrected a AP display issue when you had to turn while a weapon was not in a ready position.
Updated build version.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 21:43:14 +00:00
Wanne 935e46ac98 Added translated multiplayer sti buttons for german version
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1112 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-13 14:07:51 +00:00
Wanne e48fa6abb9 Added new multi language STI buttons for multiplayer. They need to be translated to the current language version. Only German is currently translated
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-13 14:07:14 +00:00
Wanne f927aa7388 - Translated MP Text in _GermanText.cpp
- A few minor adjustments

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-12 23:01:40 +00:00
Wanne 6ef237c6ed - Updated a few "wrong" default values to "correct" ones. In multiplayer we read the default ja2_options.ini. Problem was, that min. and max. CTH was set to 0, which resulted in zero CTH
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2725 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-11 23:30:54 +00:00
Wanne 6f1ff32867 Updated Ja2_mp.ini (new entries for file transfer, not used yet)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1111 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-11 18:45:44 +00:00
Wanne 305d3e4cea - Added the new strings from the multiplayer branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-11 18:38:52 +00:00
ChrisL a2740bfbdb Bugfix: APs to shoot when weapon not ready and we have to change facing was displaying wrong.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-11 00:24:35 +00:00
Wanne 17982418b5 New entry "FILE_TRANSFER_DIRECTORY" in Ja2_mp.ini (not used yet)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1110 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-10 18:27:05 +00:00
Wanne 17279936bc - Added the new strings from the multiplayer branch
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-10 18:23:34 +00:00
Wanne 9b9e22f09d - Fixes/Improvements to Option screen (by Arynn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-10 10:36:08 +00:00
ChrisL 36eb308270 Made an APBPConstant a little clearer. Before it was labeled as part of the suppression system when in reality it's not.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2701 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 20:43:52 +00:00
ChrisL 23a8f63bd8 Corretion to the 100AP/HAM integration. Also made an APBPConstant a littler clearer (hopefully).
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 19:25:24 +00:00
ChrisL 72174db37c Updates to the HAM/100AP integration.
Added Min/Max Suppression Tolerance values (from Headrock).
Bugfix: Took away the ability to reload a weapon from the item description box while using an ammo crate.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 15:28:41 +00:00
inshy 9a65840def Translated new text for Multiplayer and HAM.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-09 13:58:17 +00:00
Wanne b6ad004e58 Updated Price Modifier in Ja2_Options.INI
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1109 4f8fa57e-7814-0410-bad4-adc449f26b7c
2009-04-08 18:26:45 +00:00
ChrisL f91bc180ad The valid range for Price_Modifier is (-1)-100. -1 & 0 were added as options some time back to allow the game to dynamically adjust the Price_Modifier value based on game progress.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-06 17:53:44 +00:00
ChrisL 1d6f96553a The valid range for Price_Modifier is 0-100. 0 was added as an option some time back to allow the game to dynamically adjust the Price_Modifier value based on game progress.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-06 17:50:23 +00:00
Wanne bd98b767f5 Bugfix: Tactical Interface is still locked after QuickLoad (by Zathras)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-03 15:14:36 +00:00
Wanne bfb4561fa9 - New Release Build (2660)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2009-04-02 07:59:46 +00:00