1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,560 Commits 9 Branches 6 Tags
prevActiveMerc
Commit Graph
4560 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lalien a351a03d0c - fixed crash in InternalIgniteExplosion, will disable HE ammo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-14 19:37:08 +00:00
lalien 861ee7d197 - bug fix: Drassen assault not happening regardless of the setting in ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@342 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-10 21:00:57 +00:00
lalien 5abf2dd62f - bug fix for merc screen position in tactical on high resolution 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-10 19:09:02 +00:00
lalien 43b6e98496 - added menu option to enable tracer effect for single shots 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-10 18:53:19 +00:00
MaddMugsy 7731b74109 -added callahan's fix for HE ammo not exploding 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-10 02:51:15 +00:00
MaddMugsy 185f154aa8 -tweaked ai turning in green a little bit to make them look for noises in green (mostly for snipers) 
-enabled tunnel vision attribute on readied weapons (previously only worked on attachments, and non-weapon items)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-09 19:43:24 +00:00
MaddMugsy f673236935 -fixed guns never jamming 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-08 16:31:01 +00:00
Lesh 92b7bd8417 -CTD fix in Tixa in function FindBestPath in PathaAi.cpp 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-07 20:37:08 +00:00
MaddMugsy a5a0dfd11a -fixed guns being chosen from too high a level in "Normal Guns" mode 
-fixed AI not firing guns when able - this should reduce the amount of running back and forth and also the running up to your guys and crouching

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-07 05:40:20 +00:00
Wanne 36db236079 - Enabled some useful Assert-Messages, so we get notifications about errors in DEBUG Mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-06 05:47:28 +00:00
lalien 69c3fc9a06 - Bug fix: Grumm crash 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@329 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-05 23:40:32 +00:00
lalien 25f234e51c - Bug fix: This bug occured in Grumm H2. After playing two rounds of combat, the game freezes right when the END TURN button clicked. The enemy tries to reinforce H2 from several sectors simultaneously (H1 and G2), trying to put too many soldiers into H2 at the same time. As to other sectors, other people have reported the same occurance in Tixa and in Cambria G9, with the exact same symptoms. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@328 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-05 09:49:36 +00:00
AcyForsythe 4d13ec532b Changed "Personality" button text to "Skills" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-04 00:42:56 +00:00
MaddMugsy d10daf6da3 -minor testhit crash fix from Callahan, when pressing ctrl-h 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-04 00:28:47 +00:00
lalien d091bb09f1 - option menu descriptions changed 
- bug fix: CTD in SendReinforcementsForGarrison. Happens in strategic map when a (maybe too large?) group of enemies wants to retake a city sector.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-02 22:44:43 +00:00
Lesh 645598f3d5 good news - i fixed nasty freeze with throwing items through window. make your tests again. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-02 20:02:39 +00:00
AcyForsythe fb568cfbdb - test nothing changed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-02 17:10:35 +00:00
Wanne 8f8ae869c7 - Shortened some German option-texts in the preference screen 
- Centered the "Topware" splash-screen in the German version



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-02 16:53:06 +00:00
lalien f9ed02ede2 - changed starting location for Drassen attack 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-01 22:17:15 +00:00
Wanne 37ef9ad38a - Made some minor cosmetical changes to the Tactical Placement Screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-01 17:45:13 +00:00
Lesh 76bd81f434 Lesh: 
1. patch for "Bug: Enemy turns around in turn based mode!"
2. action strings is added for new actions (e.g. flank left). needed for debug

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-07-01 15:15:25 +00:00
Wanne 5ad73ef703 bugfix: 
- Placement cursor was shown valid (should not be valid), when it was inside the shade area near to the valid area.
- Removed the "flicker" that sometimes appeared on the Tactical Placement screen.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-30 21:25:37 +00:00
Wanne 7bfdcedf5d - Translated missing preference (options) texts from the German build. 
- Edited preferences text and description (English and German)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-30 17:11:41 +00:00
lalien 4c5607bae9 - when enemy retreats he will be added to the adjacent sector, not deleted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@316 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-30 11:11:48 +00:00
lalien 622628f590 - when enemy retreats he will be added to the adjacent sector, not deleted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-30 10:52:00 +00:00
Lesh d38efcb6fa Lesh: 
fix: laptop zoom in/out animation now starts/ends in laptop monitor though it doesn't fit into monitor strictly on 640x480 and 1024x768 ( +/- small offset)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-29 20:45:58 +00:00
lalien b68df576ac - bug fix: No militia are present in the sector (not city sector) for the battle, even though they do appear on the strategy map. Happens when mercs are in sector and a militia group arrives. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-29 17:34:06 +00:00
MaddMugsy 1b14c7391c -removed ap cost and bullet from interface screens when gun has no semi auto fire 
-made a new weapon con: "No Semi Auto"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-29 16:50:01 +00:00
MaddMugsy 2a36de6cd1 -added STRATEGIC_EVENT_SEND_TROOPS_TO_DRASSEN to allow players to disable the initial strike on drassen (Now stop whining you lot!) 
-added some debug msgs that I was using for AI debugging

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-28 18:54:02 +00:00
lalien e076139715 - fixed: single shot AP's in weapon tool tip on auto fire only weapons not shown anymore 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-28 18:03:34 +00:00
MaddMugsy 3b38f5dac5 -removed some hard coded item indexes from ArmsDealerInvInit.cpp & items.cpp 
-fixed canteen merging w/ctrl+click


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-26 17:55:11 +00:00
MaddMugsy 8579bc4a24 -fixed possible negative shopkeeper prices for ammo w/bullets > 100 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-26 16:36:59 +00:00
MaddMugsy df50c0e606 -added explosive ammo code from Callahan 
-disabled tracer light effects on rooftops, since lights don't work on roofs yet

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-26 16:12:05 +00:00
Wanne 7b4ede034f git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@302 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-06-26 11:50:35 +00:00
Wanne f5650b7755 git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@301 3b4a5df2-a311-0410-b5c6-a8a6f20db521 2006-06-26 08:28:18 +00:00
lalien 44a576e861 - added elites to the Drassen attack team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-25 22:45:07 +00:00
lalien ce2d3635cb - added more stats to soldier tool tip 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-24 23:08:14 +00:00
MaddMugsy 40ab1020dc -fixed sniper firing (finally?) 
-added Ready Weapon AP bonuses to two handed weapons (even though none use it yet)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-24 17:57:35 +00:00
lalien 7a4740e248 - added current AP's to soldier tool tip 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-24 17:42:10 +00:00
lalien 1a689e3cbd - soldier tool tips added 
- game options changed


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-24 00:21:08 +00:00
MaddMugsy 290aae0075 -update version date 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-23 21:11:18 +00:00
MaddMugsy f084927d07 -made sure rocket launcher / tank warning doesn't come up for militia 
-made a better fix for snipers not firing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@292 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-23 21:09:51 +00:00
MaddMugsy bfca64d35f -slightly reduced number of enemies climbing on roofs during green status (10+ guys on one little roof seemed a bit much ;) ) 
-Fixed sniper firing when spotting a new enemy

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-23 17:33:17 +00:00
Wanne 4e89b8c333 Commented out the Assertion in "Tactical\ArmsDealerInvInit.cpp -> GetDealerItemCategoryNumber()", so the game can be run in Debug mode. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-23 13:10:04 +00:00
MaddMugsy 1f93b93425 -fix CTH on burst cursor showing up even when it's turned off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-22 23:37:05 +00:00
MaddMugsy a353c2cea8 -fixed GL Bursts so they work w/guns w/out burst mode 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-22 07:01:35 +00:00
MaddMugsy 634537e5ce -disabled sniper orders for soldiers w/sniper rifles w/out scopes 
-added sight checking for snipers when they turn
-removed sniper attitude changes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-22 03:16:16 +00:00
MaddMugsy f83af12336 -restored previous light check changes 
-fixed enemies getting closer w/out firing

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-21 19:16:31 +00:00
MaddMugsy 2c26924256 -put light check back to where it was before 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-21 19:08:59 +00:00
MaddMugsy fe1a16b63b -removed inlightatnight checks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2006-06-21 18:43:27 +00:00