Commit Graph
7637 Commits
Author SHA1 Message Date
lalien e6ac001a61 - removed include dir
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1059 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 21:10:30 +00:00
Overhaul 8e75433dd1 Militia and friendly AI now mark mines for OUR side.
Related to above, militia deadlock fixed
Crash if console hasn't been brought up when text is sent to it fixed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1058 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 20:34:43 +00:00
Wanne 14340ad8ea Updated Project configuration for Release Build with VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1057 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:54:46 +00:00
Wanne 1dc2cb5bc7 Changed console project from multi thread debug to single thread debug, cause otherwise it does not compile
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1056 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:38:33 +00:00
Wanne 1f337d9d51 Updated project files, because they did not compile on my machine under VS 2003
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1055 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 15:23:16 +00:00
Wanne a95882d50a Some small editor changes for compilation
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1054 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 13:13:00 +00:00
Wanne 089e08f202 Small fixes for compiling different language versions (German, Russian)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1053 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-15 11:12:27 +00:00
Wanne e1b2ddab6e Updated the GAME_STARTING_TIME, so the game start at Day 1 and not at Day 0
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@841 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-14 17:57:10 +00:00
lalien ee6980bc5d - added console project for VS 2003
- new shortcut: Ctrl+Y deletes all items of selected type from the sector inventory
- new shortcut: Alt+Y sells all items of selected type from the sector inventory






git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1051 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 13:51:39 +00:00
Overhaul 7384ae7268 Newly placed tanks now drag away old wreckage if present
Console line input only backspaces to beginning of line

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1050 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 08:09:59 +00:00
Overhaul 50314371e5 Increased default deadlock delay to account for reduction of deadlock problems as well as the time it takes to do some things (throw multiple gas grenades, spin the turret wildly, etc)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@840 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-14 08:07:29 +00:00
Overhaul 99e45d697e Fix to make soldier continue towards destination if previous path ended with a special move
Re-integrated LUA and console.  Still many things to finish though.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1048 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-14 04:25:07 +00:00
lalien 0c6b247cf5 - new shortcut: Shift+M moves all items in sector to location of selected merc
- fix for array initialization


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-13 23:32:44 +00:00
Wanne 7be16dc2d2 Added empty CREDITS_MOD.EDT. This file can be altered for mod makers in their own data folder\BinaryData to display the mod credits.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@839 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-12 08:04:51 +00:00
Wanne 2ff5019247 Added possibility, that mod makers can add their credits and display them in the credits screen
The new file is named "Credits_Mod.edt" and is located in the mod data folder\BinaryData
  If that file exists, the mod credits are displayed first, second the 1.13 credits and then the sir-tech credits.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1042 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-12 07:46:02 +00:00
Overhaul dcb990debf Fixed print screen for full-screen mode
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1039 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-10 06:13:44 +00:00
Overhaul ec4d1f6e24 Fix to stackable throwables:
Stop assertion failure for stack of 6 throwables.  
Report correct damage and AP for stacked throwables.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1036 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-09 11:06:57 +00:00
Overhaul d318885593 Brute force to finally make militia show up when they're supposed to
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1035 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-09 08:58:56 +00:00
Overhaul 1bf50d65f4 Fixed a pathing issue where a soldier would sometimes jump the wrong fence
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1034 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 09:29:15 +00:00
Overhaul 6a9a39c096 Fixed animation deadlock when crouched soldier's final destination is to jump a fence.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1033 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 08:42:11 +00:00
Overhaul d8145755c3 Added window around windowed JA2
Replaced Windows console with freeware console implementation.  Activate in windowed mode with \
Added error and quit if JA2 started in window mode in >16bpp color depth
Fix to enemy sector investigation:  Was deducting from redshirts when elites investigated
Fix AWOL militia (need additional fix to prevent them from being redistributed during after reinforcements)
Fix to tanks to add them in their original spot when a new one cannot be found.  Should modify to remove old wreckage in this case.
AI no longer tries to fire mortar when no room for it
Tanks no longer try to throw knives


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1030 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-08 07:02:56 +00:00
lalien 45b0868ace - fixed: shift-R (autoreload) doesnt check if the ammo is accesible/visible
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1024 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-04 22:04:12 +00:00
Starwalker 4030e19f1c update of the German language files by Farmer Toby
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@838 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-04 14:29:38 +00:00
Starwalker 26a74d6050 replaced Milkor pic with a new one made by Tbird
replaced Pistol Suppressor pic with a new one made by Tbird
replaced Rifle Suppressor pic with a new one (you guessed it: Tbird) and renamed it AR Suppressor, as it will no longer be available for sniper rifles
added a Sniper Suppressor (a sound suppressor for sniperrifles, not something that suppresses Snipers themselves), pic by Tbird.
change several sniper rifles to attach Sniper Suppressor instead of Rifle Suppressor
changed all sound suppressor to sink, they are made of metal, after all
added Ares M4 Shrike and HK 417 12", pics by Tbird
added OTs 39, pic by Coolberg
added missing built-in folding stock on Type 85
changed HK MG36E from assault rifle to LMG
changed 5.45x18mm standard ammo to AP/FMJ, because the round has a reputation for piercing soft body armor at shorter ranges (not enough to warrant XAP, though).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@837 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-07-02 07:54:04 +00:00
lalien 5102293774 - reverted resource.h for VS 6/2003 compatibility
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1022 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-07-01 20:48:33 +00:00
lalien 6cf3fbbe5a - added new militia control command
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1020 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 21:19:11 +00:00
lalien a57fff0140 Changed minimum log message size to 10 characters to prevent commits with empty log messages.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@1019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 14:13:41 +00:00
lalien 6590737dde Changed minimum log message size to 10 characters to prevent commits with empty log messages.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1019 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-29 14:13:41 +00:00
Overhaul e6024e5151 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@1017 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2007-06-29 10:40:05 +00:00
Wanne f44775c9c4 Updated German.AmmoStrings.xml and German.Items.xml (thx to Toby)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@836 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 18:16:57 +00:00
Starwalker d615d72e98 removed built-in Foregrip from FAL OSW, but allowed attachable Foregrip and Bipod instead
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@835 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 14:19:17 +00:00
Starwalker 2936482538 forgot to remove the built-in foregrip from the M60E3 :-(
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@834 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 12:38:02 +00:00
Starwalker b41a2a1fcb replaced pics of PP-93, Contender Encore, and Wildey with new ones made by Tbird
changed damage of about 65% of the guns, to have a more realistic relation between all the different calibers.
MG43 has now a default bipod instead of a built-in one
M60E3 has now a default foregrip instead of a built-in one
Ultimax has both bipod and foregrip built-in now

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@833 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-27 12:24:32 +00:00
Starwalker 88d8cf3616 forgot a BigItem pic (being of old age, and such...)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@831 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-21 11:47:12 +00:00
Starwalker 9df5df86bd Steyr Scout got built-in bipod and thus lost the ability to mount one as an attachment
Larger XM-8 guns got the ISM-V-IR as a defaut attachment
replaced pics of folding/retractable stock with new ones by Tbird
added last missing LBE item for inventory project (pics by Marlboro Man)
replaced a few LBE tileset pics (also by Marlboro Man)
corrected a few grammar/spelling mistakes in gun descriptions

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@830 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-21 11:45:59 +00:00
Wanne dc441a425d Added Overhaul's Lua lib to the project. Now it works without Lua51.dll
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@996 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-20 19:11:58 +00:00
Starwalker c604c92fe7 added more LBE items for the inventory guys (pics by Marlboro Man)
changed HEZI from assault rifle to rifle
replaced Metalstorm Surf Zone pic with a new one made by Tbird

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@829 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-19 06:16:43 +00:00
Starwalker 7c0772721f added Grippod and ISM-V sight (pics by Marlboro Man)
added 5 deactivated LBE-thingies for the inventory guys (pics by Marlboro Man)
replaced Makarov PM pic (Tbird again)
corrected NVG and Sungoggles boni and penalties (somehow they had become multiples of 8 instead multiples of 10)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@828 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-15 09:34:48 +00:00
SpaceViking 2cd3521e3f Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@973 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:05:04 +00:00
SpaceViking ac41de3515 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@972 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:01:57 +00:00
SpaceViking 2b59950880 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@971 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 03:00:15 +00:00
SpaceViking 1ff6f798c3 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@970 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:57:50 +00:00
SpaceViking d24bb86686 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@969 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:57:16 +00:00
SpaceViking 183ee2005f Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@968 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:56:45 +00:00
SpaceViking 88b9b38bd6 Update inventory arrays to be vectors. Add class for inventory. Change some structs that use inventories to classes to provide constructors, destructors, etc. Note that with this update all file operations should still be compatible with previous files.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@967 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-15 02:56:15 +00:00
Starwalker 9bf393a7b8 replaced pics of Makarov PM and PMM, and Vis-35 with new pics by Tbird
added other pics for later use

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@824 4f8fa57e-7814-0410-bad4-adc449f26b7c
2007-06-14 12:38:35 +00:00
Wanne 4d51fbcdd9 PROJECT CHANGES (already done for VS 2003):
- Changed "Runtime Library" from "lua" project to "Multi-threaded Debug (/MTd)" so we get rid of "Linker Warning LNK4098" in project "ja2"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@940 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 19:42:03 +00:00
Wanne df9d9e6c00 PROJECT CHANGES (already done for VS 2003):
- Added "lua" project folder to the "Additional Include Directories" for each project
- Added "lua51_vs2003.lib" to the "Additional Dependencies" for project "ja2" 
Project should now compile in VS 2003 without any errors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 18:48:46 +00:00
lalien e78b4ea242 - fix for Russian version
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@934 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 15:47:03 +00:00
lalien 5299427465 - added project and lib files for Lua
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2007-06-10 13:58:34 +00:00