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,117 Commits 9 Branches 6 Tags
cache-test
Commit Graph
4117 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
rftrdev 7c6f7d6d09 Revert "Undo unrelated Chinese text changes" 
This reverts commit 75332ea219.
 2022-11-04 22:42:09 -07:00
rftrdev f140e17b65 Merge branch 'arc-missions' of https://github.com/rftrdev/1dot13-source into arc-missions 2022-11-04 22:39:43 -07:00
rftrdev 75332ea219 Undo unrelated Chinese text changes 2022-11-04 22:39:33 -07:00
rftrdev 6f6d457188 Undo unrelated Chinese text changes 2022-11-04 22:37:28 -07:00
rftrdev a554f0de17 Remove #pragma optimize 2022-11-04 22:32:23 -07:00
rftrdevandGitHub 0aa1561ef8 Merge branch '1dot13:master' into arc-missions 2022-11-04 21:55:33 -07:00
AsdowandGitHub 2d20a2baba Merge pull request #14 from 1dot13/Asdow-patch-1 
Delete .vs directory
 2022-11-04 21:04:39 +02:00
AsdowandGitHub a6ca3abfe2 Delete .vs directory 
Delete a file that should not have been committed in the previous pull request
 2022-11-04 21:02:52 +02:00
AsdowandGitHub 8e99410f52 Merge pull request #13 from 1dot13/bugfix 
r9404: Prevent illegal array access
 2022-11-04 20:27:10 +02:00
Asdow 95e9d83165 r9404: Prevent illegal array access 
Using kill all enemies cheat via ALT + o caused reading MercPtrs from index 254 when its last element is at 253
 2022-11-04 20:26:01 +02: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 1f20d7c27d Merge branch 'arc-missions' of https://github.com/rftrdev/1dot13-source into arc-missions 2022-10-23 02:45:32 -07:00
rftrdev 9ac0795507 Put Soldier Bounties mission into alphabetic order 2022-10-23 02:45:18 -07:00
rftrdev 53779635ce Put Soldier Bounties mission into alphabetic order 2022-10-23 01:53:23 -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 39798ce507 Copy loc changes from english to other languages 2022-10-19 23:30:23 -07:00
rftrdev cb3613eb1b Merge branch 'arc-missions' of https://github.com/rftrdev/1dot13-source into arc-missions 2022-10-19 17:06:15 -07:00
rftrdevandGitHub f3ca6cb80b Merge branch '1dot13:master' into arc-missions 2022-10-19 17:06:04 -07:00
rftrdevandGitHub e3c1c5e191 Merge pull request #9 from rftrdev/minievents-statup-fix 
Ensure a nonzero value is used for Mini Event stat changes
 2022-10-19 17:05:06 -07:00
rftrdev 4b8b549df5 Ensure a nonzero value is used for Mini Event stat changes 
Fixes an assert found by Vacuusimago on Discord
 2022-10-19 16:49:12 -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
rftrdevandGitHub 392b70b1c5 Merge branch '1dot13:master' into arc-missions 2022-10-17 00:44:35 -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