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
3,861 Commits 73 Branches 88 Tags 752 MiB
41bef1e58c
Commit Graph

3336 Commits

Author SHA1 Message Date
Josuan Albin
e8dec708bc Some french entries and a german duplicate 
Added some french entries and removed a german duplicate
 2015-04-27 16:18:28 +02:00
Brisse89
26bd75084d Update stringtable.xml 
Khaybar -> Sama
 2015-04-27 14:56:57 +02:00
Brisse89
4ebdd88369 Less fictional weapon names 
ACP-C2 -> Custom Covert II
KT2002 Katiba -> KH2002 Khaybar
 2015-04-27 13:55:50 +02:00
ulteq
1b5756d33c Added weather update interval module setting 2015-04-27 12:47:26 +02:00
ulteq
79ff3146b5 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-27 12:40:28 +02:00
ulteq
04d3a31b5b Fixed a typo 2015-04-27 12:34:21 +02:00
ulteq
3c91f6abe3 Added ace/module settings for ace_weather: 
*enableServerController // weather propagation on the server
*useACEWeather // disable ace weather
*syncRain
*syncWind
*syncMisc
 2015-04-27 12:28:56 +02:00
ulteq
135157419e Merge pull request #876 from Brisse89/patch-2 
Realistic weapon names: Update stringtable.xml
 2015-04-27 12:20:43 +02:00
Brisse89
ecaa23ada2 Update stringtable.xml 
Removed the space in HK121
 2015-04-27 12:17:36 +02:00
Brisse89
faa17d0e56 Update stringtable.xml 
Noreen Bad News -> Noreen "Bad News" ULR
 2015-04-27 12:13:09 +02:00
Brisse89
3339759321 Update stringtable.xml 
Is this better? 
SIG 762 -> SIG 556
HK 122 -> HK 121
 2015-04-27 11:58:39 +02:00
ulteq
b0876ca394 Enables: d64783fca1 2015-04-27 11:06:16 +02:00
ulteq
d6f757e096 Enabled scope adjustments for the Khalia (old) optic 2015-04-27 11:04:12 +02:00
Brisse89
db553644aa Update stringtable.xml 
Is this okay? 
MAR-10 -> Noreen Bad news
EMR-1 -> SIG 762
Navid -> HK 122
 2015-04-27 10:24:42 +02:00
commy2
d64783fca1 remove the calibers from the weapon names 2015-04-27 02:40:04 +02:00
Grzegorz
3b9019e363 Update stringtable.xml 2015-04-26 23:01:42 +02:00
Grzegorz
3d5f7b1bf0 Update stringtable.xml 2015-04-26 23:01:31 +02:00
Grzegorz
78329110a1 Update stringtable.xml 2015-04-26 23:01:18 +02:00
Grzegorz
5add444026 Update stringtable.xml 2015-04-26 23:01:10 +02:00
Grzegorz
cfd9c6b3e9 Update stringtable.xml 2015-04-26 23:01:02 +02:00
Grzegorz Sikora
a272258500 PL translation 2015-04-26 22:59:20 +02:00
ulteq
3e5462f3d4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 22:50:54 +02:00
ulteq
af2dc62705 Improved a module setting description 2015-04-26 22:44:18 +02:00
Grzegorz Sikora
0f47d8bfb2 PL translation 2015-04-26 22:33:25 +02:00
ulteq
9bd32f5797 Fixed an incorrect module setting description 2015-04-26 22:33:11 +02:00
KoffeinFlummi
365f1e025b Merge remote-tracking branch 'origin/GermanMedicalTranslation' into german-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-26 22:04:39 +02:00
commy2
aabe532829 manual merge 2015-04-26 21:26:57 +02:00
KoffeinFlummi
b472292b20 Remove tabler comments. 
sed is awesome.
 2015-04-26 21:05:41 +02:00
KoffeinFlummi
1bb8628109 Merge https://github.com/simon84/ACE3 into german-merge 2015-04-26 21:00:22 +02:00
commy2
ac51d45f11 Merge pull request #848 from acemod/recoiltweaks 
tweaking recoil
 2015-04-26 20:59:27 +02:00
commy2
f5d7331847 no team management on the dead or unconscious units, fix #803 2015-04-26 20:57:55 +02:00
commy2
9b8e130b1f Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 19:33:23 +02:00
commy2
5320f4c6b7 fix broken parse text cache in some cases 2015-04-26 19:33:08 +02:00
commy2
6aea424f6d Merge pull request #872 from acemod/muteuncon 
mute unconsious units
 2015-04-26 17:40:51 +02:00
commy2
7319a3dbc6 remove obsolete config entries 2015-04-26 17:38:48 +02:00
commy2
31ae05dd6e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-26 17:26:16 +02:00
commy2
90f1d1f3fa those damn mine detectors, also fix advanced medical box not showing up in zeus 2015-04-26 17:25:56 +02:00
Glowbal
4612298917 Merge pull request #864 from acemod/Add-translations-for-adv.-medical 
Add translations for adv. medical
 2015-04-26 17:06:36 +02:00
commy2
d6f2ac95dd fix ace ammo box doesn't show up in zeus 2015-04-26 17:04:49 +02:00
commy2
8976b6983d mute unconsious units 2015-04-26 16:47:36 +02:00
bux578
28a8fbc4fe fix vector name 
it's the vector 21 not the vector IV
 2015-04-26 15:36:47 +02:00
bux578
6cc4f48eb2 Uppercase Injuries 2015-04-26 14:19:28 +02:00
bux578
67dc600cae Merge branch 'master' of https://github.com/acemod/ACE3 into Add-translations-for-adv.-medical 2015-04-26 14:02:47 +02:00
bux578
b3c461b9da last few translations 2015-04-26 14:02:14 +02:00
commy2
f96deadd20 imenu: remove shadow, fix caching 2015-04-26 12:41:15 +02:00
bux578
b2dd065429 remove comment 2015-04-26 12:27:06 +02:00
bux578
dec47dade8 ups, remove test code 2015-04-26 09:38:56 +02:00
bux578
0aa2b31dd4 gj git 2015-04-26 09:37:02 +02:00
bux578
171cea998e add most of the translations 2015-04-26 09:36:51 +02:00
ulteq
5ed7cee6fd Fixed a copy&paste typo 2015-04-26 09:22:04 +02:00
VyMajoris
ba89bc8faa Added - Myself to AUTHORS.txt 2015-04-26 03:15:25 -03:00
VyMajoris
523cb49ff1 Added - Portuguese translation to lots of things. 
Also fixed a typo the english key for STR_ACE_microdagr_configure.
 2015-04-26 03:09:16 -03:00
KoffeinFlummi
9a8dd5ee41 Merge branch 'patch-4' of https://github.com/ruPaladin/ACE3 into russian-merge 
Conflicts:
	addons/medical/stringtable.xml
 2015-04-26 01:03:29 +02:00
KoffeinFlummi
9ac662ea7c Lowercase curator ammo frag entries 2015-04-26 00:01:48 +02:00
KoffeinFlummi
59bdc23a95 Merge branch 'master' into curatorFragmentation 2015-04-25 23:55:29 +02:00
commy2
986d2ee168 fix c&p error 2015-04-25 23:41:20 +02:00
PabstMirror
ca980379c8 Minor captive cleanup 2015-04-25 16:03:21 -05:00
PabstMirror
898d6c74a8 #854 - No canInteractWith check for Ace_MainAction 
Was preventing subactions from showing.
 2015-04-25 16:02:59 -05:00
ulteq
ca6a559557 Fixed a typo 2015-04-25 21:18:09 +02:00
Felix Wiegand
057c060212 Merge pull request #822 from acemod/frag-lowercase 
Convert frag config entry names to lowercase
 2015-04-25 20:46:59 +02:00
Felix Wiegand
dc7c7fcaf5 Merge pull request #811 from gienkov/master 
PL translation
 2015-04-25 20:46:47 +02:00
PabstMirror
2d3606302f Merge pull request #464 from acemod/fixFiredNear 
Hearing: Fix firedNear not working in vehicles
 2015-04-25 13:34:18 -05:00
Felix Wiegand
6b5fa25ba9 Merge pull request #334 from acemod/mk6tweaks 
Vanilla Mortars - Rangetables/Tweaks
 2015-04-25 20:27:20 +02:00
ulteq
78eba4e703 Moved weather randomization back to postInit 2015-04-25 18:56:55 +02:00
ulteq
71df545d52 Improved the Mk248 muzzle velocity shift table 2015-04-25 18:30:58 +02:00
PabstMirror
f0477b8e95 Make PARAM/Explode_X faster 
skips the IS_ARRAY check normaly found in EXPLODE_1_SYS
 2015-04-25 10:25:08 -05:00
ulteq
4a8153b757 Replaced EXPLODE_4_PVT macro inside of ABs PFH 2015-04-25 17:19:43 +02:00
Nicolás Badano
74867230d6 Merge pull request #853 from acemod/cacheparsetext 
cache ctrlSetStructedText parseText
 2015-04-25 10:54:15 -03:00
esteldunedain
fc49814689 Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches 2015-04-25 10:52:52 -03:00
Glowbal
8d12f57d0f Merge pull request #687 from acemod/streamlinedBasicDiagnosis 
Streamlined basic diagnosis
 2015-04-25 15:19:29 +02:00
Grzegorz
3427bc5bbb Update stringtable.xml 2015-04-25 14:37:03 +02:00
Grzegorz
a7e1d1c1c8 Update stringtable.xml 2015-04-25 14:36:53 +02:00
Grzegorz
f3d360d3d8 Update stringtable.xml 2015-04-25 14:36:42 +02:00
commy2
b7763331d6 the index 2015-04-25 14:34:09 +02:00
ulteq
eca7657ffa Removed a bunch of obsolete code: 
*Obsolete, as of: 6fdaf4c400
 2015-04-25 13:34:47 +02:00
commy2
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
ulteq
b053a641d9 Improved bullet trace visibility check 2015-04-25 13:15:54 +02:00
ulteq
d8eee168aa Improved onlyActiveForLocalPlayers abort condition check: 
*Fixed alwaysSimulateForSnipers abort condition
 2015-04-25 12:59:26 +02:00
Glowbal
6799903e4b Also display different color for advanced 2015-04-25 12:45:04 +02:00
ulteq
2d14ae61f9 Simplified muzzle velocity shift calculation: 
*Also added some missing privates
 2015-04-25 12:36:04 +02:00
Glowbal
1415adc2bd removed local diagnose action. Added localization 2015-04-25 12:35:07 +02:00
Glowbal
4cef2a1fa4 Merge branch 'master' into streamlinedBasicDiagnosis 2015-04-25 12:12:24 +02:00
ulteq
d414e5a3a1 Removed unused define 2015-04-25 12:08:31 +02:00
ulteq
6fdaf4c400 Completely removed the SQF version of the advanced ballistics PFH 2015-04-25 10:59:48 +02:00
ulteq
f645672281 At least set GVAR(extensionAvailable) to true 2015-04-25 10:38:28 +02:00
Nou
7c857a5a7e Make sure load spawns the function, not calls it. 2015-04-25 00:52:51 -07:00
Nou
c8e6e7018c Moved infinite spawned loop to Loaded event for handing save game loads. Events for the win! diag_activeSQFScripts as of this build returns empty on a bare mission. 2015-04-25 00:49:47 -07:00
commy2
12280bbcad revive tmr camshake 2015-04-25 07:21:11 +02:00
commy2
d7d0f00592 tweaking recoil 2015-04-25 05:51:44 +02:00
Grzegorz
aa0b1ecba0 PL translation fix 2015-04-24 21:35:20 +02:00
PabstMirror
3b9b09a7af UpdateFiringTable-ChangesFromWeather 2015-04-24 13:26:09 -05:00
Glowbal
7dc8a08b89 Replaced _currentshooter by _this 
Fixes script error `Error Undefined variable in expression: _currentshooter`
 2015-04-24 20:03:04 +02:00
commy2
e207a11851 fix: Cannot zero when looking through optics of static weapons and vehicle mg/gmg, fix #836 2015-04-24 19:02:29 +02:00
ulteq
b405f17df2 Added missing ; 2015-04-24 17:19:18 +02:00
ulteq
6361bda3e9 Removed unused function 2015-04-24 13:01:11 +02:00
ulteq
eb88f94cf7 Removed unused privates 2015-04-24 11:53:06 +02:00
ulteq
b3bf44fa1e Code cleanup 2015-04-24 10:58:55 +02:00
ulteq
b3f4bf306d Moved the global weather controls into preInit 2015-04-24 10:46:33 +02:00
ulteq
66e4c742b4 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-04-24 10:25:47 +02:00
ulteq
062aeae6e6 Fixed several bugs in the rain simulation: 
*Added missing rain initialization based on overcast value
*Added proper fade out when the overcast changes from >=0.7 to <0.7
*Removed duplicate code
 2015-04-24 10:25:31 +02:00