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

• d98de9e793 Adjust soldier create traits due to demolitions change steph-pgandAsdow 2025-10-08 16:26:18 +01:00
• 049981b35f remove now unused functions Marco Antonio J. Costaandmajcosta 2025-10-05 10:59:12 -03:00
• 1088ffc5b2 prevent shopkeeper interface from adding a second $ Marco Antonio J. Costaandmajcosta 2025-10-08 01:23:53 -03:00
• 3d29eff4d8 use FormatMoney everywhere Marco Antonio J. Costaandmajcosta 2025-10-05 11:50:05 -03:00
• 0dd32c4670 move FormatMoney to Text Utils Marco Antonio J. Costaandmajcosta 2025-09-25 18:17:11 -03:00
• fee56e37e7 better FormatMoney Marco Antonio J. Costaandmajcosta 2025-09-25 15:11:28 -03:00
• d79a445ad1 remove ATM_BUTTONS_* definitions Marco Antonio J. Costaandmajcosta 2025-10-08 02:59:06 -03:00
• b1ccdf4e38 remove unused TransferFundsFromBankToMerc/MercToBank Marco Antonio J. Costaandmajcosta 2025-10-08 02:53:17 -03:00
• 3af3b3fbbc remove sATMText[] Marco Antonio J. Costaandmajcosta 2025-10-08 02:33:57 -03:00
• 86ec94b40a stop using sATMText for "Insufficient Funds" message Marco Antonio J. Costaandmajcosta 2025-10-08 02:33:09 -03:00
• 395c18c557 remove gsAtmSideButtonText[] Marco Antonio J. Costaandmajcosta 2025-10-08 02:26:51 -03:00
• 2eff78a2cf remove scope and fix whitespace in RenderAtmPanel Marco Antonio J. Costaandmajcosta 2025-10-07 23:03:00 -03:00
• 3d95c47356 refactor UpDateStateOfStartButton Marco Antonio J. Costaandmajcosta 2025-10-07 22:31:59 -03:00
• 0ebcf0fa06 remove comments Marco Antonio J. Costaandmajcosta 2025-10-07 22:31:37 -03:00
• d6166000c9 rename fShowAtmPanelStartButton into something truthful Marco Antonio J. Costaandmajcosta 2025-10-07 22:50:03 -03:00
• 08b8d2f04f remove leftover unused stuff from personnel.cpp Marco Antonio J. Costaandmajcosta 2025-10-07 22:08:51 -03:00
• ba2e69d045 remove fATMFlags-dependent code since it is always 0 Marco Antonio J. Costaandmajcosta 2025-10-07 21:43:57 -03:00
• c9cf34d608 remove unused ATMNumberButtonCallback Marco Antonio J. Costaandmajcosta 2025-10-07 21:39:05 -03:00
• be109b71fa unused RenderRectangleForPersonnelTransactionAmount Marco Antonio J. Costaandmajcosta 2025-10-07 18:52:14 -03:00
• 690d9e1336 remove unused HandleStateOfATMButtons Marco Antonio J. Costaandmajcosta 2025-10-06 23:05:07 -03:00
• 3c87ae2724 remove unused code when fShowAtmPanel is FALSE Marco Antonio J. Costaandmajcosta 2025-10-07 21:07:37 -03:00
• f6ae1a96cd Some BP, and snitch settings were using wrong mapping stephandmajcosta 2025-10-07 22:23:13 +03:00
• 6c96b80afc Remove unused ATMOther2ButtonCallback Marco Antonio J. Costaandmajcosta 2025-10-06 23:03:42 -03:00
• 00b5758af1 remove unused ATMOtherButtonCallback Marco Antonio J. Costaandmajcosta 2025-10-06 21:06:16 -03:00
• 72ab9b0135 Remove unused CreateDestroyATMButton Marco Antonio J. Costaandmajcosta 2025-10-06 20:46:38 -03:00
• 92813f5ce1 remove unused ATMStartButtonCallback Marco Antonio J. Costaandmajcosta 2025-10-06 20:45:59 -03:00
• da83c6a557 Fix power gen fan sound Asdow 2025-10-06 22:09:16 +03:00
• a9dd9d0ca6 fix visual bug introduced by removing DrawMoneyOnScreen Marco Antonio J. Costaandmajcosta 2025-10-05 10:17:58 -03:00
• 710941edd3 Dynamically adjust contract box position Asdow 2025-10-03 23:44:29 +03:00
• 0b0fffa21d Improve multiselection contract renewal Asdow 2025-10-03 23:26:14 +03:00
• e1acf181df Add FIXME Asdow 2025-09-29 11:53:31 +03:00
• 0f8c14e72e Remove FindSoldierByProfileID_() Asdow 2025-09-29 11:40:20 +03:00
• ecea18f57c Add FIXME to l_ActionInProgress Asdow 2025-09-29 11:05:37 +03:00
• e63e936715 Clean up Asdow 2025-09-29 10:39:45 +03:00
• a15ed3aceb Fix l_SoldierGiveItem(lua_State* L) Asdow 2025-09-28 12:16:54 +03:00
• 0cb13650ed Fix whitespace formatting Asdow 2025-09-28 11:24:15 +03:00
• 601ef4dc30 Remove duplicate includes Asdow 2025-09-28 11:20:17 +03:00
• 8fa2189a66 Fix schedule compatibility between map versions 7 & 8 Asdow 2025-09-28 10:34:47 +03:00
• d038ead564 Revert "use link-time optimization when creating a release" v5 pr_emergency_v5 Marco Antonio J. Costa 2025-09-27 19:58:59 -03:00
• cf6cc2a213 Revert "use link-time optimization when creating a release" Marco Antonio J. Costaandmajcosta 2025-09-27 19:58:59 -03:00
• fb34eb6776 Use SoldierID for checks Asdow 2025-09-28 00:33:36 +03:00
• 35984f57d0 Check for valid ubAttacker Asdow 2025-09-27 23:56:36 +03:00
• 6c42f222e1 Fix PBI when enemy attacks starting sector in tactical view Asdow 2025-09-27 00:59:21 +03:00
• e8aedb29d5 show daily discounted costs for 1week and 2week contracts Marco Antonio J. Costaandmajcosta 2025-09-25 10:07:03 -03:00
• ffe987061e remove DrawMoneyOnScreen Marco Antonio J. Costaandmajcosta 2025-09-25 15:06:19 -03:00
• 1f6e545a39 Make enemy battle sound respect speech volume setting Asdow 2025-09-25 23:25:39 +03:00
• 2b9efd3702 Make helicopter sound respect sound effect volume setting Asdow 2025-09-25 22:54:34 +03:00
• f5a7c32bff Use SoldierID instead of pSoldier Asdow 2025-09-25 22:29:45 +03:00
• e14a337e03 Prevent AllowReinforcements from reverting to TRUE regardless of setting whenever you save Marco Antonio J. Costaandmajcosta 2025-09-21 18:02:17 -03:00
• d21b487884 Fix include filenames Asdow 2025-09-25 12:54:42 +03:00
• a161dcc509 Fix selecting soldiers via right click in editor Asdow 2025-09-25 10:16:39 +03:00
• f3b99edbff Fix Debug build Asdow 2025-09-24 19:11:48 +03:00
• f47908e033 Fix debug mode defines Asdow 2025-09-24 19:11:34 +03:00
• f52ab32952 Merge pull request #331 from 1dot13/ExtraMercs AsdowandGitHub 2025-09-24 17:07:51 +03:00
• 82aca548f5 Merge branch 'master' into ExtraMercs Asdow 2025-09-24 16:14:10 +03:00
• 4ec012ce7b fix bug where combat doesn't end on team retreat v4 Marco Antonio J. Costaandmajcosta 2025-09-07 02:01:41 -03:00
• ac59eba898 get rid of unnecessary #defines Marco Antonio J. Costaandmajcosta 2025-09-05 20:23:46 -03:00
• 216cd78b18 Let players make an IMP with 3 major and 0 minor traits Marco Antonio J. Costaandmajcosta 2025-09-02 14:58:21 -03:00
• 7d9cd87da8 fully externalize bQueenLosingControlOfSector Marco Antonio J. Costaandmajcosta 2025-09-02 10:52:12 -03:00
• e5d25810f6 nuke console Marco Antonio J. Costaandmajcosta 2025-08-30 12:43:12 -03:00
• 5d3cc7969f fix code that relies on transitive includes Marco Antonio J. Costaandmajcosta 2025-08-30 12:44:35 -03:00
• 272ba56fa1 remove unused function Marco Antonio J. Costaandmajcosta 2025-08-30 18:24:17 -03:00
• 1004ab6c8c Added Right Click to time compression to fast forward a single hour Buscherandmajcosta 2025-08-24 18:34:37 +02:00
• 3c44f133fd Actually fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected Marco Antonio J. Costaandmajcosta 2025-08-23 23:57:00 -03:00
• ed00830202 Fixes Upper/Lower Casing for include paths (#487) BeatAroundTheBuscherandGitHub 2025-08-17 03:01:12 +02:00
• e9b12908f7 ASD/ARC: Fix Error by One in gasCan Vector (#472) BeatAroundTheBuscherandGitHub 2025-08-16 03:40:43 +02:00
• e8399bb7c8 Make backpack AP stance costs depend on actual weight instead of a bool checking if a backpack is equipped or not (#486) BeatAroundTheBuscherandGitHub 2025-08-15 22:52:43 +02:00
• 11202d7e7e Expanded and sorted nationalities (#485) KittyandGitHub 2025-08-14 12:53:10 +02:00
• 616d9a08e6 Fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected Marco Antonio J. Costaandmajcosta 2025-08-12 02:07:11 -03:00
• f3194718e4 Remove useless check for savegame version Asdow 2025-08-08 21:21:48 +03:00
• fd9611ae04 Remove compiler warnings Asdow 2025-08-08 18:38:53 +03:00
• c62d767622 Update to Master Asdow 2025-08-08 18:00:31 +03:00
• b7bfd8a2eb Use FLAGS64 for flagmasks Asdow 2025-08-08 17:42:25 +03:00
• c78f8faefc Whitespace changes Asdow 2025-08-08 17:41:51 +03:00
• 63f614f957 Add FLAGS64 typedef Asdow 2025-08-08 17:41:40 +03:00
• d078a3439f Fix squad movement popupbox for increased squads Asdow 2025-08-08 17:01:13 +03:00
• 9b83d6a3bc Increase squad amount to 40 Asdow 2025-08-08 16:39:52 +03:00
• 9ff8476c15 Fixes to npc-actions Pacos v3 KittyandGitHub 2025-08-07 23:33:35 +02:00
• 6a9df9f22c Fixes to npc-actions Pacos kitty624 2025-08-07 23:30:09 +02:00
• 56dc0088b6 Fix underflow in loop Asdow 2025-08-07 23:46:09 +03:00
• c3a34a660d Check squads are on the same level Asdow 2025-08-07 22:01:40 +03:00
• 1074e9c408 Fix save game compability for MERCPROFILESTRUCT Asdow 2025-08-07 21:33:41 +03:00
• 4537f5d4dc IniOption Food items can show without using Food (#475) KittyandGitHub 2025-08-03 08:23:34 +02:00
• 4ae331c19e IniOption Food items can show without using Food - food items are usualy not shown in game without using Food - option ALWAYS_FOOD allows them to be shown even without - default is false, no food items without Food kitty624 2025-08-03 08:12:48 +02:00
• b85380c958 Reverting Commit 9122d7a (#474) from kitty624 KittyandGitHub 2025-08-01 21:10:57 +02:00
• eb3f62c3d5 Reverting Commit 9122d7a it made: CAN_FAN_THE_HAMMER = FALSE now disables the burst mode on pistols which effectivly resulted in pistols burst mode only being avaialbale with can fan the hammer active which further resulted in being required to fire from hip mode when using burst with pistols that's not a desired behaviour for burst on pistols, their burst should not depend on fan the hammer therefore reverted kitty624 2025-08-01 20:52:22 +02:00
• 8644e5f8b9 Update build.yml CptMoore 2025-07-25 10:24:55 +02:00
• 872a356e82 Correct column size check Asdow 2025-07-23 14:36:15 +03:00
• 7bb7c54317 Guard against integer underflow (#462) AsdowandGitHub 2025-07-21 03:30:22 +03:00
• 49a56d01ac Load correct militia icons for 720p resolution Asdow 2025-07-08 20:21:17 +03:00
• 9d1e9e8948 Fix line highlighting Asdow 2025-06-27 20:28:15 +03:00
• b3b3270e1e Adjust constructors Asdow 2025-06-27 19:59:01 +03:00
• 1a8db5d15b More conversions to SoldierID Asdow 2025-06-27 19:57:49 +03:00
• 09ce332721 Allow 10 size squads for 720p resolution in UB Asdow 2025-06-27 15:59:45 +03:00
• 5e2c61ef12 Externalized UB bloodcat quest sector Asdow 2025-06-25 22:49:29 +03:00
• 4d948fda06 Fix powergen fan stopping in UB Asdow 2025-06-24 22:50:40 +03:00
• 2ae110971b spelling fixes Asdow 2025-06-24 21:31:42 +03:00
• 9a78e7dfa0 Formatting changes Asdow 2025-06-24 21:30:14 +03:00
• d95bae2bf6 Re-enable power generator fan sound effect for UB Asdow 2025-06-24 21:13:10 +03:00
• a1bb85ca95 Externalize fan exitgrid location in the source sector Asdow 2025-04-27 12:24:31 +03:00