1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Hazapuza 872923c658 LOBOT graphics for XM25 and G11 
- XM25, OICW and AICS set to use the XM-25 graphics

- G11 and CAWS set to use the G11 graphics

-Added '25mm' to XM-25's descriptions, fixed several typos
 2024-03-07 07:33:46 +02:00
KittyandGitHub 5d22db114e Merge pull request #78 from Hazapuza/1dot13-gamedir-dev 
Change AR57 11" and 6"-Silenced variants' weapon class from Rifle to SMG
 2024-03-06 23:28:14 +01:00
HazapuzaandGitHub a0327441d3 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-03-06 15:43:48 +02:00
Hazapuza cc8d1b9e4f Change AR57 11" and 6"-Silenced weapon class from Rifle to SMG 2024-03-06 15:36:16 +02:00
AsdowandGitHub 2191b8d896 LOBOT: Add ghillie suit and camo uniform (#77) 2024-03-05 11:54:46 +02:00
KittyandGitHub fb41373c33 Merge pull request #76 from Hazapuza/1dot13-gamedir-dev 
Fixed a crash caused by wrong formatting
 2024-02-29 02:09:24 +01:00
Hazapuza 0b38cf10e7 Fixed a crash caused by wrong formatting 2024-02-29 02:50:00 +02:00
KittyandGitHub 3246edc39e Merge pull request #75 from Hazapuza/1dot13-gamedir-dev 
Add a few new hints, update LoadScreenHints.xml in Data to match …
 2024-02-27 17:12:25 +01:00
Hazapuza d390aaf818 More updates to LoadScreenHints.xml 
One new hint, reworded a few hints to include secondary hotkeys and to be within the character limit.
 2024-02-27 15:38:42 +02:00
Hazapuza b303937ea5 Add a few new hints, update LoadScreenHints.xml in Data to match the one in Data-1.13 2024-02-27 01:02:32 +02:00
KittyandGitHub 4521f6cad7 Merge pull request #74 from Hazapuza/1dot13-gamedir-dev 
Updated Data-UB-1.13...
 2024-02-21 00:49:23 +01:00
Hazapuza 767662b0db Updated Data-UB-1.13 with AIM and MERC bios and AIM alumni from Data-1.13 2024-02-20 10:27:25 +02:00
KittyandGitHub 60502cf273 Merge pull request #73 from Hazapuza/1dot13-gamedir-dev 
Fix more typos
 2024-02-19 22:19:17 +01:00
Hazapuza f2c28f6d64 Fix more typos 2024-02-19 23:09:23 +02:00
KittyandGitHub 129bd4519d Merge pull request #72 from Hazapuza/1dot13-gamedir-dev 
Fix typos in backgrounds.xml
 2024-02-19 21:53:50 +01:00
Hazapuza 151c461ed8 Fix typos 2024-02-19 22:40:34 +02:00
KittyandGitHub 9e4b1d83f0 Merge pull request #71 from Hazapuza/1dot13-gamedir-dev 
Rewrite background names and descriptions
 2024-02-19 21:32:19 +01:00
Hazapuza f3e93e961d Rewrote background descriptions 
Rewrote background descriptions and changed some bonuses and penalties.  An overhaul of all background stats is still pending.
 2024-02-19 22:13:52 +02:00
KittyandGitHub 0616507282 Merge branch '1dot13:master' into Backgrounds 2024-02-18 01:46:43 +01:00
KittyandGitHub dd84d3c9b7 Merge pull request #70 from Hazapuza/1dot13-gamedir-dev 
Add missing AIM alumni entries, fix typos in MERCBIOS
 2024-02-14 01:12:52 +01:00
Hazapuza 557c802b2c Fix/update several weapon and item weights 2024-02-12 21:17:37 +02:00
AsdowandGitHub 65698284c3 Re-enable extracover check for A* (#283) 
Allows smarter pathfinding for AI, only done during turnbased pathing  to alleviate its extra cost
 2024-02-11 14:57:53 +02:00
AsdowandGitHub 4338b5b909 Fix AI tactical retreat (#282) 
Only perform tactical traversal if pSoldier is at the map edge
 2024-02-11 12:42:21 +02:00
AsdowandGitHub ef69f9b2e6 Allow enemy to retreat (#279) 
This check was preventing enemies from retreating into another sector if tactical AI retreat was enabled, leading into AI deadlock every time AI_ACTION_RUNAWAY was the decision.
 2024-02-11 00:27:14 +02:00
Hazapuza 9c0b130b99 Add missing AIM alumni entries, fix typos in MERCBIOS 
- Added Sam, Beth, Sparky, Postie and Leon to the AIM alumni, with partially altered vanilla alumni texts.

- Capitalized two letters in Skitz's bio
 2024-02-10 18:00:38 +02:00
AsdowandGitHub 28a4db0355 Guard against nullptr dereference (#278) 
Encountered a situation where a pSoldier between bFirstID and bLastID was null and then we'd dereference it.
 2024-02-10 17:18:19 +02:00
KittyandGitHub 6ef6303eb1 Merge branch '1dot13:master' into Backgrounds 2024-02-10 00:56:00 +01:00
KittyandGitHub 3eae80ddda Merge pull request #69 from kitty624/gamedir-dev 
Update to ja2.ini for scaling tooltips

he source pr 1dot13/source#151 made it possible to scale up tooltips

added the setting and description to ja2.ini to allow to make use of it
 2024-02-09 23:32:49 +01:00
kitty624 2cce518ea7 Update to ja2.ini for scaling tooltips 
the source pr https://github.com/1dot13/source/pull/151
made it possible to scale up tooltips

added the setting and description to ja2.ini to allow to make use of it
 2024-02-09 23:28:57 +01:00
KittyandGitHub 2093c90b28 Merge pull request #67 from Hazapuza/1dot13-gamedir-dev 
Fix for errors in enemy and militia gun choices
 2024-02-09 18:11:06 +01:00
KittyandGitHub 77fd0769cc Merge pull request #68 from kitty624/gamedir-dev 
Adjusted attachments.xml for G36C



previous change removed the default in-build 2xscope from G36C in items.xml

to avoid assertion error, adjusted attachments.xml to refelct the change in there as well
 2024-02-08 22:07:40 +01:00
kitty624 f83ce4db0d Adjusted attachments.xml for G36C 
previous change removed the default in-build 2xscope from G36C in items.xml

to avoid assertion error, adjusted attachments.xml to refelct the change in there as well
 2024-02-08 22:05:58 +01:00
Hazapuza 8a8b850dec Update GunChoices_Militia_Regular.xml 2024-02-08 21:37:50 +02:00
Hazapuza 07afc4eaa1 Update GunChoices_Enemy_Regular.xml 2024-02-08 21:20:45 +02:00
Hazapuza 29e4ef045c Update GunChoices_Enemy_Elite.xml 2024-02-08 20:36:29 +02:00
KittyandGitHub bdc3aa5a64 Merge pull request #66 from Hazapuza/1dot13-gamedir-dev 
Fix for two wrong default attachments
 2024-02-08 19:05:36 +01:00
Hazapuza a21ada2a89 Fix for two wrong default attachments 
Removed the built-in 2x scope from the G36C (only iron sights and a picatinny rail in reality) and replaced the built-in retractable stock on the G36K with a folding stock.
 2024-02-08 18:06:54 +02:00
CptMooreandGitHub 32cae66229 Merge pull request #275 from 1dot13/try-number-3 
Another fix for new release steps
 2024-02-04 08:44:53 +01:00
CptMoore b081f2af88 Another fix for new release steps 2024-02-04 08:44:12 +01:00
CptMooreandGitHub 8b02dfe66a Merge pull request #274 from 1dot13/new-artifacts-upload 
Updated github actions, fix for new release steps
 2024-02-04 08:20:04 +01:00
CptMoore c1e72eaab2 Updated github actions, fix for new release steps 2024-02-04 08:16:09 +01:00
CptMooreandGitHub ec1f6e651b Merge pull request #273 from 1dot13/simplified-release-steps 
Simplified release steps
 2024-02-04 07:35:04 +01:00
CptMooreandGitHub 082b42ef73 Simplified release github steps 2024-02-04 07:34:02 +01:00
KittyandGitHub 352459910c Merge branch '1dot13:master' into Backgrounds 2024-02-01 16:25:45 +01:00
AsdowandGitHub d296789929 LOBOT: enemies wear pistol holsters (by Seven) (#271) 2024-01-30 22:53:19 +02:00
AsdowandGitHub 0910dba472 Revert "Disable AI logging by default" (#270) 
This reverts commit 5a74323d1f.
 2024-01-30 11:44:00 +02:00
AsdowandGitHub bb63cb9aa3 Merge pull request #268 from 1dot13/custom-music 
Allow custom music to be added
 2024-01-29 21:50:08 +02:00
Asdow a80fea00e2 Rename 2nd original battle music 
If "Battle B" music file is found, use it instead of tensor B for the second original battle music. Allows us to replace either the enemy present or battle version of the same track instead of always both when "tensor B" is replaced.
 2024-01-29 21:39:13 +02:00
Asdow e93dc3fb6d Allow separate enemy present & battle music for nighttime 
Defaults to regular enemypresent and battle music if no nighttime music tracks are found
 2024-01-29 21:37:05 +02:00
Asdow 51c3967c42 Smarter string formatting 
Accept filenames with two digit running number
 2024-01-29 21:37:05 +02:00