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
Asdow 49a56d01ac Load correct militia icons for 720p resolution 2025-07-08 20:21:54 +03:00
Asdow 9d1e9e8948 Fix line highlighting 2025-06-27 20:28:15 +03:00
Asdow b3b3270e1e Adjust constructors 2025-06-27 19:59:01 +03:00
Asdow 1a8db5d15b More conversions to SoldierID 2025-06-27 19:58:20 +03:00
Asdow 09ce332721 Allow 10 size squads for 720p resolution in UB 2025-06-27 16:00:10 +03:00
Asdow 5e2c61ef12 Externalized UB bloodcat quest sector 2025-06-25 22:54:53 +03:00
Asdow 041459aa5f Externalized UB bloodcat quest sector 2025-06-25 22:54:22 +03:00
Asdow 8f4ab010c0 Fixes quest ending if you kill bloodcats before talking to Betty first 2025-06-25 22:53:38 +03:00
Asdow c66163abfd Fix Speck speech after hiring a merc 
Speech file formats take precedence in order of mp3 > ogg > wav
Data-1.13 had two of Speck's lines as .ogg format which would then get loaded even in UB instead of UB specific lines that were in .wav format.
 2025-06-25 16:26:55 +03:00
Asdow b10e59c79c Use correct backgrounds for UB mercs 
Gaston, Stogie and Manuel had wrong backgrounds as the profiles we use in UB are different from the ones that were added to JA2
 2025-06-25 13:45:12 +03:00
Asdow 4d948fda06 Fix powergen fan stopping in UB 
Sector Y & Z coordinates were mixed up in code, which would then always fail the check for correct sector.
 2025-06-24 22:54:44 +03:00
Asdow 2ae110971b spelling fixes 2025-06-24 22:54:44 +03:00
Asdow 9a78e7dfa0 Formatting changes 2025-06-24 22:54:44 +03:00
Asdow d95bae2bf6 Re-enable power generator fan sound effect for UB 2025-06-24 22:54:44 +03:00
Asdow a1bb85ca95 Externalize fan exitgrid location in the source sector 2025-06-24 22:54:44 +03:00
Asdow 9b11678c43 Improve ini setting descriptions 
* Externalized the fan tunnel starting sector exitgrid location that was still hardcoded.
 2025-06-24 22:53:03 +03:00
Asdow b682cf4d7e Update Biggins NPC script 
* Trying to walk past him, he will now stop the player, move to the correct tile, trigger the mine explosives and turn hostile
* Threatening him will close the dialogue, he moves to the correct tile, triggers explosives and turns hostile
* Shooting him makes him turn hostile. Does not trigger explosives. Game keeps freezing if he gets interrupted while on his way to the tile where bombs are set off so this functions as a workaround.
 2025-06-24 19:34:23 +03:00
Asdow d9391de58a Fix laptop crush popup text 
Due to additional dialogue flag having the value 8, and UB not having a specific flag for mercs standing up after heli crash, the FindSoldierByProfileID would always find Steroid if he was on the team, and then display the crunched laptop popup text.

Adding a new flag that is checked before we go into that branch in HandleDialogue fixes the issue.
 2025-06-22 12:43:33 +03:00
Asdow c02bbc90cb Fix helicopter for UB 
No need to force an assert error here. We can simply ignore the meanwhile scene just like all the others.
 2025-06-18 22:58:17 +03:00
Asdow efb54202ea Fix Mercprofile usStrategicInsertionData for bigmaps 
NPCs would not appear in the map if their gridno was over 65535 in large maps
 2025-06-15 14:42:34 +03:00
edawgsnizzleandGitHub a2a5ea127e Missing Rooftile 
replaced missing rooftile
 2025-05-25 05:26:41 +10:00
KittyandGitHub e666b04acb Update chinese translation (#18) (zwwooooo) 
Chinese translation update(by Forum of Playbar): 1dot13/gamedir a9ba654
 2025-05-11 17:07:04 +02:00
zwwooooo 042f474d66 Chinese translation update(by Forum of Playbar): 1dot13/gamedir a9ba654 2025-05-11 17:11:28 +08:00
zwwoooooandmajcosta 11caa6529c Fix the issue of garbled UTF-8 text in the szTileSetDisplayName field of the StructureMove.xml file in the game's "Drag" menu.(Method provided by @Learner) 2025-05-10 14:28:14 -03:00
Asdow e2f296c42c Remove #pragma optimize("", off) 
Managed to slip in in commit f21cb38. Bad Asdow, bad!
 2025-05-01 10:39:19 +03:00
Asdow ee2807ae64 Default to 1st kit if deciding not to buy gear in UB 
1st one is included in the hiring fee
 2025-04-26 00:37:38 +03:00
Asdow b23c9ac8b1 Do not prompt for buying inventory for 1st kit in UB 2025-04-26 00:37:38 +03:00
Asdow fa0c5a2862 Prevent hiring MERC in UB if not enough funds 2025-04-26 00:37:38 +03:00
Asdow db6da100e1 Reset selected gear kit when browsing mercs 2025-04-26 00:37:38 +03:00
Asdow a3e7ce5794 Display special offer for 1st M.E.R.C. inv kit in UB 
* Use weekly instead of daily salary for total cost calculation
 2025-04-26 00:37:38 +03:00
Asdow 5062ae74f2 Display correct salary info for MERCs in UB campaign 2025-04-26 00:37:38 +03:00
Asdow 8eb4308f53 Add weekly & bi-weekly salaries 
UB will rely on weekly salary as the onetime fee and new M.E.R.C members were working for free
 2025-04-25 23:07:58 +03:00
Asdow 90853fbb61 Remove duplicate salary 
UB Gaston (profile 58) had salary tags duplicated with the latter tags having value 0 making him a free mercenary. A veritable oxymoron!
 2025-04-25 22:23:51 +03:00
Asdow dd58f904f4 Do not offer surrender for multiplayer 2025-04-24 21:52:11 +03:00
Asdow 8dcb431ef2 Use (0,0) sector coordinates as unused cache 
Makes the comment in Mod_Settings.ini valid advice
 2025-04-17 23:51:44 +03:00
Asdow 5f45d06852 Fix possible integer overflow 2025-04-16 20:10:11 +03:00
Asdow 92103e36a6 Fix formatting 2025-04-16 01:28:07 +03:00
Asdow 8f98a9b985 Move UpdateAirspaceControl() out of #ifdef 
Fixes UB not updating samsite airspace correctly after battle
 2025-04-16 01:28:07 +03:00
Asdow c2e78d0461 Use correct macro to index StrategicMap 2025-04-16 01:28:07 +03:00
Asdow 36a84ffe59 Remove pSecondColumnString 
* Use the new columns added to Text instead
* Changed most functions to allow choosing a column
* Removed unneeded SecondColumn specific functions to lessen code duplication
* Lots of formatting changes to Popupbox.cpp, indentation was messed up in majority of the functions
 2025-04-13 22:26:32 +03:00
Asdow 865288e622 Implement multicolumn popupbox 
Mainly aimed for strategic movement popup box to accommodate increased team sizes
 2025-04-13 19:11:45 +03:00
AsdowandGitHub 3e45217a9a Add compilationFlags to {exe} (#428) 
* Add compilationFlags to {exe}

sgp.cpp is not recognizing JA2EDITOR preprocessor definition otherwise and therefore does not read EDITOR_SCREEN_RESOLUTION when starting map editor

* Add debugFlags too
 2025-04-12 17:48:12 -03:00
Asdow da3c3bace8 Use mouse position for squad movement popup box initial location 2025-04-09 23:11:11 +03:00
Asdow ec4dc8b058 Provide gMapViewRegion through mapscreen.h 2025-04-09 23:10:32 +03:00
KittyandGitHub d4ae85aa36 Removed tags for detonators (#148) from kitty624 
Removed tags for detonators
no longer needed and also previously been unused
 2025-04-09 21:23:16 +02:00
kitty624 ab1ac2c28f Removed tags for detonators 
no longer needed and also previously been unused
 2025-04-09 21:19:31 +02:00
CptMoore 9df885a264 Fixed tagged releases #2 v2 2025-04-09 20:33:32 +02:00
Asdow 07320ba996 Limit TeamList mouseregions to correct amount 2025-04-09 21:33:28 +03:00
CptMooreandGitHub 5ed70befb4 Fixed tagged releases (#429) 
Fixed tagged releases
 2025-04-09 19:52:23 +02:00
KittyandGitHub 75b7b00461 Chinese translation update (#17) from zwwooooo 
Chinese translation update(by Forum of Playbar): 1dot13/gamedir 3519efb
 2025-04-05 17:03:09 +02:00