1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,937 Commits 9 Branches 6 Tags
f7b5c791e08888b33ac27657cf4dc834b0dcb3a8
Commit Graph
1937 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
AsdowandGitHub f669fa4bdd Added default setting for alternate pathfinding (#28) 2023-02-15 11:53:17 +02: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
CptMooreandGitHub d0a6bcb154 Merge pull request #24 from 1dot13/fix-trigger-source 
Fix (3) trigger-source workflow.
 2023-01-22 00:46:45 +01:00
CptMoore fab4937b0d Fix (3) trigger-source workflow. 2023-01-22 00:46:24 +01:00
CptMooreandGitHub a09464999c Merge pull request #23 from 1dot13/fix-trigger-source 
Fix for trigger-source workflow.
 2023-01-22 00:45:14 +01:00
CptMoore aa3a59c99d Fix for trigger-source workflow. 2023-01-22 00:42:40 +01:00
CptMooreandGitHub dab8a3b78d Merge pull request #22 from CptMoore/add-source-trigger 
Add trigger-source workflow.
 2023-01-22 00:27:18 +01:00
CptMoore 2a8925a1b0 Add trigger-source workflow. 2023-01-22 00:25:13 +01:00
AsdowandGitHub affc574d81 Lobot: Fix flying back with bloodspurt animation (#20) 
There was an error where this animation was 7 frames per direction long, when it should be 24 frames per direction.

Using regular flying back animation as a placeholder until animations with gore are implemented.
 2023-01-20 13:16:49 +02:00
AsdowandGitHub 833f4a1d35 Lobot (#19) 
Make use of new  attachment filter criterion for lobot

Balaclava still requires to be defined as a valid attachment for helmets, but kneepads should now show up already when they are attached to leg armor.
 2023-01-19 14:22:32 +02:00
majcostaandGitHub f068b47442 make default Highlight Mercs be false (#18) 
changed with PR#
 2023-01-19 00:08:22 +02:00
AsdowandGitHub 8bdf65957d Fix rendering mistake in EOD pants for big male (#17) 2023-01-16 13:39:51 +02:00
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
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
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
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
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
Asdow b6955889a0 Move LOBOT tabledata to Data from Data-1.13 2022-11-10 19:29:28 +02:00
rftrdevandGitHub 5cd339d402 Gamedir changes for ARC missions (#7) 2022-11-07 00:35:37 -08:00
AsdowandGitHub acb594963a Merge pull request #9 from 1dot13/resolution 
Update Ja2.ini
 2022-11-06 14:04:01 +02:00
Asdow 4b8267895c Update Ja2.ini 
Set new default resolution that works better with 16:9 monitors
 2022-11-06 11:57:06 +02:00
Asdow acdd783344 Add Sawnoff shotgun animations to LOBOT 2022-11-06 11:52:11 +02:00
AsdowandGitHub 417a057147 Merge pull request #4 from 1dot13/cleanup 
Delete Tools folder from GameDir
 2022-10-15 21:30:33 +03:00
Asdow 61505ecadf Delete Tools folder from GameDir 
ExShell is outdated and unusable with cnc-ddraw
Faces viewer and Merc Profile Editor are better stored in a separate repo that has modding tools instead of GameDir
 2022-10-15 21:27:07 +03:00
AsdowandGitHub c7abe64a54 Merge pull request #3 from 1dot13/cnc-ddraw 
Include cnc-ddraw wrapper
 2022-10-15 21:15:07 +03:00
Asdow 280034c2f7 Include cnc-ddraw wrapper 
Release 4.7
ddraw.ini settings are set to borderless fullscreen, OpenGL and nearest neighbor scaling by default
 2022-10-15 21:13:31 +03:00
rftr 45a0441a06 update email text and clarify ghillie armour/attachments (by Antonia) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2653 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-08-12 04:29:45 +00:00
rftr 4df7d090f1 Added graphics for new imp gear selection (by Asdow) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2652 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-08-01 21:07:15 +00:00
rftr e0e82b7477 update hotkey PDFs (by Toni) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2651 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-08-01 04:25:49 +00:00
rftr d6dab713fe added new options to limit merc salary increases on level up: 
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2650 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-05-28 21:08:59 +00:00
Sevenfm 6922f7dc53 New option LIMIT_SIMULTANEOUS_SOUND. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2649 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-05-05 07:54:41 +00:00
Sevenfm 3c479de41c Set SIDE_FACING_DIVISOR = 1.0 by default. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2648 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2022-05-03 11:36:40 +00:00