1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,266 Commits 9 Branches 6 Tags
a2376b3d8f65144c36bc60b51a553ad746dcae45
Commit Graph
2266 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
KittyandGitHub a2376b3d8f Merge pull request #224 from Greysa/master 
Accompanying changes for Pull request #581 in 1dot13 source (Advanced repairs skill check)
 2026-03-17 10:39:32 +01:00
Greysa 00964207bf Set back to default values 2026-03-12 21:12:29 +11:00
Greysa 0766ab19b6 changed readability 2026-03-12 17:52:21 +11:00
Greysa ad31fe719f Added NUMBER_TRAITS_NEEDED_FOR_ADVANCED_REPAIR option for technician level skill check 2026-03-12 17:29:30 +11:00
Asdow 25312bd88f Update HourlyUpdate scripts for Data and Data-UB 2026-02-12 16:25:41 +02:00
noooooo4499andAsdow cb6a988298 Use guiHour lua global instead of cHour, add HealBoxers 
- The cHour variable was not being properly updated in the code creating a discrepancy between the game clock and it in this script. The guiHour variable already exists and is a direct copy of the guiHour in Game Clock.cpp so use this

- Add HealBoxers function after boxers rest so they don't die as easily after multiple fights
 2026-02-12 10:24:33 +02:00
noooooo4499andAsdow 05094330c6 Fix lua hourly update script 
Use lua setters instead of reassigning the global so it actually does something
Reverted the time conditionals so that it only updates on the opening/closing hours instead of every hour in between. Why was this change necessary to begin with? It also makes it so it resets all the boxing variables every hour instead of daily (not that it even worked before the setter change anyway)

In practice, this fixes a few things so they work as originally intended:
Boxers will actually rest for 1 day after every 3 fights as originally intended
After every rest, boxers will get progressively stronger and harder to beat as originally intended
 2026-02-09 15:57:51 +02:00
Asdow bbd88e1fb7 Remove empty <Message> 
Fixes displaying of AIM offer when email is opened. An empty string at the end would set fOnLastPageFlag = TRUE in PreProcessEmail() preventing us from changing pages in the  BtnNextEmailPageCallback()
 2026-01-04 14:14:03 +02:00
Asdow b825a6d567 Show correct AIM email at game start 2026-01-04 13:26:10 +02:00
Asdow 488a7eb192 Prevent 1.13 extra items appearing in UB 
VFS uses the files from Data-1.13 since Data-UB did not have alternative files, the extra items meant for 1.13 sectors would show up in UB campaigns as well.
 2026-01-04 12:33:25 +02:00
Asdow 150c499c98 Add externalized emails 
* Data -> Emails.xml contains both JA2 and JA2UB emails, which simplified things and we no longer need 4 different EmailSenderNameList.xml files either

* Gameinit.lua scripts have been switched over to use externalized emails
 2026-01-03 17:31:33 +02:00
KittyandGitHub b9d09d09a1 Adding images for M82A1 (#216) from edawgsnizzle/master 
Added previously missing sti images for M82A1
 2025-12-11 11:21:47 +01:00
edawgsnizzleandGitHub f31fd01900 Added images for M82A1 
Forgot to add these on the last PR
 2025-12-11 21:15:25 +11:00
KittyandGitHub d2987515b7 Added M82A1 (#215) from edawgsnizzle/master 
Added M82A1
 2025-12-10 09:32:31 +01:00
edawgsnizzleandGitHub c6f37a8ad0 Added Filters for M82A1 2025-12-10 16:11:38 +11:00
edawgsnizzleandGitHub 524c86b16d Added M82A1 
Item, Attachments and Weapons xml
 2025-12-10 16:09:20 +11:00
KittyandGitHub 6a23992762 Replacing OAS items with NAS items at G2 
replacing Talon (OAS) with NAS underbarrel launchers at map G2 to ensure useabilty when found
 2025-11-30 01:19:25 +01:00
kitty624 57a5e38c9a Replacing OAS items with NAS items at G2 
replacing Talon (OAS) with NAS underbarrel launchers at map G2 to ensure useabilty when found
 2025-11-30 01:15:28 +01:00
Asdow 0b70783053 Add externalized tunnel sectors 2025-11-27 22:38:54 +02:00
Asdow 849e225a02 Update System Limits to ITS maximum values 2025-11-20 13:32:11 +02:00
KittyandGitHub 1793fcbb44 Change FAMAS attachment (#210) 
* Change bipod attachment of FAMAS to not built-in

* Change default attachment of FAMAS
changed from built-in bipod to bipod
 2025-10-15 17:36:01 +02:00
KittyandGitHub 1fa40c063a Make Acog 4x Combo only available with OAS (#209) 
This combo doesn't make much sense in NAS and originaly stems from OAS, so keep it to OAS
 2025-10-10 19:05:58 +02:00
kitty624 baa827d96f Make Acog 4x Combo only available with OAS 
This combo doesn't make much sense in NAS and originaly stems from OAS, so keep it to OAS
 2025-10-10 19:03:12 +02:00
KittyandGitHub 5b38b63c2d Fix another line in lookup for XML-Edior (#208) 
Fix another line in lookup for XML-Edior
 2025-10-09 18:57:12 +02:00
kitty624 7cc1ffc8ca Fix another line in lookup for XML-Edior 2025-10-09 18:55:30 +02:00
KittyandGitHub 913257fbda Another fix lookup data XML-Editor (#207) 
Fixed wrong open/close
 2025-10-09 18:39:42 +02:00
kitty624 ba13c42684 Another iix lookup data XML-Editor 
Fixed wrong open/close
 2025-10-09 18:36:50 +02:00
KittyandGitHub b22edb581c Fix lookup data for Xml-Editor (#206) 
Fix in AttachmentPoints lookup data for XML-Editor
 2025-10-09 18:29:05 +02:00
kitty624 03206a6226 Fix lookup data for Xml-Editor 
fix in AttachmentPoints lookup
 2025-10-09 18:25:22 +02:00
KittyandGitHub f7702e422e Fixed typo 
Typo caused duplicate entry for AR57 16
now fixed so that there's the intented entry for AR57 11 and no more duplicate
 2025-10-08 22:25:21 +02:00
kitty624 0fef835e9e Fixed typo 
Typo caused duplicate entry for AR57 16
now fixed so that there's the intented entry for AR57 11 and no more duplicate
 2025-10-08 22:21:39 +02:00
KittyandGitHub ca72893f68 Remove a duplicate entry for Ares M4 Shrike (#204) 
Remove a duplicate entry for Ares M4 Shrike
 2025-10-08 21:25:28 +02:00
kitty624 3b554c379a Remove a duplicate entry for Ares M4 Shrike 2025-10-08 21:23:19 +02:00
Asdow 36c2cf7955 Fix UB sector enemy counts 
Due to changes in source code lua calls, these were not working and thus most of UB sectors were devoid of enemies.
 2025-10-06 22:34:09 +03:00
Marco Antonio J. Costaandmajcosta 695dbc1173 do not track generated files 2025-10-05 09:37:26 -03:00
Marco Antonio J. Costaandmajcosta b72a67ae96 remove Ja2_Features.ini from repo 
these files are autogenerated, no reason to keep in source control
 2025-10-04 23:10:38 -03:00
Marco Antonio J. Costaandmajcosta 6d6fc192dc remove Ja2_Settings.INI from repo 
these files are autogenerated, no reason to keep in source control
 2025-10-04 22:35:03 -03:00
Marco Antonio J. Costaandmajcosta 6d9b36829c revert BackEnd.dll removal 
this is used by the VB INI Editor, is not part of the original ja2
 2025-10-04 18:38:13 -03:00
KittyandGitHub 043bc417e0 Changed misleading wording about Advanced Repairs (#197) 
* Changed misleading wording for AdvancedRepairs setting
Changed wording to clarify that another setting in SkillSettings.ini is needed for mercs to do advacnced repairs.

* Added missing description for Advanced Repairs
Description lacked the fact that another setting in SkillSettings.ini is needed for mercs to do advanced repairs.
 2025-10-01 05:05:50 +02:00
Marco Antonio J. Costaandmajcosta 2fd282d623 actually binkw32.dll is needed. 2025-09-29 00:39:48 -03:00
Marco Antonio J. Costaandmajcosta d05b252eab do not source control files from the original game 
all of these come with 1.12 version
 2025-09-28 19:35:28 -03:00
BeatAroundTheBuscherandGitHub c4615dd87c Add attachments to hats again (#194) 
* Hand out some hats

* Added Attachments (NVGs, etc.) to non helmet head gear
 2025-09-29 00:01:17 +02:00
KittyandGitHub 75cfbb29fa Removed BDU as attachment for M1911 (#193) 
Removed BDU as attachment for M1911
 2025-09-28 22:50:32 +02:00
kitty624 a9a7e19102 Removed BDU as attachment for M1911 2025-09-28 22:48:44 +02:00
HazapuzaandAsdow 72f3b57f07 Added a name and description to the Robot's background 2025-09-28 22:35:57 +03:00
Asdow 4a9c2dab4b Move tileset 10 from Data-1.13 to Data 
Fixes JA2 vanilla vfs config assertion error
 2025-09-27 14:27:14 +03:00
KittyandGitHub 14e2d126e6 Adding picture for hotkeys on keyboard in QWERTZ layout (#190) 
Picture with some hotkey locations when using keyboard in QWERTZ layout
 2025-09-26 00:07:14 +02:00
kitty624 7ebef5800c Adding picture for hotkeys on keyboard in QWERTZ layout 
Picture with some hotkey locations when using keyboard in QWERTZ layout
 2025-09-26 00:01:14 +02:00
AsdowandGitHub 62210f2c21 Merge pull request #167 from 1dot13/ExtraMercs 
Increased Team Sizes
 2025-09-24 17:07:40 +03:00
KittyandGitHub 3fc7402261 fixed .50 BMG CRATE (#180) from DemiDemiDeminutiv 
.50 bmg couldn't be merged into crates due to wrong ammo type
 2025-09-16 09:52:47 +02:00