1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-02 14:36:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,601 Commits 9 Branches 6 Tags
0224174795c3a40e1bf8956d7c138fbeccaa4113
Commit Graph
7601 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zwwooooo 7383d6b3f6 Merge branch 'master' of github.com:1dot13/source 2023-05-26 15:35:00 +08:00
AsdowandGitHub f2ab296b49 Display icon and tooltip for belt fed weapons (#155) 2023-05-26 08:12:55 +03:00
AsdowandGitHub 66c7fc1c8d Remove compiler warning for exceeding stack size (#154) 
Use std::map & std::set instead of two 16001 elements long arrays
 2023-05-25 23:36:55 +03:00
AsdowandGitHub e4e1d472fd Remove compiler warning for exceeding stack size. (#153) 
* Use std::map instead of 16001 elements long array
* Remove old commented out code
 2023-05-25 22:46:18 +03:00
majcosta dd004dc114 Clean up .gitignore 
To set up a personal .gitignore:

using Git Bash:
`echo shelve/ >> ~/.gitignore`
`git config --global core.excludesFile ~/.gitignore`

using Command Prompt, replace `~` with `%USERPROFILE%`
 2023-05-23 20:02:42 -03:00
sun-alfandGitHub 27954babf5 Merge pull request #149 from 1dot13/master_1dot13 
[Fix] A bunch of fixes for artillery strike
 2023-05-23 16:25:24 +02:00
sun-alf ab2a26accb [Fix] A bunch of fixes for artillery strike 
* Avoid using hard-coded Signal and HE mortar shell indices. This caused art.strikes malfunctioning in item mods.
* Trim max nubers of waves to duration of signal smoke. Otherwise art.strike turns into unnatural stupidity.
* If enemy AI tried to get art.strike but lacked of resources, player will not a warning anymore.
 2023-05-22 22:06:18 +03:00
Robert BiterandGitHub 6e30d24ce5 make gitignore Visual Studio definitions more specific (#144) 
* make gitignore Visual Studio definitions more specific
 2023-05-20 19:56:27 -03:00
AsdowandGitHub 35bb9a70ec Do not load language specific icon file (#146) 
Unnecessary, as there is no translated text in the image files
 2023-05-19 16:47:42 +03:00
AsdowandGitHub 690d2054c6 Added new filters for LOBOT (#145) 
* Weapon class for SECONDHANDPOS items
* Check if weapon is two handed for HANDPOS and SECONDHANDPOS
 2023-05-18 23:33:17 +03:00
rftrdevandGitHub a0aa58f9e5 Update disease flags (hand and face) so that they can be used on the same item (#143) 
* Allow an item to have both disease flags enabled

* Remove extra line break for disease hand protection helptext
 2023-05-15 00:51:37 -07:00
majcostaGitHubRobert Biter
 		90cd7be71d Add instructions to the README.md file (#142) 
* Add instructions to the README.md file

* Update README.md

Co-authored-by: Robert Biter <robert.biter@zalando.de>

---------

Co-authored-by: Robert Biter <robert.biter@zalando.de>
 2023-05-09 12:08:33 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 760f8ab3d7 Remove all MSBuild files 
now that CI is using cmake, we can be clean up the tree quite a bit

btw, cmake can still configure for the msbuild generator for those so inclined:

create the folder, cmd to it, run `cmake [project_root_dir] -G"Visual Studio 17 2022" -A Win32 -DLanguages=ENGLISH -DApplications=JA2` once, then open the solution file using Visual Studio 2022
 2023-05-08 06:44:35 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 18417ce45a Get CMake's MSBuild generator to work correctly 
- MSBuild has safe exception handlers (safeseh) enabled by default, which
some of our libraries don't support

- also needs legacy_stdio_definitions.lib to be linked
 2023-05-07 07:23:07 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 74f4979296 A few nits 
create empty CMakeUserPresets.json file so build happens on first run
comment doesn't apply anymore
no need to specify the compiler when using msbuild@xxx
ask ninja for the verbose command line when building
 2023-04-22 04:31:37 -03:00
CptMooreandmajcosta d8728c9b92 GitHub Workflow: Adjusted for CMake. 2023-04-22 04:31:37 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 3173b73ba0 don't build ja2 export tool by default 
most users don't need this, better if whoever needs it just set
BUILD_JA2EXPORT=ON on their end
 2023-04-22 01:40:11 -03:00
KittyandGitHub ad1f926f4a Merge pull request #5 from zwwooooo/master 
Chinese translation update(by TBS)
 2023-04-15 11:51:23 +02:00
zwwooooo 2e5aabe615 Merge branch 'master' of github.com:1dot13/source 2023-04-12 16:44:15 +08:00
zwwoooooandGitHub fd7ac29917 Chinese translation update(by TBS) (#136) 
* Chinese translation update(by TBS)

* Chinese translation update(by TBS)
 2023-04-12 11:22:03 +03:00
zwwooooo f272703c76 Chinese translation update(by TBS) 2023-04-12 14:12:47 +08:00
zwwooooo 0ac6c3eb2d Chinese translation update(by TBS) 2023-04-12 13:54:16 +08:00
zwwooooo 700734db10 Merge branch 'master' of github.com:1dot13/source 2023-04-12 13:49:10 +08:00
CptMooreandGitHub dc12e1f4f1 Merge pull request #135 from 1dot13/fixed-github-workflow-latest-release-again 
Fixed github workflow latest release again
 2023-04-08 10:36:58 +02:00
CptMooreandGitHub 172d7d20ba Fixed github workflow latest release again 2023-04-08 10:36:47 +02:00
CptMooreandGitHub 67a9860ed9 Merge pull request #31 from 1dot13/trigger-fix-2 
trigger-fix-2
 2023-03-29 19:59:42 +02:00
CptMooreandGitHub f7b5c791e0 trigger-fix-2 2023-03-29 19:59:34 +02:00
CptMooreandGitHub f3e0a28e80 Merge pull request #30 from 1dot13/trigger-fix 
trigger-fix
 2023-03-29 19:57:12 +02:00
CptMooreandGitHub b2800577a2 trigger-fix 2023-03-29 19:56:58 +02:00
FunkyFr3shandGitHub bf85b2e948 Use better default shader (#29) 2023-03-29 10:14:11 +03:00
CptMooreandGitHub 94ac6d97ec Merge pull request #133 from 1dot13/fix-broken-build-process 
Fix broken build process
 2023-03-21 13:14:09 +01:00
CptMooreandGitHub 6618309895 Fix broken build process 2023-03-21 13:13:48 +01:00
rftrdevandGitHub ff360153c7 Redraw inventory panel when changing selected merc in strategic view (#127) 2023-02-21 23:22:30 -08:00
AsdowandGitHub e1f7fa7bfb Fix button glitches in widescreen UI (#125) 
In widescreen strategic UI, team panel sort buttons would be hidden when transferring items to and fro merc inventory via CTRL + left click
Exit inventory panel button should always be disabled in widescreen UI
 2023-02-15 16:36:57 +02:00
AsdowandGitHub f669fa4bdd Added default setting for alternate pathfinding (#28) 2023-02-15 11:53:17 +02:00
AsdowandGitHub 17a0a08097 Add Astars pathing to ingame options (#124) 
* Enabled astars pathing

* Add toggleable pathfinding choice to ingame options

You can choose between original and A* pathfinding algorithms
 2023-02-15 11:49:04 +02:00
Marco Antonio Jaguaribe Costaandmajcosta aa3e10cd29 missing NO_ZLIB_COMPRESSION compile definition for SGP 
forgot about that one
 2023-02-01 10:02:46 -03:00
AsdowandGitHub 35109a5615 Guard against possible illegal array access (by Seven) (#121) 
ClosestPanicTrigger() can return -1 but its use in indexing gTacticalStatus.bPanicTriggerIsAlarm was not checked in all the places in the code
 2023-01-31 20:26:21 +02:00
Marco Antonio Jaguaribe Costaandmajcosta f8f8461a65 replace header preprocessor conditional with cpp function 2023-01-30 09:25:01 -03:00
rftrdevandGitHub b5ec955324 Disable backpack climb check for non-player soldiers (#117) 2023-01-27 17:56:46 -08:00
Marco Antonio Jaguaribe Costaandmajcosta 30fe4bd33b better name for the app/lang dependent shared lib targets 2023-01-27 20:51:25 -03:00
Marco Antonio Jaguaribe Costaandmajcosta dc5eaf7b67 better name for the executable target 2023-01-27 20:51:25 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 7bbe68e6dd improve the comments on root CMakeLists.txt file 2023-01-27 20:51:25 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 319a0ca979 Extract Debug definitions to some syntactic sugar 
this will be used in more targets in the future, this will avoid
repetition
 2023-01-27 20:51:25 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 06f7827d4a There's no need to make a copy of this list, really 2023-01-27 20:51:25 -03:00
majcostaandGitHub d007d3ba9e Remove gszCivGroupNames dependency from main executable (#114) 
* Add include guard to EditorMercs.h

* bring CivGroup related symbols from Tactical over to Editor

and adjust #includes accordingly

* remove redundant #ifdef
 2023-01-26 19:09:46 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 0ee2cfe010 Add Ja2Export target and get it to build on C++17 
nice little tool
 2023-01-26 19:09:05 -03:00
AsdowandGitHub b938c00e10 Lobot: Fix dual wielding sawed off shotguns (#27) 2023-01-25 15:58:19 +02:00
AsdowandGitHub 157123e7ff Add defaults for new option (#25) 2023-01-22 23:36:16 +02:00
AsdowandGitHub 3985dca2c1 Add on option to start at maximum aiming level (#112) 
* Add on option to start at maximum aiming level

When hovering mouse on an enemy, aiming level is started at maximum instead of no aiming when this option is toggled.
 2023-01-22 23:35:42 +02:00