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,173 Commits 9 Branches 6 Tags
508310be3e67dfd930f623652e6427c40ed665f9
Commit Graph
54 Commits
Author SHA1 Message Date
Asdow 10250dc035 Merge branch 'master' into ExtraMercs 2024-11-09 13:44:53 +02:00
AsdowandGitHub 49a119e6b9 Convert INVTYPE boolean fields to flagmask (#325) 
Rearranged fields from largest to smallest to remove alignment padding
 2024-08-22 08:48:29 +03:00
rftrdevandGitHub 28aa73a859 Clamp coolness to valid values when generating ARC ammo cache (#220) 
Fixes #217
 2023-09-02 23:01:17 -07:00
Asdow 9ac53cac32 Fix UINT8 references to pSoldier->ubID to UINT16 2023-07-27 21:29:37 +03:00
rftrdevandGitHub fb03cba2fa New feature: transport groups (#172) 
https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=365395
 2023-07-04 20:58:56 -07: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 f6241feb34 Properly reduce ASD resources 2022-11-04 23:15:30 -07:00
rftrdev 76a5fa1731 Remove #pragma optimize 2022-11-04 22:55:38 -07:00
rftrdev 568ee070a8 Disrupt ASD now blocks upgrades 2022-11-03 00:08:03 -07:00
rftrdev 32d565eb99 Change new mission screenmsg to green 2022-11-01 01:08:17 -07:00
rftrdev 70c7c0bf96 Fix bad screen message 
Stop time compression when notifying player about missions
 2022-10-31 17:40:27 -07:00
rftrdev 94b846e021 Simplify merc returning from mission prep 2022-10-29 01:27:53 -07:00
rftrdev c56946f9ba Remove todo 2022-10-29 00:10:56 -07:00
rftrdev 22404480ff Fix mission randomisation 2022-10-29 00:10:13 -07:00
rftrdev 62861ab38e Add notification when new missions are available 2022-10-28 00:56:35 -07:00
rftrdev 7ad938a397 Remove debug line 2022-10-27 00:29:29 -07:00
rftrdev f89f25ab92 Split in-town and loyalty mission prep checks 2022-10-27 00:26:00 -07:00
rftrdev 02d6e48226 Use prep time setting in text 
Remove debug prep time
 2022-10-26 20:48:15 -07:00
rftrdev 54b0bf96b9 Ensure missions can only be started in towns that use loyalty 2022-10-26 00:18:30 -07:00
rftrdev 7d360d01ce Add mission prep time setting 2022-10-25 22:55:19 -07:00
rftrdev c1b5d1719a Add "Send Supplies" mission 2022-10-25 17:28:41 -07:00
rftrdev a35d741403 Add "Disrupt ASD" mission 2022-10-25 09:13:51 -07:00
rftrdev 9ac0795507 Put Soldier Bounties mission into alphabetic order 2022-10-23 02:45:18 -07:00
rftrdev 57ae2c6948 Rename StartMission() to PrepareMission() 2022-10-23 01:36:54 -07:00
rftrdev affc2aec31 Add mission help screen 
Initialise missions properly
 2022-10-23 01:27:13 -07:00
rftrdev 337bb023e3 Don't show "Mission prep in progress" if there are none 2022-10-22 23:17:19 -07:00
rftrdev 89285b4961 Remove debug mission randomisation 
General cleanup
 2022-10-22 22:14:22 -07:00
rftrdev 5000f965e1 Add "Soldier Bounties" mission 2022-10-22 17:54:06 -07:00
rftrdev 1448ee0cbb Prevent toggling on admin actions when the player has too few supplies 
Fix toggle check in daily update
 2022-10-19 11:26:01 -07:00
rftrdev c9421215e0 Toggle admin actions off if the player can't pay upkeep 2022-10-18 22:34:18 -07:00
rftrdev fcd7ed5ef6 Move text to _EnglishText 2022-10-18 22:08:09 -07:00
rftrdev 7e55488b40 Clean up some todos 2022-10-18 17:27:05 -07:00
rftrdev 3807b7fed4 Add proper checks and bonuses for active missions 2022-10-17 23:28:21 -07:00
rftrdev 1e189c54ac Add mission cost settings 2022-10-17 22:40:47 -07:00
rftrdev 572933e359 Display missions, both active and under preparation 2022-10-17 19:37:12 -07:00
rftrdev 3724de9299 Properly reset merc assignment when mission prep completes, regardless of success or failure 
Fix use of merc profile id in first mission event param
 2022-10-17 14:38:51 -07:00
rftrdev 61858e472a Move some text around 2022-10-17 13:56:45 -07:00
rftrdev d9697e900b Add merc contract check to StartMission 
Fail mission prep if the agent is no longer in the player's employ
 2022-10-17 00:39:32 -07:00
rftrdev 983aa24b1b Add settings variable for mission refresh time 
Fix nullptr derefence when starting a mission with a generic agent

Limit missions to one per batch

Add popup box and screenmsg when a mission activates, fails to activates, and expires
 2022-10-17 00:33:38 -07:00
rftrdev 2b88fac870 Award exp to mercs who prep a mission, regardless of whether they succeed or not 2022-10-16 20:43:21 -07:00
rftrdev e9c4b09de5 Manually align mission prep completion to top of the hour (xx:00) 2022-10-15 00:05:52 -07:00
rftrdev 2e17b4ff14 Show "No mission available" after starting a mission 
Consume supplies after mission starts
 2022-10-14 17:31:07 -07:00
rftrdev c8465baee2 Add POW/MiniEvent/RebelCommand assignment check for StartMission 2022-10-14 01:02:46 -07:00
rftrdev 0485aa230e A bit of cleanup 2022-10-14 00:59:42 -07:00
rftrdev dea5da5fc6 Implement "Train Militia Anywhere" 
Subtract supplies when starting mission

Fix second stage mission strategic event
 2022-10-14 00:26:38 -07:00
rftrdev feaf9827c9 Set up ASSIGNMENT_REBELCOMMAND 
Hook up Start Mission button
 2022-10-13 11:31:48 -07:00
rftrdev 8858559a10 Add checks before enabling Start Mission button 
Minor UI adjustments
 2022-10-12 00:58:30 -07:00
rftrdev 7b0830c060 Initial commit - SVN checkpoint to git branch 2022-10-11 00:17:12 -07:00
rftr 02a8c48873 fix ARC cashback bug: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22776&goto=364578&#msg_364578 
also remove incorrect dependency on fAssignTraitsToEnemy for HVT strikes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-04-15 16:32:07 +00:00
Sevenfm 4f0386be62 ARC: add tooltips to admin actions to show the range of their effect (by rftr). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9303 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-02-16 18:26:11 +00:00