Commit Graph
2808 Commits
Author SHA1 Message Date
KittyandGitHub 72e5ca57d1 Merge pull request #85 from Hazapuza/1dot13-gamedir-dev
Fixed typos, reworded some parts of the new backgrounds
2024-03-20 21:43:55 +01:00
Hazapuza e37279c159 Small changes to Backgrounds setting descriptions 2024-03-20 22:34:51 +02:00
Hazapuza fc0f82f85f Fixed typos, reworded some parts of the new backgrounds 2024-03-20 21:31:04 +02:00
KittyandGitHub 276c6df27c Merge pull request #84 from kitty624/backgrounds
Alternative IMP Background Selection (gamedir)
2024-03-19 23:13:40 +01:00
kitty624 a08a15b18a Alternative IMP Background Selection (gamedir)
- added two new options in ja2options.ini
- added new category, "Backgrounds", in INIEditorJA2Options.xml
and ja2options.ini
- added new tag, <alt_impcreation>
in backgrounds.xml
- added information about new options into backgrounds.xml
- added new backgrounds for the new options into backgrounds.xml

- also added tags needed for disease feature to medical staff in merc backgrounds

this change is accompanying the relevant change in source
2024-03-19 21:35:02 +01:00
KittyandGitHub 10d755b075 Merge pull request #83 from Hazapuza/1dot13-gamedir-dev
Added palette-swapped black versions of the basic shotgun and sawn-of…
2024-03-17 22:25:52 +01:00
Hazapuza 38431dd41b Added palette-swapped black versions of the basic shotgun and sawn-off shotgun
- Super-Shorty no longer invisible, uses black version of the sawn-off shotgun graphics

- Moved Fabarm FP6, SDASS and Benelli M3 from SPAS-12 to black shotgun graphics
2024-03-17 22:09:06 +02:00
KittyandGitHub ee5ad205f4 Merge pull request #82 from Hazapuza/1dot13-gamedir-dev
Added LOBOT graphics for a short AK-style compact carbine
2024-03-16 02:11:15 +01:00
Hazapuza c942bacb66 Added LOBOT graphics for a short AK-style compact carbine
The AKS-74U and AKMSU now use a wooden furniture version, and several short-barreled black/dark-colored rifles use an all-black version.
2024-03-15 15:16:12 +02:00
KittyandGitHub ed7f7d177b Merge pull request #80 from Hazapuza/1dot13-gamedir-dev
Added a new weapon, the FN PS90
2024-03-11 01:24:55 +01:00
Hazapuza c2a4bb6404 Added a new weapon, the FN PS90
The rifle class is now once again mostly devoid of any notable end-game weapons, and this is meant to compensate for that a bit. The PS90 is available from BR's and Tony, at coolness 7.
2024-03-10 20:26:20 +02:00
KittyandGitHub 047cdc6805 Merge pull request #79 from Hazapuza/1dot13-gamedir-dev
New LOBOT graphics for XM25 and G11
2024-03-07 09:08:38 +01:00
Hazapuza 12848a06ef LOBOT graphics for XM25 and G11
- XM25, OICW and AICS set to use the XM-25 graphics

- G11 and CAWS set to use the G11 graphics

-Added '25mm' to XM-25's descriptions, fixed several typos
2024-03-07 07:33:46 +02:00
KittyandGitHub e6927d6452 Merge pull request #78 from Hazapuza/1dot13-gamedir-dev
Change AR57 11" and 6"-Silenced variants' weapon class from Rifle to SMG
2024-03-06 23:28:14 +01:00
HazapuzaandGitHub 6464c49794 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-03-06 15:43:48 +02:00
Hazapuza 4af3df0dac Change AR57 11" and 6"-Silenced weapon class from Rifle to SMG 2024-03-06 15:36:16 +02:00
AsdowandGitHub 6e2de6c617 LOBOT: Add ghillie suit and camo uniform (#77) 2024-03-05 11:54:46 +02:00
KittyandGitHub c5f3392f19 Merge pull request #76 from Hazapuza/1dot13-gamedir-dev
Fixed a crash caused by wrong formatting
2024-02-29 02:09:24 +01:00
Hazapuza 90c1fe6eca Fixed a crash caused by wrong formatting 2024-02-29 02:50:00 +02:00
KittyandGitHub 146c2e1384 Merge pull request #75 from Hazapuza/1dot13-gamedir-dev
Add a few new hints, update LoadScreenHints.xml in Data to match …
2024-02-27 17:12:25 +01:00
Hazapuza 14dbad3987 More updates to LoadScreenHints.xml
One new hint, reworded a few hints to include secondary hotkeys and to be within the character limit.
2024-02-27 15:38:42 +02:00
Hazapuza 0d86549924 Add a few new hints, update LoadScreenHints.xml in Data to match the one in Data-1.13 2024-02-27 01:02:32 +02:00
KittyandGitHub 87b3a8cca8 Merge pull request #74 from Hazapuza/1dot13-gamedir-dev
Updated Data-UB-1.13...
2024-02-21 00:49:23 +01:00
Hazapuza 1d5eccff10 Updated Data-UB-1.13 with AIM and MERC bios and AIM alumni from Data-1.13 2024-02-20 10:27:25 +02:00
KittyandGitHub 7a84ce082a Merge pull request #73 from Hazapuza/1dot13-gamedir-dev
Fix more typos
2024-02-19 22:19:17 +01:00
Hazapuza 3264e6f724 Fix more typos 2024-02-19 23:09:23 +02:00
KittyandGitHub cb194fddff Merge pull request #72 from Hazapuza/1dot13-gamedir-dev
Fix typos in backgrounds.xml
2024-02-19 21:53:50 +01:00
Hazapuza 1a2695d3a2 Fix typos 2024-02-19 22:40:34 +02:00
KittyandGitHub b26cb411cf Merge pull request #71 from Hazapuza/1dot13-gamedir-dev
Rewrite background names and descriptions
2024-02-19 21:32:19 +01:00
Hazapuza 1e8b7b9006 Rewrote background descriptions
Rewrote background descriptions and changed some bonuses and penalties.  An overhaul of all background stats is still pending.
2024-02-19 22:13:52 +02:00
KittyandGitHub 7beb8e10e3 Merge pull request #70 from Hazapuza/1dot13-gamedir-dev
Add missing AIM alumni entries, fix typos in MERCBIOS
2024-02-14 01:12:52 +01:00
Hazapuza 4d6f28a305 Fix/update several weapon and item weights 2024-02-12 21:17:37 +02:00
Hazapuza d4427947ea Add missing AIM alumni entries, fix typos in MERCBIOS
- Added Sam, Beth, Sparky, Postie and Leon to the AIM alumni, with partially altered vanilla alumni texts.

- Capitalized two letters in Skitz's bio
2024-02-10 18:00:38 +02:00
KittyandGitHub dc701fc495 Merge pull request #69 from kitty624/gamedir-dev
Update to ja2.ini for scaling tooltips

he source pr 1dot13/source#151 made it possible to scale up tooltips

added the setting and description to ja2.ini to allow to make use of it
2024-02-09 23:32:49 +01:00
kitty624 d7ef658f30 Update to ja2.ini for scaling tooltips
the source pr https://github.com/1dot13/source/pull/151
made it possible to scale up tooltips

added the setting and description to ja2.ini to allow to make use of it
2024-02-09 23:28:57 +01:00
KittyandGitHub 95ca46df79 Merge pull request #67 from Hazapuza/1dot13-gamedir-dev
Fix for errors in enemy and militia gun choices
2024-02-09 18:11:06 +01:00
KittyandGitHub 25c765e81a Merge pull request #68 from kitty624/gamedir-dev
Adjusted attachments.xml for G36C



previous change removed the default in-build 2xscope from G36C in items.xml

to avoid assertion error, adjusted attachments.xml to refelct the change in there as well
2024-02-08 22:07:40 +01:00
kitty624 2a4fd8ac21 Adjusted attachments.xml for G36C
previous change removed the default in-build 2xscope from G36C in items.xml

to avoid assertion error, adjusted attachments.xml to refelct the change in there as well
2024-02-08 22:05:58 +01:00
Hazapuza 514f9a5fb6 Update GunChoices_Militia_Regular.xml 2024-02-08 21:37:50 +02:00
Hazapuza 14ef12eb04 Update GunChoices_Enemy_Regular.xml 2024-02-08 21:20:45 +02:00
Hazapuza 076b39c227 Update GunChoices_Enemy_Elite.xml 2024-02-08 20:36:29 +02:00
KittyandGitHub 3edfca04bd Merge pull request #66 from Hazapuza/1dot13-gamedir-dev
Fix for two wrong default attachments
2024-02-08 19:05:36 +01:00
Hazapuza 0eb692a82f Fix for two wrong default attachments
Removed the built-in 2x scope from the G36C (only iron sights and a picatinny rail in reality) and replaced the built-in retractable stock on the G36K with a folding stock.
2024-02-08 18:06:54 +02:00
KittyandGitHub a9654ca666 Merge pull request #65 from kitty624/gamedir-dev
Biographies revised (by  Hazapuza)
2024-02-01 05:21:48 +01:00
kitty624 3164fa0599 biographies revised (by Hazapuza)
texts in AIMBIOS.edt and MERCBIOS.edt adjusted to better match lore from JA1, DG , Alumni, etc
2024-02-01 05:18:58 +01:00
KittyandGitHub b64fdd506e Merge pull request #64 from kitty624/gamedir-dev
Update SectorNames.xml

D2 - changed water type to 1 (drinkable) since there are watertabs in buildings, a reasonable watersource
2024-01-03 03:54:06 +01:00
kitty624 023cbcb88e Update SectorNames.xml
D2 Changed water type to 1 (drinkable) since there are watertabs in buildings, a reasonable watersource
2024-01-03 03:52:10 +01:00
Andrzej FałkowskiandGitHub 7e1c337e55 Specific drug types and drug items for background and facilities - template, bar items and hidden bars for vanilla. (#62) 2023-10-02 19:31:10 +03:00
Andrzej FałkowskiandGitHub 70a31331bf Map recolours (#59)
* INI settings for radar and overhead map color variants

* Option translations

* UB INI options.
2023-10-02 19:30:36 +03:00
KittyandGitHub b23e78b62d Merge pull request #63 from kitty624/gamedir-dev
[Fix] missing attachment for G36C
2023-09-25 00:36:10 +02:00