1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,616 Commits 9 Branches 6 Tags
86b23474cfdca5efeb495c5732cd95171825f459
Commit Graph
7616 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wanne e951672c38 Adjusted a few HAM Settings to be more "1.13 like" in the Ja2_Options.INI and removed the ja2_options.ini connection inside the HAM comments (thx to Headrock) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1105 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2009-04-01 21:04:53 +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 bae9954cc2 New ja2.exe (build: 2651) 
New Features:
- Headrock's HAM 2.8:
- Zathras' Multiplayer UI Patch

Bugfixes:
- New option "Force turn mode" is always disabled when playing a multiplayer game
- Max Merc limit in multiplayer was not evaluated when hiring merc
- Press "ESC" while green progress bar on laptop loads -> Buttons are still visible although Laptop is closes
- Fixed szSoundEffects definition
- Minor fix to allow the bullet graphic to render properly when the shopkeeper panel is open.
- Fixed a bug when creating the application, it was only possible to start ONE instance of the game. Now it is possible to start as many instances of the game you would like.
- Temporary fix for game freeze when a path contains duplicate tiles

Also non English Versions (German and Russian) of ja2.exe are available
How to update these Versions from SVN, take a look at the Bears Pit thread:
http://www.ja-galaxy-forum.com/board/ubbthreads.php?ubb=showflat&Number=201700&page=1#Post201700 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1104 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2009-04-01 13:41:26 +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
Starwalker 1e8f07d2db new pics for 2 existing revolvers (Coolberg) 
new pics for C1 and C4 (KenNoOni, adjusted by Coolberg)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1103 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2009-04-01 06:42:21 +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
Wanne 24d426c7d9 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2639 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2009-03-28 15:36:41 +00:00
Wanne e383a4080c Updated RaknetLib.lib to version 3.4 
Added all raknet headers for full raknet support
Added Testclass "TestCB.cpp" which is a test implementation for raknet plugin "File List Transfer". We will use this plugin for file transfer in multiplayer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2638 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 15:30:07 +00:00
lalien 6a740eb82b Temporary fix for game freeze when a path contains duplicate tiles 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2637 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 00:28:54 +00:00
SpaceViking 84299f157e Add "USE_AGGRESSIVE_ASSERTIONS" define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-28 00:13:12 +00:00
Wanne a465bebf14 Fixed a bug when creating the application, it was only possible to start ONE instance of the game. Now it is possible to start as many instances of the game you would like. 
So this is very helpful for debugging and running 4 clients on one single PC (each client needs its own JA2 installation folder).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-26 05:09:52 +00:00
ChrisL c947784561 Minor fix to allow the bullet graphic to render properly when the shopkeeper panel is open. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2634 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-24 23:08:25 +00:00
lalien 0c6801fb61 Fixed szSoundEffects definition 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2633 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-24 20:41:54 +00:00
Wanne 8fe93de1f5 Translated new MP UI messages for German version 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2009-03-22 19:36:20 +00:00