Commit Graph
7619 Commits
Author SHA1 Message Date
Asdow 5f45d06852 Fix possible integer overflow 2025-04-16 20:10:11 +03:00
Asdow 92103e36a6 Fix formatting 2025-04-16 01:28:07 +03:00
Asdow 8f98a9b985 Move UpdateAirspaceControl() out of #ifdef
Fixes UB not updating samsite airspace correctly after battle
2025-04-16 01:28:07 +03:00
Asdow c2e78d0461 Use correct macro to index StrategicMap 2025-04-16 01:28:07 +03:00
Asdow 36a84ffe59 Remove pSecondColumnString
* Use the new columns added to Text instead
* Changed most functions to allow choosing a column
* Removed unneeded SecondColumn specific functions to lessen code duplication
* Lots of formatting changes to Popupbox.cpp, indentation was messed up in majority of the functions
2025-04-13 22:26:32 +03:00
Asdow 865288e622 Implement multicolumn popupbox
Mainly aimed for strategic movement popup box to accommodate increased team sizes
2025-04-13 19:11:45 +03:00
AsdowandGitHub 3e45217a9a Add compilationFlags to {exe} (#428)
* Add compilationFlags to {exe}

sgp.cpp is not recognizing JA2EDITOR preprocessor definition otherwise and therefore does not read EDITOR_SCREEN_RESOLUTION when starting map editor

* Add debugFlags too
2025-04-12 17:48:12 -03:00
Asdow da3c3bace8 Use mouse position for squad movement popup box initial location 2025-04-09 23:11:11 +03:00
Asdow ec4dc8b058 Provide gMapViewRegion through mapscreen.h 2025-04-09 23:10:32 +03:00
KittyandGitHub d4ae85aa36 Removed tags for detonators (#148) from kitty624
Removed tags for detonators
no longer needed and also previously been unused
2025-04-09 21:23:16 +02:00
kitty624 ab1ac2c28f Removed tags for detonators
no longer needed and also previously been unused
2025-04-09 21:19:31 +02:00
CptMoore 9df885a264 Fixed tagged releases #2 v2 2025-04-09 20:33:32 +02:00
Asdow 07320ba996 Limit TeamList mouseregions to correct amount 2025-04-09 21:33:28 +03:00
CptMooreandGitHub 5ed70befb4 Fixed tagged releases (#429)
Fixed tagged releases
2025-04-09 19:52:23 +02:00
KittyandGitHub 75b7b00461 Chinese translation update (#17) from zwwooooo
Chinese translation update(by Forum of Playbar): 1dot13/gamedir 3519efb
2025-04-05 17:03:09 +02:00
Asdow f21cb38647 Increase TileNo to UINT32
Bigmap grid number values go over uint16 max
2025-04-05 16:20:37 +03:00
zwwooooo 7d6b33f1a7 Chinese translation update(by Forum of Playbar): 1dot13/gamedir 3519efb 2025-04-05 20:27:24 +08:00
KittyandGitHub 4097fae2d1 LOBOT: Officer's Coat, palette fixes (#147) from Hazapuza
LOBOT: graphics for Officer's Coat, palette fixes
2025-03-26 12:56:09 +01:00
Hazapuza e843b4d71c LOBOT: graphics for Officer's Coat, palette fixes
LOBOT:
- Added graphics for the Officer's Coat
- Added a separate palette for tan-colored firearms (the SCAR and XM8 families and the Milkor)
- Added a separate palette for the Guardian Vest

Items:
- The Officer's Coat can now also be attached to most vest armors
2025-03-26 08:28:25 +02:00
KittyandGitHub 8595ca8e6d LOBOT: Various fixes to filters, added a new Army Cap hat (#146) by Hazapuza
LOBOT: Various fixes to filters, added a new Army Cap hat
2025-03-24 05:43:12 +01:00
Hazapuza cfae93fdbd LOBOT: Various fixes to filters, added a new Army Cap hat
LOBOT:
- Fixed and renamed several filters in Filters.xml and the related LogicalBodyType .xml files
- Leather jackets now display longsleeved graphics

Items:
- Added a new Army Cap hat, uses the existing ballcap LOBOT graphics
2025-03-23 20:11:01 +02:00
KittyandGitHub 80c32d378a Cowboy Hat item and LOBOT graphics (#145) from Hazapuza
Added a Cowboy Hat item and LOBOT graphics, minor changes and fixes
2025-03-21 23:18:46 +01:00
Hazapuza ffc8e88093 Added a Cowboy Hat item and LOBOT graphics, minor other changes and fixes
LOBOT:
- Added cowboy hat graphics
- Added a palette swap for the SVDS
- Fixed female SWAT Helmet palette
- Ghillie cover, jacket and leggings now display ghillie suit graphics when attached to armor items

Other:
- Added a new Cowboy Hat item, available from BR's later in the game and in Tex's starting gear kits
2025-03-22 00:12:15 +02:00
KittyandGitHub 9e2df5b7a6 LOBOT: Updated Filters.xml... (#143) from Hazapuza
LOBOT: Updated Filters.xml...
2025-03-20 20:31:00 +01:00
Hazapuza a95f9fa3df LOBOT: Updated Filters.xml...
...to correctly display Woodland BDU Jacket when it's attached to a vest armor item.
2025-03-20 16:06:04 +02:00
KittyandGitHub 51ad7c23a8 LOBOT: New blunt melee weapon strike ... (#142) from Hazapuza
LOBOT: New blunt melee weapon strike animation, other small refinements
2025-03-19 22:00:07 +01:00
Hazapuza 6efc13e7c3 LOBOT: New blunt melee weapon strike animation, other small refinements
LOBOT:
- Added a new blunt melee weapon strike animation, currently used by the Retractable Baton, Shovel and Pipe Wrench
- Touched up some .sti files
- Changed SWAT Vest, Leggings and Helmet color to a more subdued one
2025-03-19 21:16:27 +02:00
edawgsnizzleandGitHub 7876eadfa6 Fixed IMP Male 4 voice (#137)
* Add files via upload

* Add files via upload

* Delete Data-1.13/Speech/169_064.GAP

* Delete Data-1.13/Speech/169_004.WAV

* Delete Data-1.13/Speech/169_004.GAP

* Delete Data-1.13/Speech/169_005.WAV

* Delete Data-1.13/Speech/169_007.WAV

* Delete Data-1.13/Speech/169_009.GAP

* Delete Data-1.13/Speech/169_009.WAV

* Delete Data-1.13/Speech/169_037.WAV

* Delete Data-1.13/Speech/169_055.GAP

* Delete Data-1.13/Speech/169_055.WAV

* Delete Data-1.13/Speech/169_064.WAV

* Delete Data-1.13/Speech/169_067.WAV

* Delete Data-1.13/Speech/169_069.GAP

* Delete Data-1.13/Speech/169_069.WAV
2025-03-09 18:44:46 +01:00
KittyandGitHub 8602e2d4b4 Yet more LOBOT (#141) from Hazapuza
Yet more LOBOT fixes, new BDU jacket and pants items, new berets,...
2025-03-09 17:55:13 +01:00
Hazapuza 68a3167924 Yet more LOBOT fixes, new BDU jacket and pants items, new berets, minor item/text changes and fixes
LOBOT:
- Fixed SPAS 12 and basic shotgun ground shadows and water animation palettes
- Added palettes and filters for desert and urban camouflage jackets and pants, originally made by shadics
- Added palettes and filters for green and blue berets, originally made by shadics

Items:
- Changed Field Uniform into Woodland BDU jacket, can be worn in the vest slot and also attached to most body armors, +15% woodland camo, +5% desert camo, reduced armor values, can't take ceramic/titanium plates anymore
- Added Desert (+15 desert camo, +5 woodland camo) and Urban (+15 urban camo) BDU jackets, otherwise identical to above
- Added Woodland (+10 woodland camo, +3 desert camo), Desert (+10 desert camo, +3 woodland camo) and Urban (+10 urban camo) BDU pants, can be worn in the legs slot and also attached to most leg armors
- Added Green and Blue Berets, originally made by shadics
- Gave the Underarmor Camo Shirt +5% stealth bonus
- Folding Stock (folded) and Retractable Stock (retracted) now have their own distinct inventory images
- Touched up Fire Extinguisher inventory images
2025-03-09 17:30:28 +02:00
KittyandGitHub 9540ef7337 More LOBOT (#140) from Hazapuza
More LOBOT .sti file fixes, new graphics for Pepper Spray, new...
2025-03-07 20:51:59 +01:00
Hazapuza 697889b5ad More LOBOT .sti file fixes, new graphics for Pepper Spray, new Balaclava and Woodland Camo Pants items, assorted other minor fixes and changes
LOBOT:
- Fixed more bugged LOBOT ground shadows and water animation palettes
- Added LOBOT graphics for the Pepper Spray weapon
- Added more missing melee weapon LOBOT graphics
New items:
- Added a new Balaclava item, available from BR's, fits into the helmet slot and also works as an attachment on most other headgear
- Added Woodland Camo Pants, available from BR's, fits into the legs slot and also works as an attachment on most other leg armors
Other:
- Dress Uniform can be attached to most armor vests, also reduced its armor protection to minimum
- Reduced Officer's Coat armor protection to minimum
- Reduced Underarmor Shirt coolness from 5 to 4
- Touched up the big inventory image of the Empty Sandbag item (removed the light blue pixels)
- Fixed several typos in item descriptions
- Made minor changes to item descriptions
2025-03-07 21:44:29 +02:00
Asdow 4823ef4929 Add check for vest position attachments 2025-03-06 17:39:35 +02:00
KittyandGitHub e3bbe26a26 LOBOT add missing palette (#139) from Hazapuza
Fixed a crash caused by missing palette files
2025-02-28 15:08:38 +01:00
Hazapuza 2b35e05953 Fixed a crash caused by missing palette files 2025-02-28 16:04:11 +02:00
KittyandGitHub 525b40f138 LOBOT updates and fixes (#138) from Hazapuza
LOBOT: added new gear graphics, fixed graphical bugs, assorted other fixes
2025-02-28 02:13:41 +01:00
Hazapuza b45c78afdb LOBOT: added new gear graphics, fixed graphical bugs, assorted other fixes
- Added unique LOBOT graphical assets for most clothing and armor that previously lacked them
- Added assets for most bladed melee weapons
- Added assets for combat pack
- Recolored several LOBOT weapons to match the relevant inventory images (including all SCAR, XM8 and FN FAL models)
- Fixed (re-rendered) a large number of bugged two-handed weapon LOBOT .sti files: many had bugged ground shadows in several camera angles and faulty palette in most water animation camera angles
- Fixed a few miscolored pixels in two regular male EOD Vest prone stance .sti files
- Changed the Hand Mortar into a two-handed weapon
- Changed the Jatimatic's weapon type to machine pistol
- Unified regular male LOBOT .sti file names of rifle crouched walk and rifle ready crouched walk animations
- Removed unused Uzi LOBOT files
2025-02-28 03:00:11 +02:00
KittyandGitHub 948b644fe5 Chinese translation update (by Forum of Playbar) (#16) from zwwooooo/master
Chinese translation update(by Forum of Playbar)
2025-02-25 17:17:23 +01:00
zwwooooo bbb281351f Chinese translation update(by Forum of Playbar)
- translation update
- Organize the translated documents
2025-02-25 23:59:50 +08:00
Asdow 586a46bb78 Remove last reference to gbPixelDepth 2025-02-24 23:08:52 +02:00
Asdow fffb3a45fb Remove 8bit mode
Obsolete and doesn't work

* Remove gbPixelDepth
* Remove 8-bit to 8-bit blitters
* FileNameForBPP now only calls strcopy
2025-02-24 21:42:36 +02:00
Asdow 9c951adfea Read correct variable from CTHconstants.ini 2025-02-24 16:11:58 +02:00
Asdow e3a542bf5d Exclude robots from trying to activate panic triggers 2025-02-14 16:47:03 +02:00
HazapuzaandGitHub d5ec95810a Merge branch '1dot13:master' into 1dot13-gamedir-dev 2025-02-10 22:58:02 +02:00
edawgsnizzleandGitHub 5737818675 New AI Voice dialogues for Kyle Lemmos and Tina (#135)
* Add files via upload

* Add files via upload

Kyle Lemmons additional voice dialogue

* AI generated Tina's missing voice dialogues

Not 100% happy with tina's generated voice (due to lack of sample audio) but it's better than nothing. The existing dialogue doesn't really match her merchant type either.

* Rename 129_011.gap to Data-1.13 /Npc_Speech/129_011.gap

* Delete Data-1.13 /Npc_Speech directory

* Delete 129_012.gap

* Delete 129_011.wav

* Delete 129_012.wav

* Delete 129_013.wav

* Delete 129_015.wav

* Delete 129_016.wav

* Delete 129_017.wav

* Delete 129_018.gap

* Delete 129_018.wav

* Delete 129_019.gap

* Delete 129_020.gap

* Delete 129_019.wav

* Delete 129_021.wav

* Delete 129_020.wav

* Delete 129_022.gap

* Delete 129_022.wav

* Delete 129_023.wav

* Delete 129_024.gap

* Delete 129_024.wav

* Delete 129_025.gap

* Delete 129_025.wav

* Delete 129_026.wav

* Delete 129_027.gap

* Delete 129_027.wav

* Add files via upload
2025-02-09 10:18:59 +01:00
HazapuzaandGitHub 5022e5d1f9 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2025-02-05 23:00:27 +02:00
Asdow 222daead0e Remove unused ItemFlags
Detonator and Remote Detonator are specified by AttachmentClass
No items in items.xml actually even contained these flags.
2025-01-27 18:30:11 +02:00
KittyandGitHub eba78de7ad Fix Items.xml classindex (#133)
Fixed Items.xml classindex of Flashlight(s) and RifleGrenadeDevive to match their entry in weapons.xml
2025-01-24 22:10:52 +01:00
kitty624 a4d65edb05 Fix Items.xml classindex
classindex of Flashlight(s) and RifleGrenadeDevive changed to match their entry in weapons.xml
2025-01-24 22:06:01 +01:00
Marco Antonio J. Costaandmajcosta ebd2e25e0f Fix a wrong #ifdef to runtime check conversion
I didn't get this right the first time, non-Chinese text was looking
funny in dialog boxes
2025-01-09 21:37:19 -03:00