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
8,969 Commits 73 Branches 88 Tags 752 MiB
9c4121f3b1
Commit Graph

7401 Commits

Author SHA1 Message Date
ViperMaul
14c5558bbf Merge branch 'master' of https://github.com/acemod/ACE3 2016-02-18 10:50:52 -08:00
ViperMaul
52b3f1e219 Bump version to 3.4.3 2016-02-18 10:50:33 -08:00
bux578
93e655588b Merge pull request #3294 from gienkov/pltranslations 
pl translation
 2016-02-18 19:38:43 +01:00
esteldunedain
2a8410650a Swap createLocation by CBA_fnc_createNamespace 2016-02-18 13:58:18 -03:00
esteldunedain
0236c16e8f Cache volume attenuation due to earplugs and headgear 2016-02-18 13:48:40 -03:00
esteldunedain
87dd607901 Add a category name to frag settings 2016-02-18 12:28:00 -03:00
esteldunedain
a8131f597a Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into reflectionsDefaultOff 2016-02-18 12:18:51 -03:00
commy2
50b04d937b Merge pull request #3278 from acemod/removeragdolls 
remove old ragdoll tweaks
 2016-02-18 14:46:21 +01:00
commy2
cf4f47160f Merge pull request #3275 from acemod/realnamebadger 
correct name for wheeled apc 01 cannon
 2016-02-18 14:44:24 +01:00
commy2
be8f7f9cc0 Merge pull request #3276 from acemod/156selectapply 
replace filter and map with select and apply
 2016-02-18 14:23:02 +01:00
esteldunedain
88eae19646 Replace execRemoteFnc in ace_medical 2016-02-17 22:54:43 -03:00
PabstMirror
be742c13cd Merge branch 'master' into 155selectRandom 2016-02-17 15:58:19 -06:00
PabstMirror
c456e1a631 Merge pull request #3214 from acemod/cba23 
Changes for CBA 2.3
 2016-02-17 15:33:42 -06:00
PabstMirror
53d870b62a Merge pull request #3312 from acemod/passengerInteraction 
Only get passenger actions for selected unit
 2016-02-17 15:33:29 -06:00
PabstMirror
77f5aebf73 Merge pull request #3282 from acemod/eventLocationHash 
Use location hash for ace events
 2016-02-17 15:32:50 -06:00
Thomas Kooi
a8846e92ee Merge pull request #2954 from gienkov/nozzleLogic 
nozzle additonal check condition
 2016-02-17 21:26:04 +01:00
PabstMirror
dccc1d33fd Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge 2016-02-17 12:30:03 -06:00
Thomas Kooi
e31e20bd42 Merge pull request #3293 from acemod/fix3270 
Slightly reduce the distance for which the LOS check is skipped.
 2016-02-17 18:39:39 +01:00
Thomas Kooi
26cb6bd6a3 Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant 
Make wound assignment consistent for dll/sqf
 2016-02-17 18:34:28 +01:00
Thomas Kooi
8e49c8b1b3 Merge pull request #3323 from acemod/fixVehicleCrashes 
Fix vehicle crashes
 2016-02-17 18:32:56 +01:00
PabstMirror
930c2f84c6 Call updateHearingProtection at settings init 2016-02-17 09:49:00 -06:00
PabstMirror
40396fc69e Remove debug 2016-02-17 09:37:08 -06:00
PabstMirror
649b0c28e2 Calculate hearing protection coefficient on events 2016-02-16 18:17:42 -06:00
PabstMirror
8fed9325c9 Fix flashbang 2016-02-16 13:02:25 -06:00
PabstMirror
749425dfb7 Settings Category, Minor Cleanup 2016-02-16 12:58:42 -06:00
PabstMirror
f1797feead Make wound assignment consistent for dll/sqf 
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
 2016-02-16 12:19:18 -06:00
commy2
1bc73af1c9 remove ace fake weapon from 3den cargo editor 2016-02-16 16:11:18 +01:00
PabstMirror
5c9dfd7dc5 Handle enemy causing veh explode, fix revive unload 
Fix #3269
 2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be Fix vehicle crashes not being fatal to non-drivers 
Fix #3306
 2016-02-15 17:11:04 -06:00
PabstMirror
d88f10b8e0 Merge pull request #3318 from acemod/restricMagPass 
Don't allow passing mags when not in same veh
 2016-02-15 11:41:18 -06:00
PabstMirror
4a8b032c1f Don't allow passing mags when not in same veh 2016-02-14 14:53:04 -06:00
PabstMirror
985af4502c Merge pull request #3313 from ivankrouglyi/patch-1 
Update fnc_treatment_success.sqf
 2016-02-14 13:27:08 -06:00
VKing
74d410688f Add check so vanilla magazines can't be unloaded 2016-02-14 14:10:28 +01:00
VKing
560c509a3a Changed to using playerVehicleChanged. 2016-02-14 13:51:44 +01:00
Nicolás Badano
7bbdcbc054 Merge pull request #3280 from acemod/unifiedFiredEH 
Unified fired event handler
 2016-02-13 15:13:18 -03:00
esteldunedain
e2ed38609d Replace driver by effectivCommander on EFUNC(common,getGunner) and EFUNC(common,firedEH) 2016-02-13 15:04:43 -03:00
Ivan Krouglyi
0a226b5ee9 Update fnc_treatment_success.sqf 
Error at 84 line - you forget ";"
 2016-02-13 03:29:42 +03:00
PabstMirror
54b350a6c0 Only get passenger actions for selected unit 
Fix #1690 #3309
 2016-02-12 15:57:16 -06:00
Githawk
17cba965c3 Deactivate laser_sefldesignate on Comanche 2016-02-11 20:27:46 +01:00
Githawk
c38b028c3a Fixing driver gun 
Magazines from driver gun don't get removed
 2016-02-11 19:06:37 +01:00
Githawk
9619fc7fb5 Changes to DAGR 
Allow laserLock, set weaponLockSystem to Laser and move class ADDON to
ACE_Hydra70_DAGR
 2016-02-11 16:39:53 +01:00
PabstMirror
ff4ba98e68 Pre-load again on mission load (save game) 2016-02-10 11:50:30 -06:00
licht-im-Norden87
5577a1b4bb Merge pull request #31 from licht-im-Norden87/patch-42 
trenches
 2016-02-10 18:15:14 +01:00
licht-im-Norden87
4fb705e0f9 Update stringtable.xml 
Eigentlich ist Graben ja das falsche Wort, da es in Arma gar nicht möglich ist in die Tiefe zu graben....
 2016-02-10 18:14:51 +01:00
licht-im-Norden87
020deb4407 Update stringtable.xml 2016-02-10 18:14:03 +01:00
licht-im-Norden87
adbfa378b1 Update stringtable.xml 2016-02-10 18:12:36 +01:00
licht-im-Norden87
a5597ade89 Merge pull request #30 from licht-im-Norden87/patch-41 
spectator
 2016-02-10 18:06:13 +01:00
licht-im-Norden87
e8a35f3c20 spectator 
Bitte einmal z. 259,268,377 überprüfen!
 2016-02-10 18:05:51 +01:00
licht-im-Norden87
0c268b90dc Merge pull request #29 from licht-im-Norden87/patch-39 
overheating
 2016-02-10 17:35:56 +01:00
licht-im-Norden87
9419e7daf3 overheating 2016-02-10 17:35:36 +01:00
licht-im-Norden87
7bed10d14b Merge pull request #28 from licht-im-Norden87/patch-38 
optionsmenu
 2016-02-10 17:32:32 +01:00
licht-im-Norden87
51b57b962b Update stringtable.xml 2016-02-10 17:32:19 +01:00
licht-im-Norden87
cabbc4b6a9 optionsmenu 2016-02-10 17:31:26 +01:00
licht-im-Norden87
c663feed49 Merge pull request #27 from licht-im-Norden87/patch-37 
nightvision
 2016-02-10 17:26:23 +01:00
licht-im-Norden87
864ae484d4 nightvision 2016-02-10 17:26:08 +01:00
licht-im-Norden87
b352b9b024 Merge pull request #26 from licht-im-Norden87/patch-36 
captives
 2016-02-10 17:20:13 +01:00
licht-im-Norden87
39e26b0f11 captives 2016-02-10 17:19:42 +01:00
licht-im-Norden87
ffb3367a50 Merge pull request #25 from licht-im-Norden87/patch-35 
common
 2016-02-10 17:17:47 +01:00
licht-im-Norden87
b9083f1712 common 2016-02-10 17:17:26 +01:00
licht-im-Norden87
c806bfb721 Merge pull request #24 from licht-im-Norden87/patch-34 
flashlight
 2016-02-10 17:14:37 +01:00
licht-im-Norden87
d52c6cb984 flashlight 2016-02-10 17:13:52 +01:00
licht-im-Norden87
a725553a95 commy2 2016-02-10 17:11:24 +01:00
licht-im-Norden87
b617dee302 Merge pull request #23 from licht-im-Norden87/patch-33 
cargo
 2016-02-10 17:09:05 +01:00
licht-im-Norden87
b1990b1586 Update stringtable.xml 2016-02-10 17:08:48 +01:00
licht-im-Norden87
3583e95e1f cargo 2016-02-10 17:07:05 +01:00
licht-im-Norden87
35b0b11fff Merge pull request #22 from licht-im-Norden87/patch-32 
Gestures
 2016-02-10 17:03:21 +01:00
licht-im-Norden87
6481a0fbb8 Gestures 2016-02-10 17:02:54 +01:00
licht-im-Norden87
71682bc2f3 Merge pull request #21 from licht-im-Norden87/patch-31 
headless
 2016-02-10 16:58:21 +01:00
licht-im-Norden87
c0a9d6a0e8 headless 2016-02-10 16:57:56 +01:00
licht-im-Norden87
3eaf466994 Merge pull request #20 from licht-im-Norden87/patch-30 
hearing
 2016-02-10 16:57:24 +01:00
licht-im-Norden87
99f6c79573 Update stringtable.xml 2016-02-10 16:57:12 +01:00
licht-im-Norden87
8971f4db1e Update stringtable.xml 2016-02-10 16:56:15 +01:00
licht-im-Norden87
a9252c1b5d Merge pull request #19 from licht-im-Norden87/patch-29 
Interact menu
 2016-02-10 16:49:46 +01:00
licht-im-Norden87
61bd04a390 Interact menu 2016-02-10 16:49:00 +01:00
licht-im-Norden87
e2d4589bb0 Merge pull request #18 from licht-im-Norden87/patch-28 
Hunt IR
 2016-02-10 16:42:35 +01:00
licht-im-Norden87
8ef2905e99 Hunt IR 2016-02-10 16:42:03 +01:00
licht-im-Norden87
53f8b14a7c Merge pull request #17 from licht-im-Norden87/patch-27 
Adv. ballistic
 2016-02-10 16:41:00 +01:00
licht-im-Norden87
17a16d1bad Adv. ballistic 2016-02-10 16:40:07 +01:00
licht-im-Norden87
49ee49a5b7 Merge pull request #16 from licht-im-Norden87/patch-26 
magazine repack
 2016-02-10 16:29:32 +01:00
licht-im-Norden87
ed1047e199 magazine repack 2016-02-10 16:26:03 +01:00
licht-im-Norden87
03b4a0e8fb Update German Stringtable 2016-02-10 16:24:18 +01:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
PabstMirror
e1b83b8172 Manually pre-load for StaticWeapons and Car 
Fix #3168
 2016-02-09 22:43:38 -06:00
SzwedzikPL
388b00f58c remove unnecessary code, aesthetic tweak 2016-02-10 01:38:14 +01:00
SzwedzikPL
0c80551fd8 ace attribute category, lower case classes 2016-02-10 01:17:18 +01:00
gienkov
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
gienkov
8048b2ecbd lazy evaluation fix 2016-02-09 09:35:16 +01:00
esteldunedain
b02a67605c Revert to normal testing for units on foot 2016-02-09 00:19:18 -03:00
esteldunedain
0f41c5bf13 Only test the GEOM LOD for visibility 2016-02-09 00:01:51 -03:00
esteldunedain
d4eda6d4ec Show tags for units inside the player vehicle. Close #538. 2016-02-08 22:54:24 -03:00
esteldunedain
cebc8a2d07 Slightly reduce the distance for which the LOS check is skipped. Fix #3270 2016-02-08 19:19:10 -03:00
esteldunedain
4c938a050b Fix for combination of "Only Cursor + Keypress" and "Always Show Sound Waves" 2016-02-08 17:57:24 -03:00
esteldunedain
a47f7b8162 Fix cursor mode 2016-02-08 17:18:03 -03:00
esteldunedain
c43b3bd5c1 Switch 2016-02-08 17:14:18 -03:00
esteldunedain
b2e9dd0149 Fix _vecy 2016-02-08 17:03:18 -03:00
esteldunedain
73499489e0 Revert "Optimized EFUNC(common,cachedCall)" 
This reverts commit b358c4a8af.
 2016-02-08 16:45:16 -03:00
esteldunedain
1b912cdca0 Switch back to modelToWorldVisual. Perf is about the same and it moves smoothly with the model. 2016-02-08 16:38:26 -03:00
esteldunedain
b358c4a8af Optimized EFUNC(common,cachedCall) 2016-02-08 16:09:14 -03:00
esteldunedain
62fb26200f Nametags optimization 2016-02-08 15:36:56 -03:00