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
3,887 Commits 9 Branches 6 Tags
6dbbfa227a128bc5c5dd48d1435bc2bc786014af
Commit Graph
3887 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Asdow 6dbbfa227a Change shift + B to also pick up back packs in tactical 
Instead of always dropping backpacks, it will now either pick up or drop backpacks depending on if any have been dropped
 2022-11-10 18:40:00 +02:00
greymeisterandGitHub 85f24810a8 Fix MapEditor target by adding legacy_stdio_definitions.lib to the additional libraries as per https://stackoverflow.com/a/34230122 (#21) 2022-11-09 18:10:13 -08:00
rftrdevandGitHub 98f481072a Rename map editor output (#22) 
Add "ja2_" prefix
 2022-11-09 18:06:21 -08:00
rftrdevandGitHub 5a7026c2d3 SCI builder (#20) 2022-11-09 10:12:12 -08:00
rftrdevandGitHub 8399aff39f Merge pull request #19 from zwwooooo/master 
Chinese translation update(by TBS)
 2022-11-09 00:01:10 -08:00
zwwooooo 40bc6d2d62 Chinese translation update(by TBS) 2022-11-09 15:35:19 +08:00
AsdowandGitHub f06e85575d Merge pull request #18 from 1dot13/MapEditor 
Mapeditor items tab fix
 2022-11-08 18:13:10 +02:00
Asdow 06065bb62f Update EditorItems.cpp 
Removed unused clippingRect
 2022-11-07 19:53:40 +02:00
Asdow f4e729ee80 Update EditorItems.cpp 
Improve readability
 2022-11-07 19:42:08 +02:00
Asdow af9e221578 Removed remnants of editoritems buffer as it is no longer used 2022-11-07 19:12:53 +02:00
Asdow 9919531f56 Fix INT16 buffer overflow when displaying items in items tab 
Original implementation initializes a ridiculously wide buffer where item graphics and names are then copied to and is then shown in parts depending on what items should be visible in item tab.  When item counts go over ~32k in x-direction in pixel coordinates, the very low level drawing functions int16 variables overflow and item graphics are then drawn over each other.

It's now changed to blit item graphics and names by on demand depending on the item indices, which does not require a huge buffer and works regardless of the amount of items, since only 11 are visible at any one time and the x-coordinate stays well within INT16 limits
 2022-11-07 18:03:45 +02:00
rftrdevandGitHub 78f2841058 Merge pull request #17 from rftrdev/arc-missions 
Expanded the ARC feature with missions: https://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24884
 2022-11-07 00:37:16 -08:00
rftrdevandGitHub 164b388313 Merge branch '1dot13:master' into arc-missions 2022-11-05 12:56:22 -07:00
rftrdevandGitHub ffcda076b2 Merge pull request #16 from 1dot13/gitignore 
Create .gitignore
 2022-11-05 12:55:50 -07:00
Asdow 49bedd3179 Create .gitignore 2022-11-05 12:34:06 +02:00
rftrdev f6241feb34 Properly reduce ASD resources 2022-11-04 23:15:30 -07:00
rftrdev b401e3944e Update gameversion 2022-11-04 23:00:00 -07:00
rftrdev 76a5fa1731 Remove #pragma optimize 2022-11-04 22:55:38 -07:00
rftrdev 5dd002db29 Update text 2022-11-04 22:53:21 -07:00
rftrdev edad33eb9f Properly undo unrelated Chinese text changes 2022-11-04 22:45:54 -07:00
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