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,086 Commits 9 Branches 6 Tags
f5f3bb94deab5fa2ed318c75e5a35814484840bd
Commit Graph
4086 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
rftr 374b125ffc fix initial gearkit costs for AIM members (thanks Toni) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-18 06:40:36 +00:00
rftr 5cfd9660d8 add mousewheel support to the MERC website, similar to AIM's implementation (hover over a merc's face). shift/ctrl modifiers are applied to the mousewheel, just like A/D/left/right keyboard inputs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9329 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-18 05:19:09 +00:00
rftr f63b121ec8 AIM members can now be sorted ascending/descending by name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9328 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-17 16:33:33 +00:00
Shadooow a78f886fd2 Fixed regression caused mercs not to be visible and commandable in undegrounds sectors. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-17 13:39:41 +00:00
Shadooow 682cbda213 Fixed graphic glitches, usually black screen or shadow boxes over the screen, appearing when inside the key ring popup box. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9326 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-16 22:38:32 +00:00
rftr bc829a388e fix jeep/tank check for l_AdjustEnemyStrengthInSector (Mini Events) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-16 18:28:09 +00:00
Shadooow a377eb2aaf Fixed graphical artefacts showing up around the end game videos. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-14 19:27:34 +00:00
Shadooow 26e0cae8e6 Fixed regression where PLAY_INTRO = 0 caused the game to be stuck in black screen after killing Deidranna. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-14 17:52:40 +00:00
Shadooow 74296d396a Fixed regression causing endgame videos to be played in endless loop. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-14 16:52:23 +00:00
Shadooow fae929d517 Added missing headers which prevented the solution to be compiled without LUA_INTRO #define. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9321 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-14 14:37:13 +00:00
Shadooow f360fcbf22 Fixed regression causing cutscenes with deidranna going into endless clocks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9320 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-14 10:16:46 +00:00
Shadooow 9122d7a7a6 CAN_FAN_THE_HAMMER = FALSE now disables the burst mode on pistols 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9319 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-13 19:43:25 +00:00
Shadooow 1b63f1da01 Fixed bug, where scope mode icons were lost after exiting EDB. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9318 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-10 19:29:06 +00:00
Shadooow 0d5c1be5d4 Fixed regression caused by r9305 where maps in some mods like AIMNAS became unwalkable completely. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9317 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-06 06:49:55 +00:00
Shadooow 6bad9f09b2 Fixed some of the tooltips being off by 1 option due to the removal of Stat Progress Bar from r9307. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9316 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-03 21:32:10 +00:00
Shadooow 24f18eeec1 Fixed vanilla bug where grenades and launchers in some maps aren't working properly which manifested either by merc able to throw/toss/launch only 1 tile far or much farther than it should. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9315 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-02 02:29:19 +00:00
Shadooow 06599477a0 changed ctrl + shift + T to be gated behind cheat activation, and it is now labelled "Auto save # cheat" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-01 23:14:09 +00:00
Sevenfm 1e94aea625 Don't apply mortar/GL default penalty for enemy/militia is they cannot have trait skills, improved code to support old skill system. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9313 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-01 18:20:46 +00:00
Shadooow c23d62de02 Makes it so that if ASSIGN_SKILL_TRAITS_TO_ENEMY or MILIATIA is disables then enemies or militia will not get penalties/bonuses from new traits which then should fix the issue where enemies do not use mortars at all when this option is disabled. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9312 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-01 17:49:24 +00:00
Shadooow a184f76753 Fix for grenades being put into inventory instead back into hand if the soldier is stopped from throwing it in middle of animation by game (interrupt/spotting another enemy). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9311 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-28 22:23:33 +00:00
Sevenfm 851f82e2db Russian translation: minor fix. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9310 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-23 13:44:27 +00:00
Sevenfm 81f493aa5a Quick keys Alt + 0..9 and Alt + [~] now work consistently in normal and cheat mode. 
Moved Alt + 1..5 cheat hotkeys to Ctrl + Alt + 1..5

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-20 13:42:59 +00:00
Shadooow a8fec72f2e ALT+g cheat changed from "semi-random" merc to merc of your choosing. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9308 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-19 14:13:00 +00:00
Shadooow a4aa443b32 Stat Progress Bar removed from options and made permanently active. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9307 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-19 13:25:39 +00:00
Shadooow f2d5adca88 Fixed APs to start running being charged twice. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9306 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-19 13:07:20 +00:00
Shadooow 539de4e838 Fixed dead enemies after autoresolve sometimes being placed on non-walkable grids which, if they dropped any items, made such items inaccessible as well. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9305 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-19 10:22:49 +00:00
Shadooow 1c8b6a0f29 fix: force inventory redraw when using the mouse wheel to navigate through your mercs in strategic view. fixes bad inventory render when using a mouse to scroll from vehicle's inventory to a merc, and vice versa (by rftr) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9304 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-17 02:33:23 +00:00
Sevenfm 4f0386be62 ARC: add tooltips to admin actions to show the range of their effect (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-16 18:26:11 +00:00
Sevenfm aaa88a11f3 Fix: shooting through roof. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9302 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-16 15:22:21 +00:00
Sevenfm aa5e2dc4c3 PlaceObject: don't show incompatible face item message when doing autoplacement. 
SwapGoggles: swap face item to helmet if possible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9301 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-15 12:03:54 +00:00
Sevenfm 878447af9f Improved code for flashlight/stock transformation hotkeys. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9300 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-13 16:55:39 +00:00
Sevenfm f51c1b1e8d CalcEffVolume: removed bCheckTerrain as it's not used in the code. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9299 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-13 10:23:53 +00:00
Sevenfm 8d655ceb96 Shift+T: allow transformation into item with the same item size (for example, shovel mode transformation). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9298 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-13 07:22:12 +00:00
Sevenfm 04d14f436f New hotkey Shift+P - transform stock. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-13 06:56:23 +00:00
Sevenfm 3a9d6d65e4 Shift+T: only allow item transformation if item is corpse or resulting item is of the same item class, also check it's not transformation into same item. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-11 11:22:33 +00:00
Sevenfm b8b48e7d2e Only play certain sounds when soldier is visible or if there is player team member near: 
- cow sounds
- crow sounds
- animation based sounds
- lock n' load sound for gun
- enter deep water sound

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9295 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-10 08:24:07 +00:00
Sevenfm 1015614473 Play different sound when object drops into water, depending on object weight and type. 
Play S_WATER_IMPACT1 when bullet hits water.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9294 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-08 10:17:38 +00:00
Wanne 44e4f96c0f Updated Chinese Text files (by kmoi) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9293 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-07 12:46:18 +00:00
Shadooow 5e8fa16cb9 Added missing parenthesis to the code evaluating sightrange NCTH that could lead to issues. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-06 09:24:04 +00:00
Shadooow 9a11ddb375 Removed body inventory region in mapscreen for vehicles completely. There was no image rendered anyway, this way no popup message duplicating status will be shown and consumables won't popup the "Heh?" error either. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9290 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-02 15:39:35 +00:00
Shadooow 1503b32e30 Fixes random merc portraits sometimes appearing in a region where would merc inventory normally be when opening inventory of a vehicle. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9289 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-02 15:20:12 +00:00
Shadooow 9a89bb6793 Set the newly initialized vehicle driver to be NOBODY. This fixes jeep and possibly tank as well in autoresolve to play sounds of player merc. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-02 13:11:34 +00:00
Shadooow 31b17d99d0 Fixed bug in ASD code causing enemy patrols to have 0 elites no matter if ASD was enabled or not. I also changed the ASD feature, for patrols only, to assign tanks and jeeps in place of elites. So if the patrol spawned without any elite it can't have tank and jeep. Robots are still placed instead of regular troops, which however means that patrol full of elites will never have any robots. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9287 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-02 03:41:34 +00:00
Shadooow 52a42d0354 Changed behavior of Select All button in movement box. Now it will select remaining soldiers, if only some of them are selected instead of deselecting them. It will of course still deselect all if all are selected. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 08:46:52 +00:00
Shadooow 6ca75431ae Disallowed to pick up items from openable structures like crates if they are currently closed. This additionally fixes bug where Bobby Ray's delivery wouldn't show up if the player had sector of the delivery currently loaded and there were any unpicked items from previous delivery in the delivery crate. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9285 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 03:39:50 +00:00
Shadooow 0c95fd4f2a Fixed crash in debug mode when opening BR Order Page without any item selected first. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9284 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 00:29:11 +00:00
Shadooow 44eccb5eab Adds mouse wheel functionality to AIM member page when hovering mouse over the merc photo and for browsing Bobby Rays inventory pages. If mouse is over an item's big picture, 'ctrl' + mouse wheel will allow adding or removing items from shopping cart (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9283 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 22:02:13 +00:00
Shadooow ad8edc869e Fixed bug introduced in r9275; not being able to assign mercs to facilities or train militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9282 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 20:44:06 +00:00
Sevenfm 531849f7aa Disabled muzzle flash when trying to fire jammed gun. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9281 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 10:04:21 +00:00
Sevenfm 49989da8b1 Dropping items from hand when being hit: 
- civilians with profile should not drop items from hand as it may break quests
- fixed possible incorrect type conversion which could result in dropping too often if weapon in hand marked as undroppable

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9280 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-27 01:24:11 +00:00