Commit Graph

Select branches

Hide Pull Requests

RenderTiles-Refactor

cache-test

cleanup

decideaction

majcosta-patch-1

master

pr_emergency_v5

prevActiveMerc

starting-gear-tags-fix

#100

#101

#102

#103

#104

#106

#107

#108

#110

#112

#114

#116

#117

#119

#120

#121

#124

#125

#127

#13

#133

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#149

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#168

#169

#17

#171

#172

#173

#174

#176

#177

#18

#183

#185

#186

#187

#188

#189

#19

#191

#193

#194

#195

#196

#198

#20

#201

#202

#203

#205

#206

#207

#208

#209

#21

#210

#213

#214

#215

#216

#218

#219

#22

#220

#221

#222

#224

#225

#226

#228

#229

#23

#231

#232

#233

#234

#235

#236

#237

#238

#239

#241

#242

#244

#245

#246

#247

#248

#249

#255

#256

#258

#259

#26

#260

#263

#268

#269

#270

#271

#273

#274

#275

#278

#279

#282

#283

#284

#284

#289

#293

#295

#296

#297

#30

#300

#302

#304

#31

#32

#320

#321

#322

#323

#324

#325

#327

#328

#329

#33

#330

#331

#338

#341

#343

#344

#345

#346

#347

#348

#349

#351

#352

#353

#354

#355

#356

#357

#369

#372

#373

#375

#377

#378

#380

#382

#383

#385

#386

#387

#388

#389

#392

#393

#394

#395

#396

#397

#398

#4

#40

#400

#401

#402

#403

#404

#407

#408

#409

#41

#410

#412

#413

#416

#42

#421

#422

#423

#424

#425

#427

#428

#429

#430

#432

#433

#435

#437

#438

#44

#441

#442

#443

#444

#448

#450

#451

#453

#456

#457

#461

#462

#468

#469

#471

#472

#474

#475

#476

#477

#478

#481

#485

#486

#487

#488

#49

#490

#491

#492

#493

#494

#495

#497

#499

#503

#507

#511

#512

#513

#514

#515

#516

#519

#52

#520

#521

#522

#523

#524

#525

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#541

#542

#543

#544

#545

#546

#547

#548

#548

#549

#55

#550

#551

#553

#555

#556

#557

#558

#559

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#571

#573

#574

#575

#576

#577

#578

#579

#581

#582

#583

#584

#585

#586

#588

#59

#591

#592

#595

#597

#599

#60

#600

#601

#602

#603

#605

#606

#607

#608

#609

#61

#610

#611

#612

#614

#615

#616

#617

#617

#618

#618

#619

#62

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#64

#640

#641

#642

#643

#644

#645

#646

#65

#652

#653

#654

#655

#656

#657

#658

#659

#66

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#67

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#68

#680

#680

#69

#70

#71

#72

#74

#75

#76

#77

#78

#79

#8

#80

#81

#85

#86

#87

#88

#89

#9

#93

#95

#96

#97

latest

v1

v2

v3

v4

v5

Mono Color

• ff8a656040 Smoothen ballistic shield 'movement' by taking soldier position offsets into account Flugente 2017-08-30 19:33:23 +00:00
• fb61c74e40 - fix min/max bug in EVENT_SoldierApplyItemToPerson Sevenfm 2017-08-29 18:07:43 +00:00
• edbee58ca7 Fix: soldier alert status was not set correctly (by sevenfm) Flugente 2017-08-29 17:57:16 +00:00
• 49ca74848f Disable inventory popups for vehicles, as they don't need equipment and huge inventories result in display errors Flugente 2017-08-28 22:33:26 +00:00
• 8e85ce5acf When stacking ammo or kits, make the partially full object be the first instead of last on the stack Flugente 2017-08-28 22:11:02 +00:00
• 52558851f9 Fix: accidental commit Flugente 2017-08-26 21:58:47 +00:00
• 404e6f18ef Fix: stat loss on torso hit never causes STR loss Flugente 2017-08-26 21:57:22 +00:00
• a8197d5db7 Fix: crash when attempting to create illegal item Flugente 2017-08-26 21:18:02 +00:00
• 5f5b1f27c4 Fix: crash when clicking on empty inventory slot Flugente 2017-08-26 19:49:05 +00:00
• 04ce05bdf3 fallback solution if no image is found Flugente 2017-08-26 16:10:15 +00:00
• 0da98cc687 Trade menu background is no longer generated by random noise, but by cutting out a section of a much bigger picture. Flugente 2017-08-26 15:51:37 +00:00
• 16b4597d77 added shopkeeper background image Flugente 2017-08-26 15:43:12 +00:00
• 28ca52e2ed - Fix: possible mismatch of individual militia profiles if trained militia were immediately promoted - Fix: Armour/Misc. resources also limit training of green militia - cleaned up button deletion Flugente 2017-08-25 20:15:15 +00:00
• e1f1437a95 Fix: some mercenaries can't refuel vehicles Flugente 2017-08-15 13:48:02 +00:00
• 8381e2395b Fixed typos (by 3iff) Flugente 2017-08-15 12:28:01 +00:00
• 874a006d06 Gear templates: multiple ammo item choices are possible via wildcards, but if item is a match, use ammo specified there Flugente 2017-08-15 12:20:27 +00:00
• 561f6387cd - Fix: individual militia are not properly disbanded if player runs out of funds - Fix: wrong website names used - Removed confusing links on militia overview website Flugente 2017-08-15 11:57:10 +00:00
• 8e6cff9b5d Gear templates: An entry with '0' and a valid ammo item will try to fit that ammo to any gun used in the slot Flugente 2017-08-12 12:45:33 +00:00
• b64e0d0f91 Fix: enemy airdrops could cause a deployment screen when there shouldn't be one Flugente 2017-08-10 22:54:07 +00:00
• 54f9238ec0 Fix: weather occured underground Flugente 2017-08-10 21:44:49 +00:00
• b044a3a24f Trade menu background is now generated with the use of random noise. Flugente 2017-08-09 20:28:56 +00:00
• f4cbb59720 - DisplayLoadScreenWithID: use strcmp to correctly compare strings - CalcThrownChanceToHit: fix integer calculation - CalcBestThrow: allow CTH bonus for mortars, new less restrictive CTH check to allow attack Sevenfm 2017-08-09 14:32:16 +00:00
• 1646dd4606 When planning enemy helicopter attacks, increase the perceived threat from mercs Flugente 2017-08-08 00:01:08 +00:00
• faf2d272bc Loading a gear template also fills up canteens if the sector has drinkable water Flugente 2017-08-06 22:56:30 +00:00
• f7423782db New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process. Flugente 2017-08-06 21:06:49 +00:00
• 1eb0d7428f New Feature: gear templates allow us to save and load a merc's equipment, thereby speeding up the equipment process. Flugente 2017-08-06 21:04:13 +00:00
• 35cdd64a92 Fix: redraw ammo count in EDB if button is dirty Flugente 2017-08-06 20:20:18 +00:00
• 1e7a5772d0 Fix: message log occasionally appears and disappears in strategic view Flugente 2017-08-06 20:18:32 +00:00
• 99c72e4b3e - added ENEMY_JAMS option Sevenfm 2017-08-06 04:51:19 +00:00
• de22a5f9ab Print a warning if a riot shield is destroyed Flugente 2017-08-01 17:35:34 +00:00
• 31ac8cb8d6 - Added riot shields for Grizzly, Raider and It - slightly adjusted shield strength Flugente 2017-07-31 19:15:48 +00:00
• a7bb8b9fe9 If placing an item fails due to invalid item size, at least inform the player before crashing the game on purpose Flugente 2017-07-31 17:46:50 +00:00
• 41056de164 Fix: wrong text displayed Flugente 2017-07-30 09:31:15 +00:00
• 11729a132e New feature: riot shields protect against damage from some directions. Flugente 2017-07-29 21:18:13 +00:00
• 9b898706e0 New feature: riot shields protect against damage from some directions. Flugente 2017-07-29 21:11:32 +00:00
• 8a82802932 - Fix: crash when handling flashing items - Fix: bad argument Flugente 2017-07-26 13:57:29 +00:00
• 0992a423e7 New feature: mercs with a gun-related trait (New trait system only) can use the 'Focus' skill via the skill menu ([$] in tactical). This skill grants an interrupt modifier bonus in the targeted area, but also a penalty outside of it. Flugente 2017-07-26 13:49:38 +00:00
• 00c754db33 New feature: mercs with a gun-related trait (New trait system only) can use the 'Focus' skill via the skill menu ([$] in tactical). This skill grants an interrupt modifier bonus in the targeted area, but also a penalty outside of it. Flugente 2017-07-26 13:23:51 +00:00
• 7b00af164b - mercs are now used as prison guards regardless of sleep state - volunteers are now gained with a logarithmic rate, as otherwise the volunteer feature becomes pointless lategame Flugente 2017-07-25 20:46:28 +00:00
• 99fbc7cc9f volunteers are now gained with a logarithmic rate, as otherwise the volunteer feature becomes pointless lategame Flugente 2017-07-25 20:36:17 +00:00
• fe45820b02 slightly improved cursor calculations Flugente 2017-07-25 20:31:32 +00:00
• 1a87aa3b1f Improved the draw functions for the graphical explosion warning (TIME_BOMB_WARNING = TRUE): - underlying terrain can still be seen - Fix: graphical glich while scrolling Flugente 2017-07-25 19:08:10 +00:00
• 8d3d77ad84 Trait change: Ambidextrous trait reduces cth penalty for having any item in offhand, not just if it is a handgun (PENALTY_TO_SHOOT_DOUBLE_GUNS_REDUCTION) Flugente 2017-07-25 18:24:39 +00:00
• 91fd754aa9 Trait change: Ambidextrous trait reduces cth penalty for having any item in offhand, not just if it is a handgun (PENALTY_TO_SHOOT_DOUBLE_GUNS_REDUCTION) Flugente 2017-07-25 18:23:35 +00:00
• 60233d2f8d The total weight of the equipment carried by a merc is now displayed in a tooltip. Flugente 2017-07-25 17:28:39 +00:00
• 57c9e16523 New feature: guns can be cannibalized via merge, increasing the status of the first gun while lowering that of the second gun. Flugente 2017-07-25 17:13:43 +00:00
• 6e99ccd766 Rebel basement trader can sell sawed-off shotgun Flugente 2017-07-25 15:36:48 +00:00
• bf82855a5f Improved some backgrounds and gear kits Flugente 2017-07-16 16:41:00 +00:00
• 6ce47c4cef - new option: ENEMY_JAMS in [Tactical Gameplay Settings] allows enemy gun jams - take into account unjam AP cost for jammed weapon - improved AI_BETTER_COVER option Sevenfm 2017-06-21 07:40:36 +00:00
• 3c4da04532 Cleaned up attachment removal code Fixed rare issue with squads and movement groups not being defined at game start. Fixed wrong type declarations in header files TheBob 2017-06-12 17:09:25 +00:00
• 5d6de52be9 Fix: NPCs could get covert flags in old trait system which prevented them from ever losing it making them undetectable. silversurfer 2017-06-12 11:15:29 +00:00
• d8b62fa5d3 Updated /Data folder Flugente 2017-06-08 19:23:33 +00:00
• b60a94afc5 Added: Ctrl+Shift+E now fill LBE items in sector with other items and places them in vehicles first. Added: Right-Click on remove attachments button on sector inventory screen will not empty LBE items in sector Changed: SLAY_STAYS_FOREVER disables Slay's hourly chance to leave when unattended Added: SLAY_HOURLY_CHANCE_TO_LEAVE setting to Ja2_Options.ini Fixed: a bunch of array index out of bounds bugs Fixed: a bunch of typos in if contitions Fixed: BuildListFile() function loading items from index 1 instead 0 Added translation: Polish text for some map inventory screen items Added translation: English texts for new functionality for other language files Cleaned up some old TODOs TheBob 2017-05-19 13:40:34 +00:00
• dc350d724d Update for Russian against latest included features (by IY) inshy 2017-04-19 08:53:34 +00:00
• baf68cd7e6 Fix: performance of GetItem check Flugente 2017-04-15 20:48:04 +00:00
• 0c521e2623 Fixes (by The_Bob): - Fixed never ending interrupt bug (cats/bugs got interrupt when out of breath) - Added condition to interrupt code for minimal breath left to get interrupts - Tweaked timer control code silversurfer 2017-04-14 19:03:55 +00:00
• d7f91064f0 Fixes (by The_Bob): - Fixed index out of bounds in get items assignment check - Fixed attachment popup not allowing more than one of the same attachment - Improved timer control sanity check code - Added timer adjustment for variable CPU frequency - Added shortcut: ctrl+left-click on attachment to remove and drop it in sector inventory silversurfer 2017-04-14 08:34:20 +00:00
• fef0722178 Fixes (by The_Bob): - Fixed random freeze on win8/10 - Fixed crash on mercs entering sector - Fixed crash when using cover display (del/end) - Fixed attachment popup showing incompatible attachments (crash/freeze/confusion on clicking the option) - Fixed attachment popup positioning - Fixed LBE contents corruption/deletion - Fixed access violation (out of array bounds) in interrupt code - Fixed a bunch of random old stuff - Got the project to build on VS2015 - Improved popup class handling of grayed out options - Improved performance of get item assignment check (added by Flugente) - Added Ctrl+Space bind for testing/fixing broken LBE contents silversurfer 2017-04-12 08:09:12 +00:00
• 5d02ca8894 fix: UB build error from change in 8396 silversurfer 2017-04-02 16:07:23 +00:00
• 3a4821286a fix: game info display showed incorrect levels for BR silversurfer 2017-04-02 07:38:09 +00:00
• dbec9c6ca0 - Added external parameter CounterAttackGroupSize to DifficultySettings.xml for counter attack strength. This replaces the old hard coded value. Requires GameDir >= 2363! - Changed counter attack elite soldier distribution to replace regulars just like the rest of the code handles elites. silversurfer 2017-03-14 17:21:40 +00:00
• 931d5570ff new parameter CounterAttackGroupSize in DifficultySettings.xml that allows to set the size of a counter attack group - requires exe >= 8396 silversurfer 2017-03-14 17:21:07 +00:00
• a6b8b559f0 Fix: If troops spawn at the very northern edge of a sector, we often barely see them, and cannot target their head or torso. To stop that from happening, do not spawn there. Flugente 2017-03-11 19:03:10 +00:00
• c2b3d1a5a0 Speed up inventory rendering by avoiding unnecessary function calls Flugente 2017-03-11 15:35:39 +00:00
• 125fda3905 minor code cleanup Flugente 2017-03-11 13:19:20 +00:00
• dc5db5c06a - If a shopkeeper is a non-NPC dealer, show their body in the shopkeeper interface - Fix: unwanted items in shopkeeper screen not always crossed out correctly Flugente 2017-03-06 19:11:20 +00:00
• 1aa8eaa948 Fix: When reading in Skills_Settings.ini, NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP is now limited by min(NUMBER_OF_MAJOR_TRAITS_ALLOWED, MAX_NUMBER_OF_TRAITS_FOR_IMP - 1). Flugente 2017-03-04 13:30:37 +00:00
• 2220ad7f43 Added AP modifiers for forest and plain sectors. Flugente 2017-02-26 19:25:45 +00:00
• 8a00c33946 Added AP modifiers for forest and plain sectors. Flugente 2017-02-26 19:25:11 +00:00
• f65f97a27a New feature: the trade menu is now resolution dependent, as a result more items can be traded at the same time. Trader budget is now also displayed. Flugente 2017-02-26 16:08:03 +00:00
• ec7f15f1d7 Fix: merchants stack identical items Flugente 2017-02-04 14:43:28 +00:00
• a8ba28d90a Cleaned up AIM gearkit code Flugente 2017-02-04 14:14:55 +00:00
• 79ee1522f9 If 'GetItem' assignment isn't possible due to no valid items in target sector, indicate this to the player. Flugente 2017-02-01 19:05:58 +00:00
• 48254ea5a5 Fix: deadlock on ammo creation popup Flugente 2017-01-31 21:05:01 +00:00
• a6b641d701 Fix: crash when loading a savegame repeatedly due to initialisation flag not being reset Flugente 2017-01-30 20:06:45 +00:00
• 737c3d7467 - Updated beckground (Barry to Reaper, WIP) - Updated gear kits (Barry to Reaper, WIP) - Fix: M16A4 and M4A1 had odd price tags - Fix: Ghillie armour cannot be worn Flugente 2017-01-29 20:44:32 +00:00
• cd628ec4f2 Fix: animated explosion warnings were drawn over turn bar Flugente 2017-01-29 14:38:12 +00:00
• 44577ee164 - Fix: delayed explosions not possible in roofs - Fix: delayed explosions warnings not correctly drawn depending on height level - improved delayed explosion warning calculations Flugente 2017-01-29 14:00:18 +00:00
• bdc46603d8 - Fix: animated explosion warnings were drawn over inventory - Fix: animated explosion warnings were only drawn if explosive item was on screen Flugente 2017-01-29 12:54:09 +00:00
• 70473557cd - Fix: ASD did not take mercs on assignment into account - Fix: crash when entering combat without any mercs in sector on duty Flugente 2017-01-28 20:00:52 +00:00
• f41457250a Accelerated roof collapse code Flugente 2017-01-28 12:58:16 +00:00
• d2a4d53a0a AmmoTypes.xml: tag <canGoThrough> replaced with <usPiercePersonChanceModifier> (unsigned integer). If value is > 0, a bullet can pierce a person after hitting. Higher values increase the chance to do so. Vehicles can now be pierced as well. Flugente 2017-01-27 22:35:31 +00:00
• f66689794d - AmmoTypes.xml: tag <canGoThrough> replaced with <usPiercePersonChanceModifier> (unsigned integer). If value is > 0, a bullet can pierce a person after hitting. Higher values increase the chance to do so. Vehicles can now be pierced as well. - AP ammo is now more likely to pierce structures. Flugente 2017-01-27 22:34:56 +00:00
• fd09d16b4d Added new records: total healing (combined healing, stat repair and diesease cure) Flugente 2017-01-27 20:37:28 +00:00
• 5f2da3707c Added new records: diseases caught, interrogations, total damage taken, total damage dealt Flugente 2017-01-26 20:46:26 +00:00
• 3dc460fa27 - added missing Data-xml - Disease: per default, mercs cannot be infected with Ebola Flugente 2017-01-24 21:08:06 +00:00
• e643c1ea57 - Hospital healing now uses the same function as normal healing - If surgery would not heal anything, don't do it - removed unnecessary defines Flugente 2017-01-23 23:05:30 +00:00
• 91faf8a182 Fixed compilation error in VS2005 Wanne 2017-01-23 19:28:19 +00:00
• 43fa9090c1 Fix: crash when displaying LBE with corrupted content. Flugente 2017-01-22 20:37:13 +00:00
• 4690b89ffc Added new laptop merc data subpage to display more stats that weren't displayed before, like dialogue approach points and whether merc is a 'good guy' Flugente 2017-01-22 20:12:29 +00:00
• 4f8498e5ef slightly modified the damage formula from r8370 silversurfer 2017-01-22 14:09:26 +00:00
• a6b2568e24 - new jam damage thresholds for guns - when a gun jams it can only take damage if its status is below the threshold - modified damage calculation for jam damage - modified cleaning point calculation for mercs - natural dirt level of sectors now halved if the shooter is inside a building silversurfer 2017-01-22 13:33:44 +00:00
• b28ab79410 - new jam damage threshold for guns - gave the utility knife a lockpicking penalty silversurfer 2017-01-22 13:29:14 +00:00
• 9a46c2a9fc - The number of possible IMP voices is no lnger limited - If no IMP voices could be read, IMP creation is not allowed Flugente 2017-01-17 20:32:31 +00:00
• ec52ab30e5 When trading, mark items that the trader won't buy. Flugente 2017-01-15 23:48:34 +00:00
• 87809f222f Gun selection at shopkeepers is pre-sorted by weapon type (by DepressivesBrot) Flugente 2017-01-14 22:41:48 +00:00
• 7163e98b6e Mercs won't attack teammates or neutrals (profile-based) if their opinion of them is > 20. For good guys, that value is -20. Flugente 2017-01-14 22:22:30 +00:00
• efd9ab4723 New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml. Flugente 2017-01-14 20:20:11 +00:00
• 7fc215b0a9 - New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml. - added 5 new IMP voicesets from Wizardy8 (by ratpaz and mec05) Flugente 2017-01-14 20:12:26 +00:00
• e2c05ce1c6 minor code cleanup Flugente 2017-01-13 20:19:44 +00:00