Commit Graph
7619 Commits
Author SHA1 Message Date
dpapadamandGitHub 053ccef9b0 Update Explosives.xml (#16)
<ubType>12 is FIRE RETARDANT, Setting to <ubType>11 for DEBRIS SMOKE
2023-01-16 01:26:16 +02:00
KittyandGitHub 76d5c85605 Merge pull request #78 from majcosta/pr_fix_cmake_and_preset_for_vs2019
Make cmake build and preset work with the version bundled with VS2019
2023-01-15 23:06:19 +01:00
Marco Antonio Jaguaribe Costa 1312b4dcbe Make cmake build and preset work the version bundled with VS2019 2023-01-15 18:59:57 -03:00
AsdowandGitHub a32e276e4d Add possibility to match against helmet attachments (#77) 2023-01-15 23:02:28 +02:00
KittyandGitHub bcdd44726b Merge pull request #75 from CptMoore/cmake_default_presets
Cmake + default presets that work with Visual Studio
2023-01-15 16:41:57 +01:00
AsdowandGitHub 71e25e8b6f Merge pull request #14 from 1dot13/LOBOT
New graphics for LOBOT
2023-01-15 02:09:23 +02:00
Asdow 29be6a32e8 EOD suit for big male 2023-01-15 01:59:12 +02:00
Asdow adda846ba6 Update Hats.stp 2023-01-14 15:25:51 +02:00
Asdow c443d12875 Fix regular male EOD helmet when prone 2023-01-14 15:24:57 +02:00
Asdow c271367d36 Fix rolling with rifle and eod suit on 2023-01-14 14:59:33 +02:00
Asdow d14a91aa55 Added alternative eod helmet graphics
When prone and wearing eod helmet and vest, the vest collar needs to cover part of the helmet
2023-01-14 14:34:00 +02:00
CptMoore 050e7cc5f9 Add more to gitignore 2023-01-14 06:50:43 +01:00
CptMoore f5c0985c38 Better default presets that work for VS and CLion. 2023-01-14 06:50:42 +01:00
Marco Antonio Jaguaribe Costa 8609944467 Add a CMake build
Tried to stay as close as possible to ja2_2019.sln

On Visual Studio 2022 just Project -> CMake Settings for Ja2, add
the x86 configurations you want and press F7.

Below shows how the -DLanguages -DApplications switches work, If you don't
set them, the CMakeCache.txt of them will be set to ENGLISH and JA2,
respectively:

cmake [...] // nothing set, configure just JA2_ENGLISH.exe by default
cmake [...] -DApplications="JA2UB" // configures just Unfinished Business
cmake [...] build -DApplications="JA2UB;JA2UBMAPEDITOR" // Unfinished Business and UB Map Editor
cmake [...] build -DApplications="JA2UB;JA2MAPEDITOR;ALL" // ALL is in the list, configures every application
cmake [...] build -DApplications="JA2MAPEDITOR;DeathStranding" // fatal error: DeathStranding not an application

cmake [...] -DLanguages="GERMAN" // configures just German targets
cmake [...] build -DLanguages="GERMAN;ENGLISH" // German and English
cmake [...] build -DLanguages="GERMAN;ENGLISH;ALL" // ALL is in the list, configures every language
cmake [...] build -DLanguages="ENGLISH;ESPERANTO" // fatal error: ESPERANTO not supported
2023-01-14 02:08:39 -03:00
Asdow 9f0411c034 Remove EOD helmet and vest from other filters 2023-01-14 02:39:05 +02:00
Asdow 2c51175185 Added EOD suit animations for female 2023-01-14 02:38:25 +02:00
Asdow 0dd516ecea update EOD vest sti files 2023-01-13 19:19:20 +02:00
Asdow b2169e2d2f Update LOBOT xml files 2023-01-13 18:43:02 +02:00
Asdow 8891e9520c EOD suit anims for regular male 2023-01-13 18:38:31 +02:00
Asdow 1cd94aa504 Add spectra & balaclava for big male and female 2023-01-12 20:41:21 +02:00
CptMooreandGitHub 9f5b181299 Don't push v1.13 tag but fake a v0. Normalized product label, especially removed prepended v to avoid confusion with git tags, also matches the main menu logo now. (#72) 2023-01-11 21:58:21 -08:00
zwwooooo 7a198acdec Merge branch 'master' of github.com:1dot13/source 2023-01-11 15:24:44 +08:00
zwwoooooandGitHub 56b4d16aea Chinese translation update(by TBS) (#70) 2023-01-10 23:11:49 -08:00
zwwooooo 62029a8ea9 Chinese translation update(by TBS) 2023-01-11 14:31:08 +08:00
CptMooreandGitHub 1a75806dd2 GitHub Workflow improvements (#59)
* GitHub Workflow improvements
- Automatically pre-release master as "latest"
- Build all languages
- Parallelize workflow
- Support tag based releases

* GitHub Workflow: Added support for ja2ubmapeditor.
2023-01-10 17:52:46 -08:00
majcostaandGitHub 512717aff9 remove leftover references to removed files in VS project files (#69)
missed those in #49
2023-01-10 20:40:58 +02:00
KittyandGitHub 5732b0ff28 Merge pull request #68 from kitty624/readme
Readme
2023-01-10 14:00:09 +01:00
kitty624 71cb574b31 add readme.md
added readme.md with descriptions and links

a link to upcomming release can be placed here, made a placeholder for now

a png added with ja2v1.13 logo for readme.md
2023-01-10 13:50:05 +01:00
kitty624 4d7ca11c07 Delete readme.txt
deleted old readme.txt

will be replaced by readme.md
2023-01-10 13:43:59 +01:00
majcostaandGitHub cee328f073 replace auto_ptr with std::unique_ptr (#64)
deprecated in C++11 and removed in C++17
2023-01-06 22:49:41 +02:00
majcostaandGitHub be4f1b5e1c remove std:binary_function inheritance from comparator (#65)
deprecated since C++11, removed in C++17
2023-01-06 22:49:27 +02:00
majcostaandGitHub aaa8b094c9 remove UTIL and JA2 preprocessor definitions (#66)
UTIL is never used, and JA2 is always used. assumption being we'll never make 1.13 for Wizardry 8.

video2.h doesn't exist, which prevented me from deleting it.
2023-01-05 20:40:36 +02:00
majcostaandGitHub 24425a82b1 More unused stuff removal (#49)
* More unused stuff removal

delete:
- giant 'metaheaders' (JA2 All.h, Laptop All.h, etc), preferring to add #includes directly where needed
- unused ExceptionHandling and DbMan translation units
- unused WizShare.h, Bitmap.h, trle.h, video_private.h headers

* remove mentions from vc proj files too

* remove preprocessor conditionals for unused definitions

find . -iname '*.h' -o -iname '*.cpp' -exec unifdef.exe -m -UPRECOMPILED_HEADERS -UJA2_PRECOMPILED_HEADERS -UWIZ8_PRECOMPILED_HEADERS -UPRECOMPILEDHEADERS {} ';'

then manually fixed a couple files the tool errored out on

* yes, the comments too

as title
2023-01-03 15:51:48 +02:00
majcostaandGitHub 6024ed62b0 convert UTF-16LE files to UTF-8 (#55)
these three files were in UTF-16LE encoding for some reason, which led
to git treating them as binary files, which means they weren't being git
grep'd

I just converted them using iconv -f utf-16le -t utf8 [origFile] -o
[destFile]

use git show --text to view
2023-01-01 09:26:45 +02:00
AsdowandGitHub 08982d92e7 Fix illegal array access (#53)
Array length was too small when using old skill trait system.
2022-12-25 17:10:46 +02:00
AsdowandGitHub 1f567d9602 Fix CTD when displaying long names in map inventory (#52) 2022-12-25 16:01:01 +02:00
majcostaandGitHub 03e5fbbffd remove Mutex Manager and associated dead code (#44)
this does nothing
2022-12-19 17:43:03 -08:00
12c778118e Remove write-only variable (#42)
git-svn-id: svn://tron.homeunix.org/ja2/trunk@30 5e31c081-6ce3-0310-bb30-f584a8092234

-

https://github.com/ja2-stracciatella/ja2-stracciatella/commit/d1d7fe722a68b07bc8bdc3c90ba9149746eec24e

Co-authored-by: tron <tron@5e31c081-6ce3-0310-bb30-f584a8092234>
2022-12-11 01:27:47 -08:00
rftrdevandGitHub d562424c4b LOBOT: enemies wear backpacks properly
If an enemy soldier gets a backpack when randomly generated, put it into the backpack inventory slot instead of a generic inventory slot.
2022-12-10 02:45:12 -08:00
rftrdevandGitHub 1bcdf6e198 Update build action (#40)
Remove version info from exes, add txt file with source and gamedir version info
2022-12-06 01:18:12 -08:00
AsdowandGitHub 8f22d13fd9 Cache result of evaluating strategicmap.lua (#32) 2022-11-23 21:59:27 +02:00
rftrdevandGitHub 1440f80c02 Update build information (#31)
* Update date format and add date to filename output

Date is now displayed numerically as YYYYMMDD

* Remove build date and SVN version
2022-11-22 23:51:40 -08:00
rftrdevandGitHub 7a0a56762b Revert of 7baeb20 (#30) 2022-11-21 18:24:43 -08:00
Asdow cd3fec5665 Added balaclava, heavy armor vest and holsters for regular male 2022-11-19 20:04:39 +02:00
Asdow 6f618903f0 Added Kevlar vest graphics 2022-11-18 19:47:20 +02:00
rftrdevandGitHub 7fb55752fa Fix IMPs having 0 need to sleep (#26) 2022-11-16 23:28:24 -08:00
tais 0effe64699 remove _Not_Used folder 2022-11-16 16:44:05 +01:00
AsdowandGitHub 9c0cdbce5a Merge pull request #11 from 1dot13/LOBOT
Update Filters.xml
2022-11-10 19:57:55 +02:00
Asdow dabcb10944 Update Filters.xml
Fix typo, for whatever reason this error only triggered in JA2_vanilla vfsconfig
2022-11-10 19:57:13 +02:00
AsdowandGitHub 7704c78d22 Merge pull request #8 from 1dot13/LOBOT
- Add Sawnoff shotgun animations to LOBOT
- Move LOBOT xml data to Data from Data-1.13
-- Items.xml uiIndexes match between 1.13 and Vanilla so a separate filters.xml is not needed for Data-1.13
2022-11-10 19:33:28 +02:00