1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,028 Commits 9 Branches 6 Tags
e6f510cd186b031c06ffbe3030a9ff534a822503
Commit Graph
2028 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
KittyandGitHub e6f510cd18 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 8137421220 Small changes to Backgrounds setting descriptions 2024-03-20 22:34:51 +02:00
Hazapuza a0f9e8ec42 Fixed typos, reworded some parts of the new backgrounds 2024-03-20 21:31:04 +02:00
KittyandGitHub b92b9d857c Merge pull request #84 from kitty624/backgrounds 
Alternative IMP Background Selection (gamedir)
 2024-03-19 23:13:40 +01:00
kitty624 7413aff1ef 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 aa32847b43 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 c6df5bd238 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 5e01c00d7b 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 c838380f93 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 60d58f5f50 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 61746d382d 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 7db32e1d24 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 872923c658 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 5d22db114e 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 a0327441d3 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-03-06 15:43:48 +02:00
Hazapuza cc8d1b9e4f Change AR57 11" and 6"-Silenced weapon class from Rifle to SMG 2024-03-06 15:36:16 +02:00
AsdowandGitHub 2191b8d896 LOBOT: Add ghillie suit and camo uniform (#77) 2024-03-05 11:54:46 +02:00
KittyandGitHub fb41373c33 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 0b38cf10e7 Fixed a crash caused by wrong formatting 2024-02-29 02:50:00 +02:00
KittyandGitHub 3246edc39e 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 d390aaf818 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 b303937ea5 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 4521f6cad7 Merge pull request #74 from Hazapuza/1dot13-gamedir-dev 
Updated Data-UB-1.13...
 2024-02-21 00:49:23 +01:00
Hazapuza 767662b0db 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 60502cf273 Merge pull request #73 from Hazapuza/1dot13-gamedir-dev 
Fix more typos
 2024-02-19 22:19:17 +01:00
Hazapuza f2c28f6d64 Fix more typos 2024-02-19 23:09:23 +02:00
KittyandGitHub 129bd4519d Merge pull request #72 from Hazapuza/1dot13-gamedir-dev 
Fix typos in backgrounds.xml
 2024-02-19 21:53:50 +01:00
Hazapuza 151c461ed8 Fix typos 2024-02-19 22:40:34 +02:00
KittyandGitHub 9e4b1d83f0 Merge pull request #71 from Hazapuza/1dot13-gamedir-dev 
Rewrite background names and descriptions
 2024-02-19 21:32:19 +01:00
Hazapuza f3e93e961d 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 dd84d3c9b7 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 557c802b2c Fix/update several weapon and item weights 2024-02-12 21:17:37 +02:00
Hazapuza 9c0b130b99 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 3eae80ddda 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 2cce518ea7 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 2093c90b28 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 77fd0769cc 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 f83ce4db0d 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 8a8b850dec Update GunChoices_Militia_Regular.xml 2024-02-08 21:37:50 +02:00
Hazapuza 07afc4eaa1 Update GunChoices_Enemy_Regular.xml 2024-02-08 21:20:45 +02:00
Hazapuza 29e4ef045c Update GunChoices_Enemy_Elite.xml 2024-02-08 20:36:29 +02:00
KittyandGitHub bdc3aa5a64 Merge pull request #66 from Hazapuza/1dot13-gamedir-dev 
Fix for two wrong default attachments
 2024-02-08 19:05:36 +01:00
Hazapuza a21ada2a89 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 fd9da2a26c 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 b682856044 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 01635863e3 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 ff40da8acf 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 e415201f64 Merge pull request #63 from kitty624/gamedir-dev 
[Fix] missing attachment for G36C
 2023-09-25 00:36:10 +02:00
kitty624 a28f6dabad [Fix] missing attachment for G36C 
item 664, the G36C, has two default attachments defined in items.xml (1746, Folding Stock and 1322, in-build 2x Scope)

It missed 1322 in attachments.xml and  when using the Folding Stock (fold/unfold) it resulted in an error for not finding 1322 attached after the transformation

Added entry for 1322 (in-build 2x Scope) on 664 (G36C) in attachments.xml to fix that
 2023-09-25 00:31:39 +02:00
FunkyFr3shandGitHub 9c730d5dcf fix low fps issue (#60) 2023-09-07 22:48:40 +03:00