1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 067a3a5899 Bugfix: Memory Leak in CIniReader::ReadString (by Arynn) 
Fixed an array off by one issue in game setting structure (by Arynn)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2869 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-19 06:24:06 +00:00
Starwalker a024c136a1 corrected the number of choices for the "50%"-group 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1127 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2009-05-15 07:02:34 +00:00
SpaceViking 2208e05f65 Improve reading of boolean .ini settings 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2858 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-15 02:07:23 +00:00
SpaceViking bd74fac6cc Add checks around all use of bMercOpinion 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2854 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-13 22:32:44 +00:00
Wanne c8c547eba9 Updated translations of _ChineseText.cpp and _GermanText.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2850 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-13 08:08:25 +00:00
Wanne 0e1c8b48bd Bugfix: Error occured when loading savegames with Release EXE compiled in Visual Studio 2008 (fixed by birdflu) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2849 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-13 07:59:49 +00:00
Wanne 2e99cbe784 Improved Game Settings (by Arynn) 
- fixed corruption of ja2.set
- ja2.set will no be saved to ja2_settings.ini
- a few more minor game setting fixes and error tracings


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2844 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-12 11:52:35 +00:00
inshy c9117c2939 With rev. 2837 all translated text (in rev. 2820) was replace with English. Be careful in the future, it is the not first case. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2842 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-12 10:55:37 +00:00
inshy b664d1fc93 Chinese version of MPGOLDPIECEBUTTONS_CHINESE.STI 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@2840 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-12 08:17:45 +00:00
SpaceViking 46279f61b9 Change test for doors to use team ID 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2838 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-11 12:39:34 +00:00
Wanne 516e08e905 - Merged/updated text files from multiplayer project branch 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2837 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-11 11:26:38 +00:00
Wanne 4df4073cd0 Improved temporary Bugfix: Freeze when shippment from Bobby Rays arrive (by Arynn) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2836 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-10 21:12:39 +00:00
inshy ff7430099e Translated all new items for Russian xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1126 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2009-05-09 20:17:38 +00:00
Wanne 4e5939a289 Temporary Bugfix: Freeze when shippment from Bobby Rays arrive. It is only a temp fix, I don't know which side effects on the shippment this fix has. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-08 21:09:26 +00:00
Wanne 85c27b5d28 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2831 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2009-05-08 13:54:43 +00:00
Wanne b0eb1baf7e Bugfix: Enable all terrorists in game, if all terrorists should be available (defined in the ja2_options.ini) (fix by Sandro) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2830 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-08 13:37:22 +00:00
Wanne c989565c44 Fixed Compiler Error: Replaced "#include afxres.h" with "#include "windows.h" in Res\ja2.rc, because it did not compile on a few machines. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2829 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-08 13:34:29 +00:00
SpaceViking eaa8de9771 Fix typo in struct name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2828 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 23:32:39 +00:00
SpaceViking fa61452e4c Change some limits for merc attributes and rain durations. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2827 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 23:31:17 +00:00
Wanne a0b75319ad Bugfix: Problems with refreshing fast help text in mapscreen (by jones bearpit) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2825 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-05-07 20:07:22 +00:00
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