7623 Commits
Author SHA1 Message Date
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
Asdow 2697a17010 Check if pSoldier is null
Prevent nullptr dereference in AI logging function
2024-01-28 11:16:41 +02:00
Asdow 5a74323d1f Disable AI logging by default
We only want this on when specifically debugging/working on AI.
2024-01-28 11:16:41 +02:00
Asdow 7546a23d0d Allow custom music to be added
Additional music can be added by placing sound files into Dataa/Music folder following this naming convention

musicmode_runningNumber.fileformat, so for example:

Mainmenu_001.mp3
Mainmenu_002.ogg
Laptop_002.ogg
Tactical_003.wav

*****************************************************************
Different musicmodes are

Mainmenu_ 		<-- Mainmenu music
Laptop_ 		<-- Laptop music
Tactical_		<-- Tactical with nothing special going on
Enemy_			<-- Tactical, enemy present
Battle_			<-- Tactical, enemy present and visible
Victory_		<-- Tactical, battle victory
Death_			<-- Tactical, battle defeat
Creepy_			<-- Tactical, creatures present
CreepyBattle_	<-- Tactical, creatures present and visible

Music files can be .mp3, .ogg or .wav formats and 100 songs in each category is supported.
The running numbering starts from 000

*****************************************************************
A few filenames are treated in a special way to facilitate easy replacement of original music.
To replace original music, insert the following named files into this folder

"menumix1"			<-- Mainmenu music
"marimbad 2"		<-- Laptop music
"nothing A"			<-- Tactical with nothing special going on
"nothing B"
"nothing C"
"nothing D"
"tensor A"			<-- Tactical, enemy present
"tensor B"
"tensor C"
"triumph"
"death"
"battle A"			<-- Tactical, enemy present and visible
"tensor B"			<-- This file is also used as battle music
"creepy"			<-- Tactical, creatures present
"creature battle"	<-- Tactical, creatures present and visible
2024-01-27 14:29:51 +02:00
AsdowandGitHub c7bd75b60d Merc arrival location fix (#263)
* User center insertion point for merc arrival

instead of initial arrival gridno that is meant only for the very first helidrop arrival at the start of a game.

* Prevent possible nullptr dereference
2024-01-24 00:35:39 +02:00
KittyandGitHub fd9da2a26c Merge pull request #64 from kitty624/gamedir-dev
Update SectorNames.xml

D2 - changed water type to 1 (drinkable) since there are watertabs in buildings, a reasonable watersource
2024-01-03 03:54:06 +01:00
kitty624 b682856044 Update SectorNames.xml
D2 Changed water type to 1 (drinkable) since there are watertabs in buildings, a reasonable watersource
2024-01-03 03:52:10 +01:00
KittyandGitHub 6840394610 Merge branch '1dot13:master' into Backgrounds 2024-01-03 03:01:34 +01:00
AsdowandGitHub 57bf3d9fa7 Call RemovePlayerFromGroup instead of RemoveGroup (#260)
There was a bug in a provided save where a merc's group had persistent flag set, even though the assignment was DRILL_MILITIA, which should never have a persistent group. When the code was calling RemoveGroup instead of RemovePlayerFromGroup at this point, it would crash the game with an assertion error in CancelEmptyPersistentGroupMovement() as the group in fact was not empty! Now we're removing the merc first and then checking if the group is empty and if so, attempt to delete it.
2024-01-03 00:39:44 +02:00
olafwqqandGitHub fd4b531d53 Fix GetAllForticationGridNo (#259)
It was still returning gridnos as 16-bit integers.
2024-01-02 11:53:29 +02:00
olafwqqandGitHub 4d09bea13e Address two compiler warnings (#258) 2024-01-01 22:43:31 +02:00
AsdowandGitHub 62dd0914fc Allocate one INT8 for ZStripInfo pbZChange (#256)
Fixes assertion errors in DEBUG build when LOBOT is enabled.
2023-12-24 17:29:01 +02:00
AsdowandGitHub 3d5294003a Copy drag info to dummy soldier (#255)
Fixes merc location shifted by one tile during loading a save when A* pathfinding is enabled
2023-12-24 13:48:21 +02:00
KittyandGitHub 668a4e96ad Merge branch '1dot13:master' into Backgrounds 2023-11-08 01:27:57 +01:00
KittyandGitHub 36fcfd9151 Merge pull request #12 from zwwooooo/master
Chinese translation update(by Forum of Playbar)
2023-11-07 23:02:15 +01:00