1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
KittyandGitHub 8593672279 Added missing tag to Talon (#189) 
Added tag AttachmentSystem 1 to Talon. It's an item meant for use with OAS, the tag now sets it to that.
 2025-09-16 09:21:23 +02:00
kitty624 bace397217 Added missing tag to Talon 
Added tag AttachmentSystem 1 to Talon. It's an item meant for use with OAS, the tag now sets it to that.
 2025-09-16 09:18:07 +02:00
KittyandGitHub 797afbe1ad Added foregrip to appropiate weapons (#188) 
Added a built-in foregrip to weapons with graphics showing a built-in foregrip. Updated attachments of Rocket Rifle and Auto Rocket Rifle, giving them attachments simular to other weapons of that range and coolness.
 2025-09-16 05:55:26 +02:00
kitty624 19ab0b5eb8 Added foregrip to appropiate weapons 
Added a built-in foregrip to weapons with graphics showing a built-in foregrip.
Updated attachments of Rocket Rifle and Auto Rocket Rifle, giving them attachments simular to other weapons of that range and coolness.
 2025-09-16 05:49:59 +02:00
KittyandGitHub f1c7f16b41 Adjusted stand modifiers for HK MP5KA4 (#187) 
Due to the newly added attachment of a foregrip, the stand modifiers of that weapon in items.xml are no longer needed. Removed them so that they don't add up to the ones provided by foregrip, would be to much otherwise.
 2025-09-15 02:48:26 +02:00
kitty624 20b553035b Adjusted stand modifiers for HK MP5KA4 
due to the newly added attchemt of a foregrip, the stand modifiers of that weapon in items.xml are no longer needed.
Removed them so that they don't add up to the ones provided by foregrip, would be to much otherwise.
 2025-09-15 02:42:41 +02:00
KittyandGitHub 8502c57280 Added built-in foregrip for HK MP5KA4 (#186) 
Added built-in foregrip for HK MP5KA4.
This weapon those have one going by its graphic.
Made it a default attachment.
 2025-09-15 02:02:59 +02:00
kitty624 68e601ac64 Added built-in foregrip for HK MP5KA4 
this weapon those have one going by its graphic
made it a default attachment
 2025-09-15 01:59:14 +02:00
KittyandGitHub 2809dc4b9c Added missing entries for some BDU pants #185 
Added missing entries for some BDU pants
 2025-09-13 22:52:21 +02:00
kitty624 3e7764904a Added missing entries for some BDU pants 2025-09-13 22:50:03 +02:00
KittyandGitHub 2ebd490947 Added Bear Traps as ActionItem (#184) 
That way a Bear Trap can be placed in MapEditor (simular to a landmines, etc)
 2025-09-13 21:40:40 +02:00
kitty624 c7ebee63aa Added Bear Traps as ActionItem 
That way a Bear Trap can be placed in MapEditor (simular to a landmine, etc)
 2025-09-13 21:36:47 +02:00
KittyandGitHub 10dbf73cb4 Removed BigGunList-tag from scopes #183 
Removed BigGunList-tag from scopes and fixed false coolness of stocks 1008 and 1009 (wrong number due to me testing stiff prior and forgetting to revert last time)
 2025-09-13 21:06:30 +02:00
kitty624 83e321fa60 Removed BigGunList-tag from scopes 
and fixed coolness of stocks (had wrong number due to me testing things prior)
 2025-09-13 21:02:51 +02:00
KittyandGitHub ec753bb98b Adjustments and updates (mostly attachment related) 
Adjustments and updates (mostly attachment related)
Added graphics, fixed entries, added missing tags and entries.
Full details see single commit descriptions.
 2025-09-13 20:11:25 +02:00
kitty624 8aa5272bb8 Added graphics for treated and coated (red and green) variations of EOD and SWAT armor parts 2025-09-13 20:04:28 +02:00
kitty624 521e366f42 Adjustments to Flamethrower 
Part of the ongoing progress to restore functionalty of it.
Further steps will follow.
 2025-09-13 19:58:09 +02:00