1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,778 Commits 9 Branches 6 Tags
db29feed11b846e9f6eb36018bb09789783017f8
Commit Graph
101 Commits
Author SHA1 Message Date
Asdow f8b6ee1672 Use externalized emails 2026-01-03 17:27:43 +02:00
Asdow 03edc532e1 Clean up Strategic/*:cpp includes 2025-12-09 00:35:18 +02:00
Marco Antonio J. Costaandmajcosta 3d29eff4d8 use FormatMoney everywhere 2025-10-08 05:36:37 -03:00
Asdow 82aca548f5 Merge branch 'master' into ExtraMercs 2025-09-24 16:14:10 +03:00
BeatAroundTheBuscherandGitHub ed00830202 Fixes Upper/Lower Casing for include paths (#487) 
* Fixing upper/lower case for includes

types.h, zconf.h and zlib.h were renamed so that global includes like Types.h
are not used.
 2025-08-16 22:01:12 -03:00
Asdow d078a3439f Fix squad movement popupbox for increased squads 2025-08-08 17:01:13 +03:00
Asdow 9d1e9e8948 Fix line highlighting 2025-06-27 20:28:15 +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
Asdow da3c3bace8 Use mouse position for squad movement popup box initial location 2025-04-09 23:11:11 +03:00
Asdow de56f653ec Use SoldierID 2024-11-30 23:47:00 +02:00
Asdow f49013307f Convert to SoldierID 2024-11-18 01:01:57 +02:00
Asdow 61c5a41bea LocateSoldier() & HandleMercLeavingEquipmentInDrassen() & HandleMercLeavingEquipmentInOmerta() 2024-11-17 01:35:49 +02:00
Asdow c475f9e4e6 Convert MapScreenCharacterSt::usSolID to SoldierID 2024-11-17 01:25:00 +02:00
Asdow 42d5ecb923 HandleLeavingOfEquipmentInCurrentSector() to SoldierID 2024-11-16 20:09:14 +02:00
Asdow cd720a639a Fix Dismiss Merc not working after selecting several soldiers 2024-11-16 19:25:44 +02:00
Asdow 5cf0ef4bde Correct variables from INT8 to INT16 2024-11-09 22:52:21 +02:00
Asdow 10250dc035 Merge branch 'master' into ExtraMercs 2024-11-09 13:44:53 +02:00
Andrzej FałkowskiandGitHub d56288e313 Fixed incorrect vehicle group id after reloading the game and vehicle movement plot issues. (#207) 2023-08-28 16:26:34 +03:00
Asdow 03482ffc3d Merge branch 'master' into ExtraMercs 2023-07-26 13:17:49 +03:00
NorthFuryandmajcosta 456cfa18cf added option to scale tooltip rendering 2023-05-27 21:52:35 -03:00
majcostaandGitHub 24425a82b1 More unused stuff removal (#49) 
* More unused stuff removal

delete:
- giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed
- unused ExceptionHandling and DbMan translation units
- unused WizShare.h, Bitmap.h, trle.h, video_private.h headers

* remove mentions from vc proj files too

* remove preprocessor conditionals for unused definitions

find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';'

then manually fixed a couple files the tool errored out on

* yes, the comments too

as title
 2023-01-03 15:51:48 +02:00
rftrdev feaf9827c9 Set up ASSIGNMENT_REBELCOMMAND 
Hook up Start Mission button
 2022-10-13 11:31:48 -07:00
Asdow 1f0a8f46e8 Import changes from the local SVN working copy 2022-10-10 10:08:44 +03:00
Asdow 5197ef21e5 r9402: Fixed nullptr dereference & assertion error 
https://github.com/1dot13/source/issues/3#issue-1400794531
https://github.com/1dot13/source/issues/2#issue-1400794162
 2022-10-10 07:45:20 +03:00
Sevenfm 508adc4eee Show "Select All" line in strategic movement popup box only if we have more than 1 movable squad in sector (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-03-29 18:58:33 +00:00
Shadooow 52a42d0354 Changed behavior of Select All button in movement box. Now it will select remaining soldiers, if only some of them are selected instead of deselecting them. It will of course still deselect all if all are selected. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9286 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-31 08:46:52 +00:00
Sevenfm 8c59159213 Added "select all" option for strategic movement popup box (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9269 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-20 19:48:56 +00:00
Shadooow 5bb4de2484 Fixed bug where kicking out a merc and telling him to drop items in current sector while having that sector map inventory open would fail to move his items into sector inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-15 14:08:41 +00:00
Shadooow 18b21ce561 Fixed bug splitting escort-requiring npc with another merc, who is under that npc in squad list, from existing squad resulting in putting the two into different groups and disallowing to plot movement. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9251 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-12 03:12:33 +00:00
Shadooow e600134786 fixed bug allowing to move robot without soldier having control device if they were both in party where another soldier not chosen to move had the device 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 20:44:21 +00:00
Shadooow 9737bd9255 fixed bug allowing to plot path with Robot or NPCs that needs to be escorted on their own 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-01-01 12:36:03 +00:00
Sevenfm 0cc70519d3 Widescreen UI patch (by Asdow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-11-21 12:56:27 +00:00
Shadooow 9f18ebb382 fix: mercs in a helicopter can initiate movement by clicking in their destination column, like regular on-foot/in-car movement (by rfrt) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-10-17 21:58:13 +00:00
Flugente 960bb2d4ba New feature (by rftr): Mini events are a feature where the player can receive short text blurbs, and pick one of two outcomes. 
Based on game implementations like Gloomhaven (road/city events) or Battletech (travel events).

For more info, see https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24865&goto=363481&#msg_363481

Requires GameDir >= r2599

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9137 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-07-09 19:38:55 +00:00
Shadooow 4ca4ea279a why the hell do we have bVehicleID and iVehicleId where the former is some old leftover with wrong value? 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9112 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 05:15:52 +00:00
Shadooow 143711f1ac fix: no more moving around with vehicle that has no fuel 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9109 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-06-27 02:22:30 +00:00
Sevenfm e97b84b01a Allowed moving items between mercs in map screen during combat for mercs that are not in the sector where battle is occurring (by Shadooow). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9009 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2021-05-07 17:45:35 +00:00
Flugente ce61a0b85b Fix: if no squad name is provided in xml, fall back on hardcoded name 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-15 21:23:53 +00:00
Flugente 1e101b2065 Use macro where appropriate for easier maintenance 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8847 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-07 19:47:52 +00:00
Flugente de24b4df88 Fix: noticable lag on slow machines or while debugging when plotting a path in strategic view 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8832 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2020-07-02 21:58:45 +00:00
Flugente be7005c3f8 - Fix: messagebox flagmask is UINT32, not UINT16 or UINT8 
- added flag to display messagebox buttons horizontally instead of vertically

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2019-02-10 14:03:28 +00:00
Flugente 494dbc6e69 Store the profile type in the profile structure and remove superfluous code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8620 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-09-24 19:36:28 +00:00
Flugente c0d77f79c7 Deleted 'mobile militia feature', as 'militia strategic command' offered better ways to move militia. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23649&goto=352592&#msg_352592

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-10 15:31:11 +00:00
Flugente 82a2b6c2db Added new assignments for training existing militia and doctoring them. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23044&goto=352617&#msg_352617

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 21:20:38 +00:00
Flugente cf2f219067 Cleaned up assignment menu code (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-03 15:42:16 +00:00
Flugente e55b480996 New feature: Getting and using intel allows for more spy-related roleplay. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23643&goto=352475&#msg_352475

Requires GameDir >= r2401.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-18 23:17:34 +00:00
Flugente e2c05ce1c6 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-13 20:19:44 +00:00
Flugente 258e9c24a0 New feature: SAM site cover can now overlap, and SAM sites can be hacked to lower their radius. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23211&goto=347188&#msg_347188 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-05 22:22:50 +00:00
Flugente e206c21daa Unified strategic map display code for airspace, militia restrictions and disease 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-09 22:48:16 +00:00