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
10,262 Commits 73 Branches 88 Tags 752 MiB
scuba
Commit Graph

10262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BaerMitUmlaut
09a78a83b5 Preparation for gas tanks 2016-07-13 11:49:38 +02:00
BaerMitUmlaut
7539c33529 Switched to nitrogen only simulation 2016-07-13 11:48:54 +02:00
BaerMitUmlaut
9c01ef4541 Initial commit scuba 2016-07-13 11:16:07 +02:00
Glowbal
96a08dfc01 Merge pull request #3923 from voiperr/grenadesounds 
Grenade + Chemlight Sounds
 2016-07-12 13:37:40 +02:00
Glowbal
02fea363b6 Merge pull request #3940 from acemod/particles 
Custom smoke particles
 2016-07-12 13:36:36 +02:00
Glowbal
ee8e03a1ae Merge pull request #3916 from acemod/merge-basic-and-advanced 
Merge basic and advanced injury systems
 2016-07-12 13:36:02 +02:00
Glowbal
0e740f00c3 Merge branch 'release' 2016-07-11 23:42:03 +02:00
Glowbal
de612d9613 Merge branch 'apex' into release 2016-07-11 20:59:34 +02:00
Glowbal
8e3ad9a032 Merge pull request #4083 from acemod/required-addons-apex-cherry-pick 
Required addons for APEX
 2016-07-11 20:58:50 +02:00
Glowbal
0869cf96bd required arma3 version 1.62. closes #4081 2016-07-11 19:27:40 +02:00
Glowbal
d0c30577af Remove usage of setUnconscious 2016-07-11 19:18:40 +02:00
Glowbal
86c67d9e33 Merge branch 'apex' into release 2016-07-11 19:04:53 +02:00
Glowbal
d2a40f16da Merge pull request #4084 from acemod/add-component-dependency 
Add ACE javelin as required addon dependency
 2016-07-11 18:45:25 +02:00
commy2
17f848fba9 Merge pull request #4063 from acemod/gunbag-assault-rifles-cherry-pick 
enable gunbag for all non-machinegun primary weapons
 2016-07-11 17:40:53 +02:00
Glowbal
35a6636ca3 Add ACE javelin as required addon dependency 2016-07-11 12:08:12 +02:00
commy2
25a3405d1f required addons apex, close #4020 2016-07-11 12:01:47 +02:00
Glowbal
dbac1c6398 Merge branch 'apex' into release 2016-07-11 11:16:50 +02:00
Glowbal
02f08939f2 Merge pull request #4052 from acemod/fix4049 
Mine detector optimization and cleanup
 2016-07-11 11:16:16 +02:00
Glowbal
9b85bc3e29 v3.6.1 2016-07-11 11:15:36 +02:00
Nicolás Badano
aa01c0d940 Merge pull request #4078 from acemod/fixNavalMines 
Allow defusing naval mines
 2016-07-11 00:40:13 +02:00
PabstMirror
74da791610 Proper fix for naval mines 2016-07-10 17:29:19 -05:00
PabstMirror
721bc205ef Allow defusing naval mines 
Fix #4074
- Workaround for naval mines not working with deactivate
- Add "isNotSwimming" exception to defuse progress bar
 2016-07-10 13:49:06 -05:00
esteldunedain
9323314da5 Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049 2016-07-09 20:04:20 -03:00
esteldunedain
165bd4b3f8 Make volume consistent 2016-07-09 20:00:53 -03:00
commy2
d249132864 Merge pull request #4062 from acemod/disable-interaction-menu-while-reloading 
Add reload mutex as canInteractWith condition
 2016-07-09 21:03:55 +02:00
PabstMirror
3ac1525a3d Add base icon 2016-07-09 12:11:58 -05:00
jonpas
55c7b9bfc4 Merge pull request #3997 from acemod/gogglesEffectsSetting 
Add goggle setting for level of effects
 2016-07-09 18:48:22 +02:00
jonpas
d9d2302ab8 Merge pull request #4069 from acemod/addAsianStrings 
Add Korean and Japanese strings to tracker
 2016-07-09 18:20:16 +02:00
jonpas
317c36e85c Merge pull request #4061 from acemod/removegtgt 
Remove remaining >> signs from interaction menu
 2016-07-09 18:17:39 +02:00
BaerMitUmlaut
0a46a83e02 Realistic names for APEX content (#4055) 
* Added realistic names for APEX content

* Fix strings

* Lowercase Polish colors
 2016-07-09 18:14:08 +02:00
Glowbal
f86d8d113c Merge branch 'release' 2016-07-09 11:36:49 +02:00
PabstMirror
ef38144d70 Merge pull request #4051 from acemod/simplifyNews 
Make ace news fit apex menu style
 2016-07-08 15:46:54 -05:00
jonpas
1185375c90 Add Korean and Japanese strings to tracker 2016-07-08 20:00:12 +02:00
commy2
c55c0d5666 only use one waitUntilAndExecute at any time for reload mutex 2016-07-08 15:12:47 +02:00
esteldunedain
071201ea46 Remove the pistol cursor from the mine detector 2016-07-07 19:03:14 -03:00
commy2
35b93e0da9 Merge pull request #4065 from acemod/removeRedundantFnc 
Remove redundant getMagazineIndex compatibility function
 2016-07-07 20:22:50 +02:00
jonpas
0220b57609 Remove redundant getMagazineIndex compatibility function 2016-07-07 20:16:03 +02:00
esteldunedain
2a36fec793 Make the detector AI compatible 2016-07-07 12:38:53 -03:00
commy2
be17b72cad remove old 'gestures' reload mutex 2016-07-07 16:38:24 +02:00
commy2
6569de5332 add event handler for reload mutex 2016-07-07 16:35:07 +02:00
esteldunedain
6160fe076d Add an event when a mine is detected to allow hooking into missions 2016-07-07 11:17:57 -03:00
esteldunedain
244bdb093d Add clicks when activating/deactivating the detector 2016-07-07 11:17:09 -03:00
esteldunedain
7a25c53dd3 Switch say2D to playSound 2016-07-07 10:51:34 -03:00
commy2
2a84865302 add event handler for reload mutex 2016-07-07 15:47:37 +02:00
commy2
bf7fde0d65 enable gunbag for all non-machinegun primary weapons 2016-07-07 09:47:02 +02:00
commy2
e39017e27a add reload mut ex as canInteractWith condition 2016-07-07 09:10:14 +02:00
commy2
8ddc025a16 Merge pull request #4060 from acemod/tweakSpottingScope 
Tweak spotting scope anims / mem points
 2016-07-07 09:02:05 +02:00
esteldunedain
893866ff39 Remove >> signs from interaction menu 2016-07-06 22:38:03 -03:00
esteldunedain
ce0da11aed Clip sound duration to below 0.5 s to avoid it stacking into itself when using say 2016-07-06 22:23:34 -03:00
esteldunedain
f73b6b1aad - Restore the config of detector sounds through CfgSounds 
- Add the possibility of switching between headphones or speaker
- Move detector actions to their own submenu
 2016-07-06 22:14:26 -03:00