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,623 Commits 9 Branches 6 Tags
latest
Commit Graph
7623 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ChrisL 6f2af55cba Fixed assertion error caused when switching from strategic to tactical with a dead merc in the current team. 
Fixed a bug where hired RPCs would not get items stored in their gunsling or knife pockets.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-23 23:14:49 +00:00
Wanne 52a28a8268 Updated _DutchText.cpp (from Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-22 17:18:40 +00:00
ChrisL f7ffba090e Fixed an assertion error that occurs if you try and save a game immediately after an autobattle has completed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 18:25:17 +00:00
ChrisL 87fbb6f4d9 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. (part 2) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 16:28:13 +00:00
ChrisL 3e8d006329 Added a debug configuration for the MapEditor so that coders can more easily debug problems with the editor. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 16:27:07 +00:00
lalien 226992e00b Fixed Russian translation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-19 09:03:58 +00:00
ChrisL 0e4c2ab79c Updated the shopkeeper display so that items being offered for sale by the shopkeeper display their highest unit cost instead of the stack cost. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-15 20:43:49 +00:00
ChrisL e6f9406ffe Fix sector inventory so that right-click closes the panel when ALLOW_SECTOR_DESCRIPTION_WINDOW is FALSE. 
Removed the "Major Version Update" system from the map editor.  Now, maps will be updated only when they are actually loaded.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-11 14:57:12 +00:00
Wanne 5401332632 Externalization: Restrict female enemies from being in the queens army (except Female Elite enemies)? -> RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE 
INFO: This feature will be available in the NEXT SVN EXE

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1039 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-09-09 16:27:41 +00:00
Wanne eae98df88d - externalization: Restrict female enemies from being in the queens army (except Female Elite enemies)? -> RESTRICT_FEMALE_ENEMIES_EXCEPT_ELITE 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-09-09 16:26:51 +00:00
Starwalker cd7f36fcc8 new Russian descriptions (Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1038 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-09-09 06:24:37 +00:00
Starwalker 0b21577d97 new Russian descriptions (Inshy) 
corrected armours.xml (Inshy)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1037 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-09-09 06:24:09 +00:00
Starwalker b1978e6615 Dragunov SVD was set to 7.62x54R, which does not exist in the original JA2, and there is no ammo of this caliber available. Therefore I set this gun back to 7.62x39mm, as it was in original JA2. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1036 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-09-03 09:51:37 +00:00
Starwalker 54d55fad64 Added a few ammo crates 
Items not fitting their role are no longer taken by some dealers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1035 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-09-03 09:02:01 +00:00
Wanne 3951568f8c Updated _RussianText.cpp (by Inshy) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-31 15:24:00 +00:00
Wanne 602713f0ca Updated build version number for new exe to 2322 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-30 15:07:32 +00:00
ChrisL feb713ff0e Another tweak to the language system for cities.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-29 22:59:38 +00:00
ChrisL 0a1b40237d Updated code to support language specific cities.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-29 16:12:08 +00:00
lalien 3ae10505f4 Fixes for new fonts 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-27 21:45:39 +00:00
Wanne e3dd3f5487 First step in making the Cities.xml useable with other languages (Russian.Cities.xml, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-18 12:49:34 +00:00
lalien b25d33f783 Polish translation from inshy 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1031 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-08-12 23:01:31 +00:00
ChrisL 7e37a07476 Fixed the sector inventory so that you can right click to look at an item's description even if you don't have an On Duty merc in the sector. You still need a merc in sector, but they can be involved in another activity where before they also had to be part of an active unit. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-12 17:09:29 +00:00
lalien 4180a3aa0d - fixed Russian text 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-11 22:59:12 +00:00
ChrisL 382fff0437 Possible fix for the intermittent sector inventory right-click issue. 
Fixed the display AP cost for shooting (when you also have to change facing and/or ready a weapon) so that it correctly matches the APs that are really charged.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-08 23:26:20 +00:00
ChrisL a1a00fbf59 Russian language updates. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-08 18:10:39 +00:00
Wanne 15e7e467e5 New exe build (2296) 
- A* enabled

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-06 19:01:39 +00:00
ChrisL 94ef5885bc Adjusted the ChangeDropPackStatus function to account for "range to backpack" when enemies are in sector. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-06 16:33:52 +00:00
ChrisL 0b25d91e0e Corrected a graphic rendering issue with attachment alignment on the strategic screen. 
Corrected a problem with IMP hiring that caused an assertion error when trying to use the last female IMP profile ID.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-08-05 18:22:22 +00:00
haydent 768ad6ea74 hope to fix mp ctds, line 922 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-25 23:03:43 +00:00
ChrisL 411bec6fc4 More random number adjustments from SpaceViking. 
Adjusted the default file location so that it doesn't point to a specific drive but, instead, creates builds in whatever driver your code is located on.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-23 18:12:48 +00:00
Starwalker 638787a993 changed ranges on a few 9x39mm guns 
raised price of 9x39mm ammo
removed ability to attach PSO-3 scope to AS Val

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1029 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-23 14:31:05 +00:00
Starwalker adb719bc58 New Thompson M1928 pics (Marlboro Man) 
New Thompson Drums (KenNoOni)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1028 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-23 14:29:57 +00:00
Wanne 8afbf5e96b Added the wire cutter item to the default kit bag for each merc 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1026 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-19 18:10:23 +00:00
ChrisL 75c937544a I messed up one of SpaceVikings changes. This corrects it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-18 18:29:30 +00:00
ChrisL ec87dd51e6 SpaceViking's random number and CTH adjustments. 
OIV Graphic alignment correction.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-17 00:16:16 +00:00
Wanne ad96055687 new exe build (2240) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-14 18:48:58 +00:00
ChrisL 6438f9164d Corrected a display problem with the KeyRing popup when playing in OIV mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-07-11 16:49:12 +00:00
lalien db0c13aa8b Changed/translated Russian descriptions 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1024 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-07 15:03:38 +00:00
Starwalker 92c9e564aa added data for S&W M29, M29 SATAN, and Manurhin MR-73 
added a few ammo crates
changed weight and size of C-18
changed weight of Alcohol
added grenade restriction to belt clip (for Molotov cocktail) and to ammobelt pocket

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1023 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-07-01 15:15:54 +00:00
ChrisL a2c73aab6d Fixed the MapEditor configuration so that it will compile a "release" version of the editor instead of the "debug" version that had been created. People should use this updated configuration to generate the Map Editor instead of messing with the defines in the builddefines.h file. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-25 15:33:58 +00:00
Wanne 631ba52d19 - removed debug messages that occurred in release code in tactical screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-25 10:38:19 +00:00
Wanne 06a0249994 I just added a comment to builddefines.h for building the editor: 
You should build the map editor in "Release" mode and not "MapEditor" mode.
You also have to enable the 2 defines in builddefines.h for the map editor.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-20 10:35:51 +00:00
Wanne 192b132fab - updated German.Items.xml (thx to Farmer Toby) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1019 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-10 19:31:36 +00:00
Wanne 6be5f313db - new exe build (2222) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2222 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-08 13:57:43 +00:00
Wanne 0e0ffd5eab new exe build (2222) 
*** This version contains the multiplayer code integration ****
*** You have to start a new game with this EXE ***
*** If you would like to continue your current games, you have to use the ja2_2124.exe ***

For german and russian users, you can download the multiplayer package here:
http://ja2.h758491.serverkompetenz.net/Wanne/MP/ja2_113_mp_2008_06_08.rar

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1018 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-08 13:57:42 +00:00
Wanne cf8e8d75d1 Renamed the existing ja2.exe to ja2_2124.exe and Map Editor.exe to Map Editor_2112.exe. This are the last official versions without multiplayer integration. I will upload in the next minutes a new ja2.exe and a new Map Editor.exe both with multiplayer integration. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1017 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2008-06-08 13:46:39 +00:00
Wanne 8e36b221c2 - removed inventory choice from "start new game" screen in multiplayer mode -> now the inventory choice is defined in "ja2_mp.ini" 
- added new headline text in the "start new game" screen for multiplayer mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-08 13:10:17 +00:00
Wanne 4e954d0c15 - bugfix: Removed "No Gear" button for MERC if playing in single player mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 21:27:10 +00:00
Wanne 5b1405b717 - bugfix Bug-ID: 101: No bloodcats in tactical by bloodcats ambush 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2219 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 21:20:11 +00:00
Wanne 2baa1b7c94 - bugfix: Loading maps in map editor with creatures. They did not show up 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2008-06-07 18:27:56 +00:00