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
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
AsdowandGitHub 417a057147 Merge pull request #4 from 1dot13/cleanup 
Delete Tools folder from GameDir
 2022-10-15 21:30:33 +03:00
Asdow 61505ecadf Delete Tools folder from GameDir 
ExShell is outdated and unusable with cnc-ddraw
Faces viewer and Merc Profile Editor are better stored in a separate repo that has modding tools instead of GameDir
 2022-10-15 21:27:07 +03:00
AsdowandGitHub c7abe64a54 Merge pull request #3 from 1dot13/cnc-ddraw 
Include cnc-ddraw wrapper
 2022-10-15 21:15:07 +03:00
Asdow 280034c2f7 Include cnc-ddraw wrapper 
Release 4.7
ddraw.ini settings are set to borderless fullscreen, OpenGL and nearest neighbor scaling by default
 2022-10-15 21:13:31 +03:00
AsdowandGitHub 62f3fc8453 Merge pull request #8 from FunkyFr3sh/master 
Detect cnc-ddraw and disable windowed mode
 2022-10-15 21:04:25 +03:00
rftrdev e9c4b09de5 Manually align mission prep completion to top of the hour (xx:00) 2022-10-15 00:05:52 -07:00
rftrdev b0b26d8ef2 Fix being able to assign Radio Scan in specific cases 2022-10-14 23:43:43 -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
FunkyFr3shandGitHub 5441cd3326 Detect cnc-ddraw and disable windowed mode 2022-10-14 13:24:47 +02: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
Asdow 5c13170424 Create .gitignore 2022-10-10 15:58:11 +03:00
Asdow 1f0a8f46e8 Import changes from the local SVN working copy 2022-10-10 10:08:44 +03:00
AsdowandGitHub 9cc567644f Merge pull request #4 from 1dot13/bugfix 
r9402: Fixed nullptr dereference & assertion error
 2022-10-10 07:48:13 +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
rftr 41e0cedb7a fix: mercs in pow/minievent state feed themselves properly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-09-26 22:21:31 +00:00
rftr ec6867fa4b changed return type of CountAllMilitiaInFiveSectors() from UINT8 to UINT16 to fix an overflow during militia reinforcement 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-09-08 18:09:07 +00:00
Sevenfm a45df3c3b0 Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@9399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-23 11:14:53 +00:00
Sevenfm b7067b860c Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9398 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-23 11:14:33 +00:00
Asdow 9ac2d3c828 Fix wrong offset resulting in character inventory background not drawn in old inventory & 1024x768 resolution 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9397 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-16 14:08:09 +00:00
Asdow 317f741811 Added assertion with error message to prevent silent crashes/nullptr dereference if loading big item graphics fails. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-16 13:37:08 +00:00
rftr 45a0441a06 update email text and clarify ghillie armour/attachments (by Antonia) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2653 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-08-12 04:29:45 +00:00
rftr b843d82f54 add nullptr check to features and options screen buttonlists 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-06 17:07:06 +00:00
Sevenfm 07700a8d7e MakeSureMedKitIsInHand: 
- for AI, just swap objects as they don't care about pockets
- only show "nowhere to place item" message for player mercs (prevents medic AI from spamming messages)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-06 12:44:56 +00:00
Asdow f733bda830 Fixed nullptr dereference in void CommonEnterCombatModeCode( ) & added two nullptr safety checks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-02 22:29:00 +00:00
Asdow 9f0a3e03bb Fixed glowing rectangle staying on the screen if one selects an item, clicks Finish button instead of closing inventory pool with checkmark/right click and then goes back to gear selection screen through Attributes screen 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-02 07:42:38 +00:00
Asdow 1f095b7d31 Implemented new IMP gear selection interface to replace the dropdown menus. Requires GameDir rev 2652. 
Enrico's letter is forced to the first hired merc in old inventory, similar to new inventory in case a free item pocket is not found.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-08-01 21:15:34 +00:00
rftr 4df7d090f1 Added graphics for new imp gear selection (by Asdow) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2652 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-08-01 21:07:15 +00:00
rftr e0e82b7477 update hotkey PDFs (by Toni) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2651 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-08-01 04:25:49 +00:00
Sevenfm 058a2cd40f HandlePrison: 
- more precise calculation of prisoner to guard ratio
- improved calculation of random number of prisoners escaping (allow single prisoner/max prisoners to escape when not guarded)
- check that someone actually escaped before showing riot message
- limit ubNumTroops to 255 (like in other places) as 512 makes no sense for UINT8 value

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9390 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-07-31 15:30:22 +00:00
rftr 612cc2a405 fix: clear world items when starting a new game 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-06-03 04:43:48 +00:00
rftr 15bb2a8537 check in missed file 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-29 19:25:17 +00:00
rftr 4b40212ebd added new options to limit merc salary increases on level up: 
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-28 21:09:02 +00:00
rftr d6dab713fe added new options to limit merc salary increases on level up: 
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2650 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-05-28 21:08:59 +00:00
Sevenfm 9441173fba Chinese translation update (by zwwooooo). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2022-05-20 11:01:37 +00:00