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

#681

#684

#686

#687

#688

#688

#69

#690

#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

• 631ba52d19 - removed debug messages that occurred in release code in tactical screen Wanne 2008-06-25 10:38:19 +00:00
• 06a0249994 I just added a comment to builddefines.h for building the editor: You should build the map editor in "Release" mode and not "MapEditor" mode. You also have to enable the 2 defines in builddefines.h for the map editor. Wanne 2008-06-20 10:35:51 +00:00
• 192b132fab - updated German.Items.xml (thx to Farmer Toby) Wanne 2008-06-10 19:31:36 +00:00
• 6be5f313db - new exe build (2222) Wanne 2008-06-08 13:57:43 +00:00
• 0e0ffd5eab new exe build (2222) Wanne 2008-06-08 13:57:42 +00:00
• cf8e8d75d1 Renamed the existing ja2.exe to ja2_2124.exe and Map Editor.exe to Map Editor_2112.exe. This are the last official versions without multiplayer integration. I will upload in the next minutes a new ja2.exe and a new Map Editor.exe both with multiplayer integration. Wanne 2008-06-08 13:46:39 +00:00
• 8e36b221c2 - removed inventory choice from "start new game" screen in multiplayer mode -> now the inventory choice is defined in "ja2_mp.ini" - added new headline text in the "start new game" screen for multiplayer mode Wanne 2008-06-08 13:10:17 +00:00
• 4e954d0c15 - bugfix: Removed "No Gear" button for MERC if playing in single player mode Wanne 2008-06-07 21:27:10 +00:00
• 5b1405b717 - bugfix Bug-ID: 101: No bloodcats in tactical by bloodcats ambush Wanne 2008-06-07 21:20:11 +00:00
• 2baa1b7c94 - bugfix: Loading maps in map editor with creatures. They did not show up Wanne 2008-06-07 18:27:56 +00:00
• 9944d75a81 - Slay & Flo speech fix for russian version Wanne 2008-06-07 12:23:01 +00:00
• 2015c0f362 - bugfix: Exclusive multiplayer condition was missing in AddPossiblePendingMilitiaToBattle() Wanne 2008-06-04 05:50:50 +00:00
• d19771cbff - added new NPCdata/064.npc for Slay, so he can be easily recruted by giving him the disk from carmen - added SIRTECHSPLASH.STI, so the map editor can be started on russian and german version Wanne 2008-06-03 17:16:24 +00:00
• 484d7ec8be - added SIRTECHSPLASH.STI to the interface folder, so the english Map Editor.exe can also run with german and russian version Wanne 2008-06-03 17:14:37 +00:00
• 905cc972d8 double entry of gun277.sti deleted Starwalker 2008-05-31 16:21:27 +00:00
• bcc88eea7c uploaded Russian.Items.xml again, earlier version may have had conflicts Starwalker 2008-05-31 15:17:04 +00:00
• 46da404a54 added three new LBE-Items and three new pockets (pics by Marlboro Man) corrected a few mistakes in descriptions (Inshy, RoWa21) changed gun ranges from 10m increments to 5m increments uploaded new Russian.Items.xml (Inshy) Starwalker 2008-05-31 15:07:23 +00:00
• 97de2451c7 added/replaced some gun/item pics Starwalker 2008-05-31 15:01:25 +00:00
• 1d7b7eaf72 added two new silhouettes Starwalker 2008-05-31 14:59:18 +00:00
• d08aef5c53 added two new silhouettes Starwalker 2008-05-31 14:58:06 +00:00
• 74a291abbc added speech fix for slay & fox for german version (thx to scheinworld) Wanne 2008-05-31 13:10:22 +00:00
• d8ba1dbeaf - updated inventory bottom panel for 1024x768 resolution - added speech fix for slay & fox (thx to scheinworld) Wanne 2008-05-31 13:09:26 +00:00
• 23b8b0c624 Fixes for VS2003 - added files - changed Credits.cpp to non Unicode version lalien 2008-05-31 11:56:39 +00:00
• b2b42e1958 I blew it and missed the fact that SpaceViking was still using the old structure in his test code. ChrisL 2008-05-30 15:43:51 +00:00
• bab3a586d7 Added new weapon jam code from SpaceViking (think that's who wrote it). Updated the text files and moved a static phrase into the language specific files. ChrisL 2008-05-30 15:32:54 +00:00
• 0fc5fd8e10 Turned A* Pathfinding off until someone can resolve the infinite loop issue that is occuring on custom maps. Updated the 1024x768 tactical graphic coords to fix a "blacked out" display issue. ChrisL 2008-05-29 15:15:03 +00:00
• 736f2a194d *disable tank spawning, and fix bug causing lack of AI to spawn in maps with snipers or tanks. *small change associated with hidden interrupts now occuring and not necessarily only being between AI to hopefully stop crashes. (thanks for the call stack!) *added no gear option 4 MERC *disable explosions haydent 2008-05-27 10:01:04 +00:00
• 15cdb9fb6b - Fixed the wrong texts for portrait, voice, skills and attributes in the I.M.P creation screen - Translation of multi player text lalien 2008-05-26 11:30:47 +00:00
• 5957abba5b disabled mp reading of ja2_options.ini to take default values only. haydent 2008-05-26 10:56:45 +00:00
• 660be55d3a Updated comments in Ja2_mp.ini Wanne 2008-05-25 17:45:34 +00:00
• b701a71e23 modified mp bobby rays to show inv. also disabled reinforcements in MP haydent 2008-05-25 13:51:05 +00:00
• 0176037d4c - added new multiplayer texts Wanne 2008-05-24 21:23:28 +00:00
• 720bd2a6ae updated _RussianText.cpp (thx to inshy) Wanne 2008-05-24 20:32:52 +00:00
• 24dc505faf Fixed the wrong texts for portrait, voice, skills and attributes in the I.M.P creation screen Wanne 2008-05-22 20:24:49 +00:00
• 51d541f29c Turned on Abends so they appear rather then having the program simply CTD. Setup a failsafe in the pathfinding system that will force an abend should the system fall into an infinite loop. ChrisL 2008-05-21 16:55:38 +00:00
• 73acf25c7a fixed up AI interrupts haydent 2008-05-21 10:23:54 +00:00
• 4397de6edb fixed refresh bug haydent 2008-05-20 22:33:46 +00:00
• 4b0dcb5e96 disabled spawning on roofs haydent 2008-05-20 22:16:11 +00:00
• d64ed11205 Fixed Russian text lalien 2008-05-20 11:45:55 +00:00
• 85252909ff mp fixes some more haydent 2008-05-20 00:49:45 +00:00
• 41596a49cd - bugfix: Multiplayer games can now run in fullscreen mode! Game will not pause anymore and ALT + TAB also works. Wanne 2008-05-19 19:46:40 +00:00
• cceb340a05 Externalized "starting turn for client #" Wanne 2008-05-19 16:02:26 +00:00
• e811e210ed added DISABLE_SPEC_MODE to Ja2_mp.ini Wanne 2008-05-19 15:18:08 +00:00
• 947dcb7e5d synced merc collapse 'resolved' timer cursor lockups add new server ini variable: DISABLE_SPEC_MODE = 0 possible lessening of chance for AI to Lockup. haydent 2008-05-19 11:17:48 +00:00
• 06c9fb60cc fixed opponent count error haydent 2008-05-19 04:19:34 +00:00
• 70c6e61334 added sync for bandaging anim and ability to heal other teams add names to end turn dialog. haydent 2008-05-19 03:13:19 +00:00
• c5c317849c - bugfix mp: If server sets ALLOW_CUSTOM_NIV = 0 and clients select another interface than the server, the following problems occured: * crash if clients opens the inventory * from merc item layouts if you hire a merc * if client plays in 640x480 res and server selects NIV a crash occured Wanne 2008-05-18 18:36:03 +00:00
• 9e2ec03c2c updated comments in Ja2_mp.ini Wanne 2008-05-18 17:44:55 +00:00
• eedb409e48 - added multiplayer folder include for tactical project for release version Wanne 2008-05-18 10:22:16 +00:00
• 6c34069db6 increased the save game version, because this the multiplayer code changed MAXTEAMS from 6 to 11, so old savegames are not compatible anymore. Wanne 2008-05-18 09:27:00 +00:00
• be609a1f10 Updated Ja2_mp.ini Wanne 2008-05-18 07:16:35 +00:00
• 741e5c03bf added slay > $$$ 4 iggy fixed coop stopped speck talking preopened merc account CREATURE_ENABLED = 0 no longer has any effect u can remove it from ur ini ALLOW_CUSTOM_NIV = 1 -> new server ini variable, please add added gear cost to MERC's haydent 2008-05-18 02:53:59 +00:00
• f17cc948a4 - fixed map editor incompatibility with the merged multiplayer code - fixed crashes when loading modified maps in tactical - added missing "is_networked" condition to the method AddPossiblePendingEnemiesToBattle() Wanne 2008-05-17 21:51:32 +00:00
• ad40a9492e updated Data/TableData/German.Items.xml (thx to Dr Deagle) Wanne 2008-05-17 21:29:39 +00:00
• d576fc6b99 - made a few project changes, so that the map editor exe can be compiled Wanne 2008-05-16 18:12:15 +00:00
• 6565f14bc3 Fix for Bug#99 Fix for Bug#100 ChrisL 2008-05-16 17:25:46 +00:00
• 66d55cf08a * fixed bullet artifacts and removal ! * hopefull disable of grenades * added a LOS check from your mercs to a door to see if it should be animated or not. haydent 2008-05-16 08:36:19 +00:00
• a04768e6a6 added credit check to MERC purchases fixed appearance of enemy MERC NPC's to show stats when targeted fixed realtime added check to only allow AI during game mode coop haydent 2008-05-15 14:41:47 +00:00
• 36be370bca - bugfix: Only one M.E.R.C merc was available in single player mode. Wanne 2008-05-14 05:37:33 +00:00
• 3823ac6f06 - bugfix mp: ALT + TAB is working again in full screen mode. But if you like to play multiplayer you should use windowed mode or you should never do ATL + TAB, because this pauses the game in full screen mode! Wanne 2008-05-14 05:09:28 +00:00
• 28e9276006 - bugfix mp: Wrong savegame folder name for german version that leaded to a CTD when saving a multiplayer game. Wanne 2008-05-14 04:41:48 +00:00
• bf99b6d9e6 - bugfix mp: fixed up coop - bugfix mp: fixed bobby rays code my end Wanne 2008-05-13 18:49:02 +00:00
• 10e518110a - bugfix mp: ctd if client opens inventory in tactical, if server and client had selected different inventory in the start new game screen. Now I changed that, so each client can decide new or old inventory. Wanne 2008-05-12 19:41:21 +00:00
• 34bc85e344 new exe build (2147) - added INI option for new tracer bullets (USE_BULLET_TRACERS) - updated German.Items.xml - fixed one spelling mistake in Items.xml Wanne 2008-05-12 11:00:59 +00:00
• 1b5393014d - added INI option for new tracer bullets (USE_BULLET_TRACERS) - corrected some german spelling mistakes - new release build (2147) Wanne 2008-05-12 10:57:06 +00:00
• c5581bc4d0 new exe build (2146) which also contains multiplayer Wanne 2008-05-12 09:50:20 +00:00
• 9dfd4e096e new exe build (2146) which also contains multiplayer Wanne 2008-05-12 09:48:10 +00:00
• c789c1953f Added changes from build 2137 lalien 2008-05-12 08:35:50 +00:00
• 3e22dce318 Merged Multi Player Project into main branch lalien 2008-05-12 08:20:47 +00:00
• c448713412 Minor adjustment to the NIV mode 800x600 thigh and combat pack pocket coordinates on the tactical panel so that the stealing menu doesn't inadvertantly "double hatch" our pockets and make them look solid black. ChrisL 2008-05-09 22:28:59 +00:00
• d8590d3474 new release and editor (build: 2112) Wanne 2008-05-07 16:55:24 +00:00
• 0527d0a585 Minor update so that sector A9 will be the default map when a major version update has completed. ChrisL 2008-05-07 16:06:23 +00:00
• 82aec44382 Fixed bug #82: SHIFT+N allowed both sun goggles and NVGs to be worn at the same time. ChrisL 2008-05-06 17:32:34 +00:00
• 2b3b6367f1 Fixed bug #93: Character name too long at IMP activation screen -> CTD Wanne 2008-05-04 19:19:38 +00:00
• 9445ded9e2 Fixed bug #94: Merc with no ammo in autocombat = CTD Wanne 2008-05-04 18:53:49 +00:00
• 8e332178e4 Made an adjustment to the editor so that map version checking takes place when rebuilding the DevInfo folder. This will allow maps to update properly if you switch between maps alot, while not forcing a major version update when it's not needed. ChrisL 2008-05-02 23:09:58 +00:00
• 07549fdc68 Resolved a problem where ItemSize=99 items would cause a CTD because of a mission condition. Adjusted the ALT+W function so it runs a bit better. ChrisL 2008-05-02 16:39:16 +00:00
• ea0a3fa1cd - removed test comment from Ja2.ini - updated Russian.Items.xml (thx to inshy) Wanne 2008-04-29 19:15:09 +00:00
• 5a57354297 Fixed item "beaming" bugs that allowed items to be grabbed from a sector your merc wasn't currently in. Fixed the map editor so that "Nada" items don't appear in the item lists. ChrisL 2008-04-29 17:33:49 +00:00
• 6d4b38541b - Removed "Realist" from the 1.13 Credits, because he said to me it is a mistake that he is named there. Wanne 2008-04-27 11:10:46 +00:00
• 3faae3a89b new Map Editor.exe updated German.Items.xml (thanks to Dr_Deagle) updated INIEditorInit.xml Wanne 2008-04-27 09:58:41 +00:00
• d36ce7a019 - new exe build: 2083 Wanne 2008-04-26 08:28:50 +00:00
• e2ad50963b Bugfix that removes a rare CTD that can occur if a non-LBE item accidentally gets associated with a merc. ChrisL 2008-04-25 18:17:53 +00:00
• 97fcc92abe replaced Type 85 and 30rnd 7.62x25mm mag pictures with new ones made by Hruza Starwalker 2008-04-24 09:19:13 +00:00
• f505fc194f new ja2.exe (Build: 2063): - Fixed a CTD that occurs when closing sector inventory while the item description window is open. - Added a new ALLOW_SECTOR_DESCRIPTION_WINDOW flag to the ja2_options.ini that allows players to turn off the stack popup and item description functionality for the sector inventory panel. Wanne 2008-04-22 18:45:24 +00:00
• b4b31cdb06 Fixed a CTD that occurs when closing sector inventory while the item description window is open. Added a new ALLOW_SECTOR_DESCRIPTION_WINDOW flag to the ja2_options.ini that allows players to turn off the stack popup and item description functionality for the sector inventory panel. ChrisL 2008-04-21 21:04:35 +00:00
• ece7ec25bb Resolved an inadvertent memory leak I put into the code while fixing a previous CTD. Cleaned up the cursor graphics so that the cursor is properly updated when reloading stacks of weapons from the stack popup screen. ChrisL 2008-04-21 06:39:01 +00:00
• c9264b6101 updated 1.13 credits Wanne 2008-04-20 17:29:49 +00:00
• 896891431d Fixed a CTD that occured when reloading a weapon from the sector inventory panel. Fixed the sector inventory panel so that you could reload weapons that could be stacked. ChrisL 2008-04-18 22:41:09 +00:00
• 38ee990e9f Bugfix to stop a CTD that could occur if the system inadvertantly tries to stack two money objects that have a 0 uiMoneyAmount amount. ChrisL 2008-04-18 05:21:01 +00:00
• 2d5c6e2996 Fixed a bug in the "sell all" strategic inventory screen options. Money now gets sold without modification and unreachable items can't accidentally be sold. ChrisL 2008-04-17 16:47:50 +00:00
• bffdfcc75d Fixed an OIV mode bug where RPCs don't get initial gear at hire. ChrisL 2008-04-16 16:42:43 +00:00
• b275f2d282 Deleted all the Slay Speech files that had a " " in the filename. These files are not used in the source code Wanne 2008-04-15 19:13:45 +00:00
• 26d596a948 Deleted Speech files from German version which had a " " in the name. They are not needed! Wanne 2008-04-15 19:10:39 +00:00
• 4ccad69873 Updated version number. Bugfix to resolve a Map Editor problem where you would constantly receive a "Major Version Update" message. ChrisL 2008-04-15 18:56:39 +00:00
• 0596b0a553 MadLab fix related to handing him a weapon with attachments. ChrisL 2008-04-15 16:14:14 +00:00
• 94eee4138c Updated game version to match the most recent SVN gamebranch upload. No idea why I missed this during the rev2013 update. ChrisL 2008-04-15 15:34:56 +00:00
• 8a8ab35b81 changed Shadow's suppressor Starwalker 2008-04-15 14:16:37 +00:00
• 9308131d17 - replaced wrong text for ironman in german version in the start new game screen Wanne 2008-04-13 14:35:15 +00:00
• 859efc6c00 - New Exe Build 2013 (fixed item duplication bug) - Updated Russian specific xml files Wanne 2008-04-13 12:47:03 +00:00