1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,097 Commits 9 Branches 6 Tags
613e59b2c68d46ee439e32dfdab32cb71f78979e
Commit Graph
1097 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 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
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
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 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 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 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
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
Wanne d593be35c4 - Removed a CPU intensive AI calculation function which was used by HAM (thx to Headrock) 
- Fixed some compilation warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2655 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 20:02:28 +00:00
Wanne 538c62455a - New Release Build (2651) 
- Removed test code for multiplayer file transfer (we have now a new branch for multiplayer: https://81.169.133.124/source/ja2/branches/Wanne/JA2 1.13 MP)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2653 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 13:49:36 +00:00
Wanne 335747c3ff Added Headrock's HAM 2.8 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2650 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-04-01 12:20:30 +00:00
lalien 5f9261273a Removed assertion in Random.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-31 12:15:33 +00:00
Wanne 5a232eb15f Multiplayer: Transfered files are now saved in the correct location on the client side (I just replace the server executable directory from the file with the client executable directory) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2642 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-30 07:07:04 +00:00
Wanne b3efb29dd7 Updated Project file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-29 18:27:02 +00:00
Wanne bb6e7c4521 Multiplayer: We can now send files from server to all clients. I just send two dummy files (Items.xml, German.Items.xml) from server to all clients and save them on the client in the JA2 root directory. 
The files are send as soon as the client connects.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-29 18:17:33 +00:00