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

#66

#67

#68

#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

• 492790cbf0 Fix: lua function CheckMiscFlags1 checks the wrong flags Flugente 2018-06-02 00:56:15 +00:00
• f945d164af Fix: Make sure MILITIA_VOLUNTEER_POOL_MULTIPLIER_FARM is not applied to farms inside towns Flugente 2018-05-16 21:54:16 +00:00
• 52b7de54e1 If a gun's currently used ammotype has <numberOfBullets> > 1, display the gun damage in EDB in 'bullet damage X bullets fired' format, taking <multipleBulletDamageMultiplier> / <multipleBulletDamageDivisor> into account. Flugente 2018-05-16 21:15:37 +00:00
• e15a61a5cc Fix: in OCTH, damage modifiers for guns are only displayed correctly if the gun fits into a small pocket Flugente 2018-05-15 23:19:23 +00:00
• 100eea196b New feature: quest & intel map overlay Flugente 2018-05-14 21:26:37 +00:00
• 70ad3387a8 - Fix: creature attack variables are not always cleaned up properly - Fix: game remains in pause state after using cheat to avoid creature attack in strategic Flugente 2018-05-14 19:08:17 +00:00
• 9e71b31a30 - Fix: missing individual profiles for militia arriving in currently loaded sector - reduce number of warnings if no individual militia profiles are found Flugente 2018-04-19 19:23:08 +00:00
• 150b05e0b5 Fix: sound for drinking water played twice Flugente 2018-04-18 23:12:33 +00:00
• d6d283ca00 Fix: fixed raid attack times Flugente 2018-04-15 17:56:33 +00:00
• 80674249cc New feature: bloodcat/zombie/bandit raids on player-controlled sectors Flugente 2018-04-15 14:42:01 +00:00
• 1ea69989ed Fix: bad radar/overhead map colours for creature team. Flugente 2018-04-15 13:35:06 +00:00
• f8e1fd1e74 Fix: zombies do not move due to low morale Flugente 2018-04-14 18:34:49 +00:00
• 140e377d1e Fix: interrogation intel gains are wrong Flugente 2018-04-09 19:21:06 +00:00
• 65c99e02a3 Fix: healing update relied on first merc Flugente 2018-04-03 19:40:22 +00:00
• 64a971edec If MILITIA_STRATEGIC_COMMAND_REQUIRES_MERC is FALSE, militia can be controlled everywhere even without staffing a HQ Flugente 2018-03-14 20:20:13 +00:00
• 56f9864441 - Fix: wrong print format in militia battlereports - Added flag for militia desertion Flugente 2018-03-14 19:46:43 +00:00
• 524fc502f8 Fix: clean up email functions (WIP) Flugente 2018-03-12 22:57:13 +00:00
• c8a01e613f Fix: if militia groups arrive in combat alongside the player, it is possible they are interpreted as being already present, thus spawning in the sector instead of at the edges. Flugente 2018-03-11 12:50:04 +00:00
• b20c9a9de9 Fix: If 'forced turn mode' is active, sometimes enemy groups already present in an enemy-occupied sector are interpreted as pending reinforcements, causing them to spawn at the sector edges instead of inside the sector. Flugente 2018-03-11 12:36:27 +00:00
• 6b040c0eba Fix: deleted outdated setting Flugente 2018-03-10 17:59:52 +00:00
• c0d77f79c7 Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia. Flugente 2018-03-10 15:31:11 +00:00
• d6db35f000 - Fix: possible crash if enemy forces arrive via non-group (enemy heli) - Fix: possible crash when ordering militia to move if previous path was not properly cleared Flugente 2018-03-08 21:49:26 +00:00
• 1e38e07ad9 Fix: if a militia group in movement is attacked and flees from autoresolve, they remain in the sector Flugente 2018-03-07 21:09:27 +00:00
• 88f6f8cc06 Make a note in a militia's history if they were promoted due to drill Flugente 2018-03-06 22:38:27 +00:00
• 2080e787dd - added translations - militia menu is always present so that the player has an easier time figuring out why he cannot do something Flugente 2018-03-05 18:23:24 +00:00
• 82a2b6c2db Added new assignments for training existing militia and doctoring them. Flugente 2018-03-04 21:20:38 +00:00
• a95c4fd614 Fix: UB compilation Flugente 2018-03-04 17:11:56 +00:00
• f45c0a3544 Fix: UB compilation Flugente 2018-03-04 17:08:00 +00:00
• 62f8b7d3e8 Cleaned up assignment menu code (WIP) Flugente 2018-03-03 16:04:47 +00:00
• cf2f219067 Cleaned up assignment menu code (WIP) Flugente 2018-03-03 15:42:16 +00:00
• 5501e390de Fix: math functions on VS2010 Flugente 2018-03-02 22:47:54 +00:00
• 90de5ed424 Additional dialogue can be used for consuming specific items Flugente 2018-02-28 20:29:30 +00:00
• f4171a3889 If a merc's background has <druguse> set, they occasionally consume beneficial drugs in combat for free. Flugente 2018-02-28 20:01:07 +00:00
• abb8152d24 Fix: missing files Flugente 2018-02-27 00:49:42 +00:00
• 3bbdd4a23a New ability: a disguised spy can distract unalerted enemies, making it easier to sneak by. Flugente 2018-02-25 19:07:31 +00:00
• c8e9a3fb8e Fix: if we steal from an enemy, they turn to us if they notice us Flugente 2018-02-25 16:21:45 +00:00
• 7a537c3a2e Fix: soldier automatically taunts us whenever we steal, making stealth impossible Flugente 2018-02-24 20:45:27 +00:00
• c7d68dbd55 If DISABLE_EVOLUTION is TRUE, learning evolution is not used. Flugente 2018-02-22 19:01:43 +00:00
• 9773e1d293 Fix: on low resolutions, the message log blocks parts of the inventory,so deactivate the log in that case Flugente 2018-02-21 20:45:57 +00:00
• 92e759555d - New enemy role: display whether an enemy carries a key Flugente 2018-02-21 18:49:35 +00:00
• e55b480996 New feature: Getting and using intel allows for more spy-related roleplay. Flugente 2018-02-18 23:17:34 +00:00
• ee73811cfe If PRINTOUTTILESET is TRUE, also print out the room number when pressing 'f'. Flugente 2018-02-17 19:32:10 +00:00
• 876b8f2502 Fix: possible crash during item transformation Flugente 2018-02-17 19:23:03 +00:00
• e7ce503e9e Cleaned up arms dealer code Flugente 2018-01-28 20:51:07 +00:00
• a9452840af Fix: gear templates: when creating a new ammo stack from non-fitting magazines, fill up the stack Flugente 2018-01-22 21:37:51 +00:00
• dd3129ac11 New feature: additional dialogue allows modders to play additional dialogue on man occasions, including reactions to other people speaking Flugente 2018-01-10 23:41:52 +00:00
• fadb7710e6 Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit Flugente 2018-01-09 23:30:50 +00:00
• 70162ece95 Change: In the militia overview laptop website, do not display militia faces, instead colour their names. This way we can display more militia at once without losing information Flugente 2018-01-04 18:57:33 +00:00
• 8b41be236a If a merc harms themself, use a voice line Flugente 2018-01-04 15:57:36 +00:00
• a8e62cc406 - To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums. - Merged IsMercOnTeam...(...) functions into one - Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit Flugente 2018-01-04 15:50:31 +00:00
• f8b34b35d7 NumberOfTeamMatesAdjacent: fix vanilla bug Sevenfm 2017-12-19 11:17:32 +00:00
• 209f5f7c1b fixed AI freeze on creatures attacking crows fixed some broken debug messages TheBob 2017-11-20 23:43:16 +00:00
• 3099b78146 updated settings for JA2_Options.ini and the corresponding data in the game code silversurfer 2017-11-08 12:32:55 +00:00
• 0410017820 Fix: JA2UB compilation errors Flugente 2017-11-01 22:51:25 +00:00
• 7b1ba8f7f2 Fix: wrong sound played Flugente 2017-11-01 16:54:08 +00:00
• 605b07368f - New: Additional battlesounds can be used - simply increase the numbering after a sound (xxx_LAUGH, xxx_LAUGH2, xxx_LAUGH3...) - Fix: CHANCE_SAY_ANNOYING_PHRASE causes non-low morale battle sounds not to be played when they should Flugente 2017-10-31 22:41:12 +00:00
• 9c74bb75dc To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums. Flugente 2017-10-31 19:18:35 +00:00
• e4e58e81d0 Fix: stealing from or in transit Flugente 2017-10-19 17:46:17 +00:00
• fd868ada14 Fix: wrong limits used Flugente 2017-10-18 19:59:44 +00:00
• 5cf3bfd665 Fix: BP costs not read correctly Flugente 2017-10-17 19:14:40 +00:00
• 5bdd23ac13 New animations: added animations for crouched walking with weapons aimed for all merc bodytypes (made by Taro) Flugente 2017-10-15 17:10:49 +00:00
• d701f26919 Added bayonet animations (standing against prone targets) for all merc bodytypes (by Taro) Flugente 2017-10-06 17:52:26 +00:00
• fabd27c376 Fix: various individual militia issues Flugente 2017-10-05 19:57:26 +00:00
• d321bf8abe Fix: difficulty introduction texts were cutoff Flugente 2017-10-04 19:22:52 +00:00
• f82dad3712 Removed non-default output entries Flugente 2017-10-02 13:05:50 +00:00
• 380d858d2c Added VS2017 solution and project files (by DepressivesBrot) Flugente 2017-10-02 13:00:46 +00:00
• 3f057567dc - Added bayonet animations (standing against standing/crouched targets) for all merc bodytypes (by Taro) - Initiating a bayonet attack immediately after running adds a melee damage bonus (+20%) Flugente 2017-10-02 10:38:12 +00:00
• c3592c23f3 Slightly speed up overhead map display Flugente 2017-10-01 12:30:39 +00:00
• 2d2e789ce0 Fix: display riot shields only if soldier is seen (relevant on non-player controlled soldiers) Flugente 2017-10-01 12:02:38 +00:00
• a57d9455f3 Dynamic dialogue boxes cause less issues when scrolling Flugente 2017-10-01 11:08:38 +00:00
• 8de2a8601e New: if REDUCED_INSTANT_DEATH is TRUE, damage from guns/knives that would normally instantly kill non-comatose player-controlled mercs is lowered so that they instead fall into a coma (and can be saved by other mercs) (by sevenfm) Flugente 2017-09-29 19:48:32 +00:00
• 2c84cbe48d Change: AI does not attack mercs that are already dying, thus focusing on more dangerous opponents while giving the player a chance to rescue dying mercs (by sevenfm) Flugente 2017-09-28 21:27:59 +00:00
• dfc55c286d Fix: boxing exception to covert behaviour only works between 2 boxers Flugente 2017-09-28 19:40:49 +00:00
• dc4846a464 Fix: as being covert breaks boxing fights, boxers are not covert Flugente 2017-09-27 21:18:35 +00:00
• bc85245a53 Fix: Squadleader level bonus for other mercs was applied in strategic. Flugente 2017-09-24 15:49:41 +00:00
• 0450b7a32c Fixes: - missing laser range in OCTH - missing compare functionality for laser ranges - missing ToHitBonus display for crouched stance silversurfer 2017-09-23 11:16:37 +00:00
• c20604f16a Fix: various individual militia issues Flugente 2017-09-21 18:38:22 +00:00
• f30482d939 Soldiers move slower when dragging someone Flugente 2017-09-18 17:36:39 +00:00
• f0698366e8 Updated Chinese texts (by TBS) Wanne 2017-09-18 10:19:57 +00:00
• 6031257dcd New feature: mercs can drag people and corpses Flugente 2017-09-17 22:16:30 +00:00
• 5becfe9004 Fix: warnings about individual militia errors were wrongly printed out Flugente 2017-09-14 20:00:17 +00:00
• 94a66ead9d - Fix: replaced stdext::hash_map with std::unordered_map, as the former is deprecated - Fix: missing header Flugente 2017-09-13 20:05:54 +00:00
• 2fe522db4b Fix: compiler warnings Flugente 2017-09-13 20:01:48 +00:00
• b6dde6a0da Updated Chinese texts (by TBS & zwwooooo) Wanne 2017-09-12 11:19:56 +00:00
• c24a5da97a - UseGunNCTH: initialize fBuckshot - CreatureDecideActionBlack: use CreatureDecideActionRed instead of DecideActionRed Sevenfm 2017-08-31 15:46:33 +00:00
• 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
• 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