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
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
stephandmajcosta f6ae1a96cd Some BP, and snitch settings were using wrong mapping 2025-10-07 20:41:24 -03:00
Marco Antonio J. Costaandmajcosta 6c96b80afc Remove unused ATMOther2ButtonCallback 2025-10-07 20:36:22 -03:00
Marco Antonio J. Costaandmajcosta 00b5758af1 remove unused ATMOtherButtonCallback 2025-10-07 20:36:22 -03:00
Marco Antonio J. Costaandmajcosta 72ab9b0135 Remove unused CreateDestroyATMButton 2025-10-07 20:36:22 -03:00
Marco Antonio J. Costaandmajcosta 92813f5ce1 remove unused ATMStartButtonCallback 2025-10-07 20:36:22 -03: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
Asdow da83c6a557 Fix power gen fan sound 
* Stop fan sound when switching sector
* Start fan sound when loading a save where current sector is power gen sector
 2025-10-06 22:09:39 +03:00
Marco Antonio J. Costaandmajcosta a9dd9d0ca6 fix visual bug introduced by removing DrawMoneyOnScreen 
AIM profile fees now display correctly for old inventory system as well
 2025-10-05 10:54:44 -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
Asdow 710941edd3 Dynamically adjust contract box position 
Create contract renewal box right next to mouse position. Small QoL change to have the box closer.
 2025-10-03 23:47:15 +03:00
Asdow 0b0fffa21d Improve multiselection contract renewal 
* Contract duration lines are greyed out if the player lacks funds
*Selecting a mix of AIM and other merc types allows renewing contracts for selected AIM mercs
* Multiselection of only mercs whose contracts are not renewable (IMPs, rebels, etc) will have greyed out contract lines
 2025-10-03 23:47:15 +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
Asdow e1acf181df Add FIXME 2025-09-29 11:58:55 +03:00
Asdow 0f8c14e72e Remove FindSoldierByProfileID_() 
All the calls where this was used are functionally identical when we just supply UID to the original FindSoldierByProfileID() call with fPlayerMercsOnly set to FALSE
 2025-09-29 11:58:55 +03:00
Asdow ecea18f57c Add FIXME to l_ActionInProgress 2025-09-29 11:58:55 +03:00
Asdow e63e936715 Clean up 
* Removed superfluous for-if loops
* Wrapped function contents inside if(lua_gettop(L)) scopes similar to other, already fixed functions
* Harmonized whitespace
* Added FIXMEs to two unfinished functions
 2025-09-29 11:58:55 +03:00
Asdow a15ed3aceb Fix l_SoldierGiveItem(lua_State* L) 
Don't use SoldierID when matching for profile id
 2025-09-29 11:58:55 +03:00
Asdow 0cb13650ed Fix whitespace formatting 2025-09-29 11:58:55 +03:00
Asdow 601ef4dc30 Remove duplicate includes 2025-09-29 11:58:55 +03: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 8fa2189a66 Fix schedule compatibility between map versions 7 & 8 2025-09-28 10:35:13 +03:00
Marco Antonio J. Costaandmajcosta cf6cc2a213 Revert "use link-time optimization when creating a release" 
If this is ever the default, it should be set in the CMakeLists.txt file, not in the CI alone. My bad.

This reverts commit a7b0091a27.
 2025-09-27 20:02:15 -03:00
Asdow fb34eb6776 Use SoldierID for checks 2025-09-28 00:34:07 +03:00
Asdow 35984f57d0 Check for valid ubAttacker 2025-09-27 23:57:14 +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
Asdow 6c42f222e1 Fix PBI when enemy attacks starting sector in tactical view 
When enemy attacks the starting sector and player is in tactical view. We go from tactical to strategic screen to show the prebattle interface instead of staying in tactical. The game errors on the sector assert when trying to draw the glowing red locator around the sector just before displaying the prebattle interface.

Normally the sector gets set properly when compressing time for the first time in a new game start but due to UB going into playing the intro video, it skips the call to HandleTimeCompressWithTeamJackedInAndGearedToGo() that would eventually set it. Neither can we rely on setting the sector when initiating the prebattle interface since MapScreenHandle() tries to display the locator before the PBI gets initialized.
 2025-09-27 01:01:23 +03:00
Marco Antonio J. Costaandmajcosta e8aedb29d5 show daily discounted costs for 1week and 2week contracts 
also shorten translations to fit the UI
 2025-09-26 02:31:02 -03:00
Marco Antonio J. Costaandmajcosta ffe987061e remove DrawMoneyOnScreen 
there's already a function to draw text on the screen. a money amount is
text, so just return a string and print that.
 2025-09-26 02:31:02 -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
Asdow 1f6e545a39 Make enemy battle sound respect speech volume setting 2025-09-25 23:26:29 +03:00
Asdow 2b9efd3702 Make helicopter sound respect sound effect volume setting 
Helicopter sound would play upon heli insertion even if sound effects volume was set to 0 in options.
 2025-09-25 22:55:33 +03:00
Asdow f5a7c32bff Use SoldierID instead of pSoldier 
ContinueDialogue was possible to be called with pSoldier that isn't null but is not valid pointer to MercPtrs array resulting in debugger catching an illegal memory access.
 2025-09-25 22:47:51 +03:00
Marco Antonio J. Costaandmajcosta e14a337e03 Prevent AllowReinforcements from reverting to TRUE regardless of setting whenever you save 2025-09-25 15:27:30 -03:00
Asdow d21b487884 Fix include filenames 2025-09-25 13:06:18 +03:00
Asdow a161dcc509 Fix selecting soldiers via right click in editor 2025-09-25 10:17:04 +03:00
Asdow f3b99edbff Fix Debug build 2025-09-24 19:21:58 +03:00
Asdow f47908e033 Fix debug mode defines 
JA2BETAVERSION gets defined in cmake depending on selected config
 2025-09-24 19:21:58 +03:00
AsdowandGitHub f52ab32952 Merge pull request #331 from 1dot13/ExtraMercs 
Increased Team Sizes (ITS)
 2025-09-24 17:07:51 +03:00
AsdowandGitHub 62210f2c21 Merge pull request #167 from 1dot13/ExtraMercs 
Increased Team Sizes
 2025-09-24 17:07:40 +03:00
Asdow 82aca548f5 Merge branch 'master' into ExtraMercs 2025-09-24 16:14:10 +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