Commit Graph
2589 Commits
Author SHA1 Message Date
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
kitty624 d08b1a5f21 [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 13909d5b80 fix low fps issue (#60) 2023-09-07 22:48:40 +03:00
KittyandGitHub f6e9648617 Merge pull request #58 from andrzejfalkowski/loading-screens-multi-res
Loadscreen - Multiple resolutions and stretch modes
2023-09-02 16:12:25 +02:00
Andrzej Fałkowski 65083b4882 Option desc translations 2023-09-01 16:58:07 +02:00
Andrzej Fałkowski 6236c73367 Merge branch 'master' into loading-screens-multi-res 2023-08-31 23:29:07 +02:00
KittyandGitHub dcadd40dad Merge pull request #57 from kitty624/mercprofiles
added possible nationalities to mercprofiles

- code has more posabilities as comment in header of mercprofiles
- added the missing ones to comment
2023-08-23 06:43:32 +02:00
kitty624 d6a50c6a2a added possible nationalities to mercprofiles
- code has more posabilities as comment in header of mercprofiles
- added the missing ones to comment
2023-08-23 06:41:59 +02:00
KittyandGitHub 5c77c91650 Merge pull request #56 from kitty624/ExtraItemsDir
adjustments to ExtraItems

- currently only works on ground-level
- adjusted readme to inform that it doesn't work at  underground levels
- replaced the former example file that happened to be underground with one at groundlevel
2023-08-22 09:45:33 +02:00
kitty624 f89dc79e3c adjustments to ExtraItems
- currently only works on ground-level
- adjusted readme to inform that it doesn't work at  underground levels
- replaced the former example file that happened to be underground with one at groundlevel
2023-08-22 09:44:14 +02:00
KittyandGitHub 3942d9b1d2 Merge pull request #55 from kitty624/ExtraItemsDir
Update Extra Sector Items readme.txt
2023-08-22 03:53:50 +02:00
kitty624 e2c0195a29 Update Extra Sector Items readme.txt
- small fix on Extra Items readme
2023-08-22 03:52:27 +02:00
KittyandGitHub 8370757e55 Merge pull request #54 from kitty624/ExtraItemsDir
Extra Items by difficulty

- sector specific xml that allow to add extra items
- based on difficulty level
- as I understand, it's realtime
- an old forgotten feature, now revived
- added a few examples, nothing realy fancy, just to show the idea
- when novice the stuff is slightly usefull, when insane it's bonkers
- the readme informs about details
2023-08-22 03:01:46 +02:00
kitty624 bc8b3a467b Extra Items by difficulty
- sector specific xml that allow to add extra items
- based on difficulty level
- as I understand, it's realtime
- an old forgotten feature, now revived
- added a few examples, nothing realy fancy, just to show the idea
- when novice the stuff is slightly usefull, when insane it's bonkers
- the readme informs about details
2023-08-22 03:00:01 +02:00
KittyandGitHub ce152053d7 Merge pull request #53 from kitty624/gamedir-dev
Update Items.xml

added usAdministrationModifier-tag to items.xml
it already exists in code and feature description at forum indicates that it just was forgotten to be added
used the tag for item 1021 "Laptop", just as picture in feature description shows
2023-08-21 16:45:34 +02:00
kitty624 f8fdfe8dc2 Update Items.xml
- added  <usAdministrationModifier>-tag to items.xml
- it already exists in code and feature description at forum indicates that it just was forgotten to be added
- used the tag for item Laptop, just as picture in feature description shows
2023-08-21 16:38:29 +02:00
KittyandGitHub 59e4d1952d Merge pull request #52 from kitty624/mercprofiles
updated mercprofiles25.xml

 - edited to match recent changes to merc traits in mercprofiles.xml
    to ensure UB-1.13 and ja2-1.13 mercprofiles are in sync

-  fix to manuel in mercprofiles.xml (ja2-1.13)
    I had previously neglected to delete athletics after he gained covert ops, did that now
2023-08-21 10:46:23 +02:00
kitty624 dd7721ef7e updated mercprofiles25.xml
- edited to match recent changes to merc traits in mercprofiles.xml
- to ensure UB-1.13 and ja2-1.13 mercprofiles are in sync

- fix to manuel in mercprofiles.xml (ja2-1.13)
I previously neglected to delete athletics  after he gained covert ops, did that now
2023-08-21 10:33:49 +02:00
rftrdevandGitHub dbf4e586f3 Replace evolution with growth modifiers in MercProfiles25.xml (#51) 2023-08-21 00:40:05 -07:00
KittyandGitHub a6ddc59cc1 Merge pull request #50 from kitty624/gamedir-dev
updates to documentation


- deleted Starter documentaion.md no need for .md-file, there are several links to it in other docs here
- deleted folder about additional UB campaigns, the svn-link inside wasn't working anymore
- updated links in other  files
- added some comments in other files
- added link to discord
- updated link for download latest 1.13 and deleted outdated or unofficial ones (i.e. maeyeanie)
2023-08-21 06:23:26 +02:00