Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,401 Commits 73 Branches 88 Tags 752 MiB
2af607c727
Commit Graph

3742 Commits

Author SHA1 Message Date
Nicolás Badano
b32729978f Merge pull request #1026 from acemod/wavesFix 
Fixes bugged waves
 2015-05-09 12:42:28 -03:00
commy2
7fb56d4fd5 simple check to compare client and server version of ace 2015-05-09 17:03:51 +02:00
commy2
3976c4d64f the spaces 2015-05-09 16:06:44 +02:00
commy2
f0cca5b33e ignore ace in checkPBO module, also fix #1020 2015-05-09 16:01:53 +02:00
commy2
52a904478b laser selfdesignate has wrong version number macro setup 2015-05-09 15:32:34 +02:00
bux578
f1798aa739 fix switchunits 2015-05-09 14:05:58 +02:00
bux578
8c937a707d starting to fix switchunits 2015-05-09 13:49:26 +02:00
commy2
57131496f2 check for outdated pbo files 2015-05-09 13:25:19 +02:00
bux578
fb284faa66 adjust ambiance sound module description and docs 2015-05-09 08:18:44 +02:00
bux578
ddf32052c4 fix removeWhiteSpace function name 
used `string_removeWhiteSpace` but had to be `stringRemoveWhiteSpace`
due to 612fa69c1c
 2015-05-09 08:02:13 +02:00
Nicolás Badano
19e8d7bbe7 Merge pull request #1066 from acemod/scopes-usefiredBisEH 
Switch scopes to use firedBIS
 2015-05-09 01:21:10 -03:00
commy2
b57f731dd0 disable laserpointer inheritance for rhs 2015-05-09 04:59:10 +02:00
PabstMirror
a4c710bd28 Switch scopes to use firedBIS 2015-05-08 13:36:24 -05:00
commy2
2ffabec250 Merge pull request #1040 from acemod/disableCfgAISkill 
Disables the CfgAISkill class to prevent it from affecting players.
 2015-05-08 20:27:31 +02:00
jaynus
b7b6cb6086 Fixed: Adds an enabler config to ace_frag, disabling the PFH for any round not enabled. 2015-05-08 11:27:17 -07:00
commy2
7294056da0 keep ai tweaks except of relaod 2015-05-08 20:13:20 +02:00
Glowbal
e674229dde enabledFor > enableFor 2015-05-08 20:10:40 +02:00
ulteq
fd0ca58fe6 Fixes broken bullet trace effect (caliber is now in mm, not inches) 2015-05-08 15:25:32 +02:00
ulteq
f9b6916456 Merge pull request #1053 from acemod/fixATragMX 
Fixes broken ATragMX (calculateStabilityFactor now requires metric in…
 2015-05-08 13:57:59 +02:00
ulteq
3495196f40 Fixes broken ATragMX (calculateStabilityFactor now requires metric input) 2015-05-08 13:56:38 +02:00
ulteq
0e74fa56f7 Corrected several armour piercing round configs 2015-05-08 13:45:00 +02:00
Felix Wiegand
6589cdfb0e Merge pull request #1041 from acemod/metric-units 
Metric units
 2015-05-08 13:09:31 +02:00
KoffeinFlummi
5e33176b52 Convert ACE_barrelLength(s) to millimeters 2015-05-08 12:47:45 +02:00
KoffeinFlummi
aa9561f287 Convert ACE_barrelTwist to millimeters 2015-05-08 12:46:44 +02:00
KoffeinFlummi
adc758cd14 Convert ACE_bulletLength to millimeters 2015-05-08 12:45:17 +02:00
KoffeinFlummi
ce8e192a01 Convert ACE_caliber to millimeters 2015-05-08 12:44:06 +02:00
ulteq
fa07110311 The stability factor calculation is all metric now 2015-05-08 10:46:59 +02:00
Glowbal
518dfb4373 Added missing privates 2015-05-07 21:51:03 +02:00
KoffeinFlummi
a8c4068b56 Remove unnecessary comment 2015-05-07 18:51:18 +02:00
KoffeinFlummi
db07de31af Whoops; back to the roots. 2015-05-07 18:49:40 +02:00
KoffeinFlummi
4b3a111681 Convert ACE_barrelLength to meters 2015-05-07 18:44:01 +02:00
KoffeinFlummi
3313582aec Convert ACE_barrelTwist to meters 2015-05-07 18:41:54 +02:00
KoffeinFlummi
68c9127753 Convert ACE_barrelLengths to meters 2015-05-07 18:39:57 +02:00
KoffeinFlummi
27c8255987 Convert ACE_bulletMass to grams 2015-05-07 18:33:34 +02:00
KoffeinFlummi
b20c42398b Convert ACE_bulletLength to meters 2015-05-07 18:29:02 +02:00
KoffeinFlummi
4eaab93fd1 Convert ACE_caliber to meters 2015-05-07 18:21:15 +02:00
ulteq
cea6d0063d Disables the CfgAISkill class to prevent it from affecting players. 2015-05-07 17:49:59 +02:00
ViperMaul
996c342087 Merge pull request #994 from acemod/imenumisclick 
don't close menu when no action is selected
 2015-05-06 13:31:07 -07:00
ulteq
05f34e5d6a Attempt to fix https://github.com/acemod/ACE3/issues/1025 2015-05-05 22:21:29 +02:00
Glowbal
f6dae4f6ba Merge pull request #1016 from acemod/fixRespawnModule 
Fix undefined variable in respawn module
 2015-05-05 20:30:46 +02:00
Glowbal
50cc5db92f fixes #1017 2015-05-05 20:05:31 +02:00
Glowbal
a49feee76b should have been defaultValue 2015-05-05 19:47:17 +02:00
Glowbal
cee83113d2 lets use proper module config for this 2015-05-05 19:44:56 +02:00
Glowbal
9abf8a15c1 Make certain that GVAR(BodyRemoveTimer) exists 2015-05-05 19:44:44 +02:00
Glowbal
d88d71e2b3 Merge pull request #1015 from alganthe/master 
New anim update
 2015-05-05 19:35:31 +02:00
jaynus
8f19c13d85 Merge pull request #1009 from acemod/fixMissleGuidanceInhertiacnes 
MissleGuidance - fix Inheritance check
 2015-05-05 10:31:40 -07:00
Josuan Albin
dd2ea99d15 pak 
pak anim
 2015-05-05 19:26:11 +02:00
Josuan Albin
f063e45e60 medical advanced added 
animations added for advanced
 2015-05-05 19:04:08 +02:00
Josuan Albin
b781264212 New anim update 
new healing animation added to animationCaller, animationCallerSelf
stays the same
 2015-05-05 18:53:17 +02:00
PabstMirror
76f540409f Fix 1.44 Updating Base Class 
Updating base class VestItem->ItemInfo, by
z\addons\ace\protection\config.cpp/CfgWeapons/V_PlateCarrierIAGL_dgtl/ItemInfo/
 2015-05-05 10:46:56 -05:00
Nicolás Badano
83304a0622 Merge pull request #1011 from acemod/moveContourLegend 
#940 - Map Tweak (contor legend) for brefing
 2015-05-05 08:14:34 -03:00
ulteq
19864d5be6 Fixed a bug in the humidity calculation 2015-05-05 10:37:51 +02:00
ulteq
4f44bcdf46 Added wind data for Chernarus (Prag) 2015-05-05 10:36:12 +02:00
bux578
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
PabstMirror
dafff4e63e #940 - Map Tweak (contor legend) for brefing 2015-05-04 23:50:03 -05:00
PabstMirror
21552caee7 Opps- Not the same as javelin 2015-05-04 23:01:19 -05:00
PabstMirror
3fa218848d MissleGuidance - fix Inheritance check 2015-05-04 22:46:58 -05:00
ulteq
f81e53bb33 Added wind data for Takistan (Kabul) 2015-05-04 22:17:26 +02:00
ulteq
be7391bf47 Added wind data for F.A.T.A 2015-05-04 21:28:12 +02:00
ulteq
76eaa5ded1 Added wind data for Bornholm 2015-05-04 20:35:39 +02:00
ViperMaul
032424b23e Merge pull request #1006 from acemod/skipLOSCheckBodyparts 
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
 2015-05-04 10:14:59 -07:00
esteldunedain
d07b69aca4 Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions. 2015-05-04 13:37:14 -03:00
ulteq
d78be0fa23 Merge pull request #998 from Bla1337/master 
Translation fixes/improvements (RU)
 2015-05-04 10:28:35 +02:00
Bla1337
6c6cb9128a Reverted the abbreviation changes 
Abbreviation only used when necessary for the text clipping prevention.
 2015-05-04 09:54:54 +03:00
Glowbal
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError 
Fix treatment script error
 2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
ulteq
061b77e375 Fixed completely fucked up temperature day/night cycle 2015-05-03 23:32:53 +02:00
ulteq
30c27bf689 Added weather data for kunduz map 2015-05-03 23:21:56 +02:00
ulteq
3fda9e7e7b Merge pull request #997 from ProfessorCZ/master 
Czech translation - Update
 2015-05-03 17:03:47 +02:00
Bla1337
bf592ce0a9 nightvision edits 2015-05-03 17:35:58 +03:00
Bla1337
73d0be88fb nametags edits 2015-05-03 14:57:59 +03:00
Bla1337
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
Lukas
3434964f4f Update stringtable.xml 2015-05-03 11:54:18 +02:00
Lukas
da309e6682 Update stringtable.xml 2015-05-03 11:53:12 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ulteq
4d4604da28 Fixed two typos in the ATragMX gun profile list 2015-05-03 10:47:49 +02:00
ulteq
d653aa262a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix 
Conflicts:
	addons/ballistics/stringtable.xml
 2015-05-03 10:21:57 +02:00
KoffeinFlummi
f678fb8fbf Merge branch 'spanish-merge' 2015-05-03 02:40:56 +02:00
KoffeinFlummi
7633f406ae Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge 
Conflicts:
	addons/laser/stringtable.xml
 2015-05-03 02:40:44 +02:00
PabstMirror
d0975b4c0f Laserpointer Stringtable - fix swapped eng/czk 2015-05-02 18:55:23 -05:00
KoffeinFlummi
697656da92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-03 01:08:39 +02:00
KoffeinFlummi
a1d2bd62a4 Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge 
Conflicts:
	addons/interaction/stringtable.xml
 2015-05-03 01:08:22 +02:00
jaynus
27c66ba631 Merge pull request #993 from acemod/clipboardExtension 
ACE clipboard extension to bypass clipboard limit of arma. Close #991
 2015-05-02 15:29:18 -07:00
jaynus
717d7c874f Data chunking. Feature complete. 2015-05-02 15:28:40 -07:00
KoffeinFlummi
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
 2015-05-02 23:43:33 +02:00
KoffeinFlummi
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge 
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
 2015-05-02 23:29:45 +02:00
esteldunedain
8d92d9cc7d Add ace_clipboard to ACE_Extensions 2015-05-02 18:25:35 -03:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge 
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
 2015-05-02 23:17:39 +02:00
commy2
f44aaee7c7 also in cursor mode 2015-05-02 23:02:40 +02:00
commy2
0fd783082d don't close menu when no action is selected 2015-05-02 22:53:23 +02:00
esteldunedain
233ca37219 Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log 2015-05-02 17:52:37 -03:00
ulteq
e6187adfc7 Removed a trailing space 2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992 Fixed some inconsistencies in the stringtable 2015-05-02 22:07:25 +02:00
Felix Wiegand
7678919e8d Merge pull request #982 from ToasterBR/master 
Translation to Portuguese
 2015-05-02 21:40:14 +02:00
Harakhti
6c2717be7f More more translations 
Stope.
 2015-05-02 18:06:01 +02:00
jaynus
980be9f55b Merge pull request #972 from acemod/javFixInheritanceCheck 
Javelin - Fix configProperties
 2015-05-02 08:50:18 -07:00
adam3adam
05a6389acd Czech translation v2 
mk6mortar and some medical translation
 2015-05-02 12:46:28 +02:00
ruPaladin
219735611f interaction2 2015-05-02 12:47:06 +03:00
ruPaladin
3aad0904cd medical2 2015-05-02 12:45:27 +03:00