Commit Graph

Select branches

Hide Pull Requests

extra-music

master

revert-66-1dot13-gamedir-dev

trigger-fix

trigger-fix-2

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#130

#131

#133

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#145

#146

#147

#148

#149

#150

#151

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#227

#228

#229

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#44

#45

#46

#47

#49

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#60

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#94

#95

#96

#97

#99

Mono Color

• 8ab67bebed fix: let tony buy .45 ACP boxes Marco Antonio Jaguaribe Costa 2024-12-19 15:52:32 -03:00
• 47bda82810 Workarround for issue #358 KittyandGitHub 2024-12-19 19:45:28 +01:00
• 3b2f4312ff Workarround for issue #358 https://github.com/1dot13/source/issues/358 moved ItemFlag-tag above Attachment-tag kitty624 2024-12-19 19:41:45 +01:00
• ee6669290f Merge branch '1dot13:master' into 1dot13-gamedir-dev HazapuzaandGitHub 2024-12-17 19:12:31 +02:00
• 0c04bbd3bc Removed unneeded tag in items.xml (#104) KittyandGitHub 2024-12-17 14:24:18 +01:00
• d2d3f48fd1 Removed unneeded tag in items.xml preventing drug items to be excluded when also food items and food system is off, now no longer need a tag in items.xml kitty624 2024-12-17 14:19:05 +01:00
• b8105807f1 Reworked foodsystem exclusive items (#103) KittyandGitHub 2024-12-16 10:38:40 +01:00
• 4dcc14f85d Reworked foodsystem exclusive items no food items if the food system is off whether the item is exclusive is defined by tag in items.xml replaced previous way of decision, which used Item[usItemIndex].foodtype > 0 as criteria that also restricted dual use items (i.e. drugs that also have a foodtype, like coffee, etc.) kitty624 2024-12-16 10:27:22 +01:00
• 55871baca4 Adjusted item coolness KittyandGitHub 2024-12-13 22:28:21 +01:00
• caf94e449d Adjusted item coolness - surgical mask and gloves lowered coolness - medical splint lowered coolness - empty PPE-Bag lowered coolness - full PPE-Bag lowered coolness reasoning: those are semi-essential for disease feature, therefore it's important to have the otion to get them soon. and all are rather common items in the real world, so that's reasonable Typo Fix - typo fix in merchant inventory kitty624 2024-12-13 22:17:59 +01:00
• 5aca2e4727 Create OverheadInterface_scrollarea.sti Asdow 2024-12-04 00:15:20 +02:00
• 08a957063f Merge branch '1dot13:master' into 1dot13-gamedir-dev HazapuzaandGitHub 2024-11-08 23:45:13 +02:00
• c687d4eed1 Updated AttachmentPoint.xml (#99) KittyandGitHub 2024-11-08 10:55:14 +01:00
• 93a69baa63 Updated AttachmentPoint.xml - Surgical Mask and Gloves use AttachmentPoint to attach to PPE Bag - updated xml with that kitty624 2024-11-08 10:45:09 +01:00
• a000309690 Merge branch '1dot13:master' into 1dot13-gamedir-dev HazapuzaandGitHub 2024-11-07 21:39:40 +02:00
• 86c5e96b65 Update Filters.xml HazapuzaandAsdow 2024-11-01 18:28:19 +02:00
• 8fd17b75b9 Thicken the barrel on the P-08's graphics HazapuzaandAsdow 2024-10-26 12:54:06 +03:00
• 33704ac904 Changed the OA-93 and CMMG 7.3 into one-handed weapons HazapuzaandAsdow 2024-10-23 18:54:47 +03:00
• d97bd882e9 Add tons more LOBOT weapon graphics HazapuzaandAsdow 2024-10-22 20:51:12 +03:00
• 157ca0fc8f Merge pull request #97 from kitty624/dev-gamedir KittyandGitHub 2024-11-07 08:14:14 +01:00
• 0981111ab4 BigItem sti for PPE Bag - missed in previous commit kitty624 2024-11-07 07:58:55 +01:00
• 52fbd83c23 New Item PPE Bag kitty624 2024-11-07 07:28:07 +01:00
• 1aba98d5a0 Comments on Merges.xml kitty624 2024-11-07 04:39:26 +01:00
• 04f1b2aace Update Filters.xml Hazapuza 2024-11-01 18:28:19 +02:00
• 42d93eb776 Thicken the barrel on the P-08's graphics Hazapuza 2024-10-26 12:54:06 +03:00
• 3b145376e8 Changed the OA-93 and CMMG 7.3 into one-handed weapons Hazapuza 2024-10-23 18:54:47 +03:00
• f17fcc3068 Add tons more LOBOT weapon graphics Hazapuza 2024-10-22 20:51:12 +03:00
• b9f77e8483 Replace MercOpinion.xml files with the new format (#95) AsdowandGitHub 2024-08-13 00:29:17 +03:00
• a57876d507 Added item graphics up to Barrett M82A2 for Vanilla config (#94) AsdowandGitHub 2024-08-06 18:34:21 +03:00
• 9c43e3d9cf Merge pull request #92 from kitty624/gamedir-dev KittyandGitHub 2024-04-30 07:33:26 +02:00
• 556cc7c447 Fix to CIV36.edt kitty624 2024-04-30 07:28:10 +02:00
• b22e95cd03 Fix to C5.npc kitty624 2024-04-30 07:20:29 +02:00
• 1f8811efb6 UB added missing subdirectory for Extra Items (#91) KittyandGitHub 2024-04-15 18:48:02 +02:00
• f214a81a8a Merge pull request #90 from kitty624/gamedir-dev KittyandGitHub 2024-04-15 07:18:54 +02:00
• 41941b114d Update Items.xml kitty624 2024-04-15 06:01:29 +02:00
• 9ac36af106 Merge pull request #89 from kitty624/gamedir-dev KittyandGitHub 2024-04-01 17:54:07 +02:00
• 0a4f5b62d4 Update StructureConstruct.xml kitty624 2024-04-01 17:50:41 +02:00
• 3a3850efe6 Merge pull request #88 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-31 21:24:43 +02:00
• 9e1597771b Several changes to backgrounds Hazapuza 2024-03-31 15:12:25 +03:00
• 76d9014d3d Merge pull request #87 from kitty624/gamedir-dev KittyandGitHub 2024-03-30 05:40:29 +01:00
• f5b1d2ebbc Update ItemFlag.xml kitty624 2024-03-30 05:38:56 +01:00
• b2dbb63f16 Merge pull request #86 from kitty624/gamedir-dev KittyandGitHub 2024-03-30 04:48:40 +01:00
• 48c8b42be3 Updates to TableData/Lookup kitty624 2024-03-30 04:34:35 +01:00
• 72e5ca57d1 Merge pull request #85 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-20 21:43:55 +01:00
• e37279c159 Small changes to Backgrounds setting descriptions Hazapuza 2024-03-20 22:34:51 +02:00
• fc0f82f85f Fixed typos, reworded some parts of the new backgrounds Hazapuza 2024-03-20 21:31:04 +02:00
• 276c6df27c Merge pull request #84 from kitty624/backgrounds KittyandGitHub 2024-03-19 23:13:40 +01:00
• a08a15b18a Alternative IMP Background Selection (gamedir) kitty624 2024-03-19 21:35:02 +01:00
• 10d755b075 Merge pull request #83 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-17 22:25:52 +01:00
• 38431dd41b Added palette-swapped black versions of the basic shotgun and sawn-off shotgun Hazapuza 2024-03-17 22:09:06 +02:00
• ee5ad205f4 Merge pull request #82 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-16 02:11:15 +01:00
• c942bacb66 Added LOBOT graphics for a short AK-style compact carbine Hazapuza 2024-03-15 15:16:12 +02:00
• ed7f7d177b Merge pull request #80 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-11 01:24:55 +01:00
• c2a4bb6404 Added a new weapon, the FN PS90 Hazapuza 2024-03-10 20:26:20 +02:00
• 047cdc6805 Merge pull request #79 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-07 09:08:38 +01:00
• 12848a06ef LOBOT graphics for XM25 and G11 Hazapuza 2024-03-07 07:33:46 +02:00
• e6927d6452 Merge pull request #78 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-03-06 23:28:14 +01:00
• 6464c49794 Merge branch '1dot13:master' into 1dot13-gamedir-dev HazapuzaandGitHub 2024-03-06 15:43:48 +02:00
• 4af3df0dac Change AR57 11" and 6"-Silenced weapon class from Rifle to SMG Hazapuza 2024-03-06 15:36:16 +02:00
• 6e2de6c617 LOBOT: Add ghillie suit and camo uniform (#77) AsdowandGitHub 2024-03-05 11:54:46 +02:00
• c5f3392f19 Merge pull request #76 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-29 02:09:24 +01:00
• 90c1fe6eca Fixed a crash caused by wrong formatting Hazapuza 2024-02-29 02:50:00 +02:00
• 146c2e1384 Merge pull request #75 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-27 17:12:25 +01:00
• 14dbad3987 More updates to LoadScreenHints.xml Hazapuza 2024-02-27 15:38:42 +02:00
• 0d86549924 Add a few new hints, update LoadScreenHints.xml in Data to match the one in Data-1.13 Hazapuza 2024-02-27 01:02:32 +02:00
• 87b3a8cca8 Merge pull request #74 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-21 00:49:23 +01:00
• 1d5eccff10 Updated Data-UB-1.13 with AIM and MERC bios and AIM alumni from Data-1.13 Hazapuza 2024-02-20 10:27:25 +02:00
• 7a84ce082a Merge pull request #73 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-19 22:19:17 +01:00
• 3264e6f724 Fix more typos Hazapuza 2024-02-19 23:09:23 +02:00
• cb194fddff Merge pull request #72 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-19 21:53:50 +01:00
• 1a2695d3a2 Fix typos Hazapuza 2024-02-19 22:40:34 +02:00
• b26cb411cf Merge pull request #71 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-19 21:32:19 +01:00
• 1e8b7b9006 Rewrote background descriptions Hazapuza 2024-02-19 22:13:52 +02:00
• 7beb8e10e3 Merge pull request #70 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-14 01:12:52 +01:00
• 4d6f28a305 Fix/update several weapon and item weights Hazapuza 2024-02-12 21:17:37 +02:00
• d4427947ea Add missing AIM alumni entries, fix typos in MERCBIOS Hazapuza 2024-02-10 18:00:38 +02:00
• dc701fc495 Merge pull request #69 from kitty624/gamedir-dev KittyandGitHub 2024-02-09 23:32:49 +01:00
• d7ef658f30 Update to ja2.ini for scaling tooltips kitty624 2024-02-09 23:28:57 +01:00
• 95ca46df79 Merge pull request #67 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-09 18:11:06 +01:00
• 25c765e81a Merge pull request #68 from kitty624/gamedir-dev KittyandGitHub 2024-02-08 22:07:40 +01:00
• 2a4fd8ac21 Adjusted attachments.xml for G36C kitty624 2024-02-08 22:05:58 +01:00
• 20a445b4f3 Revert "Fix for two wrong default attachments" revert-66-1dot13-gamedir-dev AsdowandGitHub 2024-02-08 22:13:32 +02:00
• 514f9a5fb6 Update GunChoices_Militia_Regular.xml Hazapuza 2024-02-08 21:37:50 +02:00
• 14ef12eb04 Update GunChoices_Enemy_Regular.xml Hazapuza 2024-02-08 21:20:45 +02:00
• 076b39c227 Update GunChoices_Enemy_Elite.xml Hazapuza 2024-02-08 20:36:29 +02:00
• 3edfca04bd Merge pull request #66 from Hazapuza/1dot13-gamedir-dev KittyandGitHub 2024-02-08 19:05:36 +01:00
• 0eb692a82f Fix for two wrong default attachments Hazapuza 2024-02-08 18:06:54 +02:00
• a9654ca666 Merge pull request #65 from kitty624/gamedir-dev KittyandGitHub 2024-02-01 05:21:48 +01:00
• 3164fa0599 biographies revised (by Hazapuza) kitty624 2024-02-01 05:18:58 +01:00
• a68f5e3c07 Create BATTLE B.WAV extra-music Asdow 2024-01-29 17:55:34 +02:00
• b64fdd506e Merge pull request #64 from kitty624/gamedir-dev KittyandGitHub 2024-01-03 03:54:06 +01:00
• 023cbcb88e Update SectorNames.xml kitty624 2024-01-03 03:52:10 +01:00
• 7e1c337e55 Specific drug types and drug items for background and facilities - template, bar items and hidden bars for vanilla. (#62) Andrzej FałkowskiandGitHub 2023-10-02 18:31:10 +02:00
• 70a31331bf Map recolours (#59) Andrzej FałkowskiandGitHub 2023-10-02 18:30:36 +02:00
• b23e78b62d Merge pull request #63 from kitty624/gamedir-dev KittyandGitHub 2023-09-25 00:36:10 +02:00
• d08b1a5f21 [Fix] missing attachment for G36C kitty624 2023-09-25 00:31:39 +02:00
• 13909d5b80 fix low fps issue (#60) FunkyFr3shandGitHub 2023-09-07 21:48:40 +02:00
• f6e9648617 Merge pull request #58 from andrzejfalkowski/loading-screens-multi-res KittyandGitHub 2023-09-02 16:12:25 +02:00
• 65083b4882 Option desc translations Andrzej Fałkowski 2023-09-01 16:58:07 +02:00
• 6236c73367 Merge branch 'master' into loading-screens-multi-res Andrzej Fałkowski 2023-08-31 23:29:07 +02:00