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
3,766 Commits 9 Branches 6 Tags
89e0fd33ec6f14e041c08bb64186b622ceaf2a4b
Commit Graph
3766 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sevenfm 89e0fd33ec Get rid of buggy-style odd hits when a merc is on the middle of roof, not at enemy's line-of-fire, and prone. Shortly, suppression still affects hiding roofers, but accidental hits do not (by sun_alf). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-07 18:18:39 +00:00
Sevenfm 6e0a311c4c By default sort AIM names in descending order (original behavior). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-05 18:14:04 +00:00
rftr 8d952591fd fix assert/crash when a spy is hiding or gathering intel in the 2 rightmost columns. this was caused by an overflow in the fSectorsWithSoldiers array when doing the hourly assignment update 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-05 05:38:27 +00:00
Sevenfm b2ea45b182 ESC for multiple selected mercs: first stop mercs, next press unready weapon. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-02 15:39:58 +00:00
Sevenfm 0782dec389 ESC: unready weapon for all selected mercs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-02 15:28:41 +00:00
rftr 2747f9cee0 Fix: Assertion failures on militia strategic commands (by sun_alf) 
* Discarding a route can result in failure"Path exists, but no waypoints were added!	AM-0".
* Waypoints can be not deleted upon arrival to final destination.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-02 04:27:02 +00:00
rftr 746d15a1ba remove magic numbers from the usLimitedToSystem bitflag 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-02 01:11:25 +00:00
Asdow c334d4a0d4 Optimize RandomMagazine() called when deploying to tactical sector (by sun_alf) 
Timings
Before:
RandomMagazine: 90044 us (total 90044 us)
RandomMagazine: 90007 us (total 180051 us)
RandomMagazine: 100009 us (total 280060 us)

After:
RandomMagazine: 0 us (total 0 us)
RandomMagazine: 0 us (total 0 us)
RandomMagazine: 0 us (total 0 us)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-31 15:10:19 +00:00
rftr 094c2edbde Fix: incorrect path rebuilding in RebuildWayPointsForGroupPath() (by sun_alf) 
Additional correction to RebuildWayPointsForGroupPath(): we should not skip "next" sector if we are between sectors. (Original comment stated opposite which was confusing)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-31 05:08:49 +00:00
Asdow 3577ffa91a Improve SurfaceCache error messages 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-30 13:05:56 +00:00
Sevenfm 508adc4eee Show "Select All" line in strategic movement popup box only if we have more than 1 movable squad in sector (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-29 18:58:33 +00:00
rftr 75d98aecfd add "Disguise" menu to tactical skill menu (alt + rightclick) 
add "Fill canteens" action to tactical skill menu, under "various" 

adapted from Seven's +AI

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-29 06:02:44 +00:00
rftr 4689369f83 adjusted AI SAM site repairs: 
- SAM sites are no longer repaired instantly when AI takes control of a sector
- repairs begin 24 hours after the AI takes control, and repeat every 24 hours until the SAM is back at 100%
- repairs can be interrupted by the player regaining control of the SAM site
- time to repair a fully-destroyed SAM site depends on difficulty: novice takes 5 repair cycles, experienced takes 4, expert 3, and insane 2
- moved RepairSamSite() from ASD.h (where it was unused) into strategicmap.h
- this sets up the existing but previously unused strategic event hook EVENT_SAMSITE_REPAIRED

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9349 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 21:44:43 +00:00
rftr bd5b14358d Fix: incorrect path rebuilding in RebuildWayPointsForGroupPath(), incorrect GroupAtFinalDestination() detection (by sun_alf) 
*  RebuildWayPointsForGroupPath(): incorrect manipulations with 'iOldDelta' and 'iDelta' lead to skipping a node in 'pHeadOfPath' and to assertion failure as a result:
   AssertMsg( FALSE, String( "Invalid DIAGONAL waypoint being added for groupID %d. AM-0", pGroup->ubGroupID ) );
* GroupAtFinalDestination(): should take into account the amount of WayPoints, otherwise multiple visiting of a sector is not possible (group end up in that sector at first entrance):
   if( ( pGroup->ubSectorX == wp->x ) && ( pGroup->ubSectorY == wp->y ) )

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9348 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 21:00:13 +00:00
Sevenfm 90850826bb Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 07:36:41 +00:00
Shadooow f130e5676c Fix for PMC/militiaroster email being sent over and over. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-26 06:24:10 +00:00
Sevenfm 9acaa41e95 Added Autobandage option to Skill Menu. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-25 10:50:18 +00:00
Shadooow 033ae4a191 Added two new tags into Items.xml, <FoodSystemExclusive> and <DiseaseSystemExclusive> which prevents specific items to appear without these systems enabled. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-24 05:40:46 +00:00
Shadooow c704e37586 WRITE_PROFILE_DATA_TO_XML = TRUE will now also outputs a MercStartingGear.xml, useful to convert data from prof.dat into new xml format automatically. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9342 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-23 03:20:44 +00:00
Shadooow 7baeb20175 INI option SOLDIERS_ALWAYS_WEAR_ANY_ARMOR works improperly at 100% game progress, so that a soldier lacks 1, 2 or all 3 armor items ('naked' guy). (by sun_alf) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-22 22:12:07 +00:00
Shadooow 3e4295c70b Corrected prototype and definition of the function ChooseArmourForSoldierCreateStruct to match and removed line breaks from withing function prototypes. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-22 20:43:08 +00:00
Sevenfm 39bbc63884 Fix: clear TEAM panel left/right area. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-22 15:23:31 +00:00
rftr 87b0c7c6b7 new feature: madlab's robot can be upgraded 
requires gamedir r2642

https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=364403

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9338 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-21 17:34:49 +00:00
Sevenfm f7315115af Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-21 07:36:22 +00:00
rftr e48c16eb67 fix: load feature flags after external options are loaded 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-21 05:33:54 +00:00
rftr fb3a9d40b2 remove initialisers from rebel command structs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-21 05:30:53 +00:00
Shadooow f0c6e32f05 Fixed exploit allowing to duplicate drag able structures by opening/closing them during dragging. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-20 05:08:09 +00:00
Shadooow 3919a648d0 Fix for PercentEliteBonus from DifficultySettings.xml not applying onto enemy armies with both admins and regular troops correctly. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9333 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-19 21:51:42 +00:00
Shadooow 14ae31c4f1 Partial revert of previous commit from unrelated changes that prevented the build to compile. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-19 02:41:43 +00:00
Shadooow c3bb1c0da5 Option SHOW_SKILLS_IN_HIRING_PAGE removed and made to be enabled automatically. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9331 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-18 22:05:29 +00:00
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