Commit Graph

10262 Commits

Author SHA1 Message Date
PabstMirror
895bf2580a Merge pull request #3773 from J3aLeiNe/master
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
Nicolás Badano
dd2767a4ec Merge pull request #3789 from acemod/pushConfig
Add canPush config entry
2016-05-13 11:38:35 -03:00
jonpas
a950b2c2fe Add canPush config entry to enable pushing on boats with mass higher than 2600 2016-05-13 16:33:15 +02:00
SilentSpike
ce3787b3c3 Merge pull request #3768 from acemod/add-zeus-objects-setting
Add zeus objects setting
2016-05-13 10:39:20 +01:00
commy2
1651b25b0f Merge pull request #3788 from acemod/removeRedundantSparePartAdding
Remove redundant spare part adding and improve addSpareParts function
2016-05-13 07:38:06 +02:00
jonpas
e984fcf715 Fix part name for Tank class 2016-05-12 21:56:12 +02:00
jonpas
2d2d5bc828 Readd mistakenly removed spare part adding 2016-05-12 21:52:06 +02:00
jonpas
58cc686aac Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts 2016-05-12 21:49:45 +02:00
jonpas
f6e4bd7a6b Remove redundant spare part adding 2016-05-12 21:37:54 +02:00
jonpas
c591c7af64 Add interaction support to Motorcycle class 2016-05-12 21:30:32 +02:00
Glowbal
721b161161 Remove useless if statement 2016-05-12 19:56:07 +02:00
Glowbal
7ba02a21ec Merge remote-tracking branch 'refs/remotes/origin/add-mine-detector'
Conflicts:
	addons/minedetector/functions/fnc_detectorLoop.sqf
2016-05-12 19:49:32 +02:00
Glowbal
7cc423d48f Change mindetector sound 2016-05-12 19:44:43 +02:00
jonpas
5147f366a5 Execute take nozzle actions only on progress bar success (#3783)
* Execute take nozzle actions only on progress bar success - fix #3739, Prettify params

* Fix animation on holster
2016-05-12 17:11:35 +02:00
PabstMirror
09371bce96 Merge pull request #3776 from acemod/cleanupFastRopeSounds
FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution
2016-05-11 22:29:28 -05:00
commy2
7304bd3fda Merge pull request #3779 from acemod/showvirtualloadingearmenu
show virtual load in inventory menu
2016-05-11 22:57:37 +02:00
commy2
dd6241e376 Merge pull request #3778 from acemod/fixGetWeaponState
fix getWeaponState, fix #3777
2016-05-11 22:57:25 +02:00
BaerMitUmlaut
f9c643b941 Modified fastroping thud sound 2016-05-11 21:05:59 +02:00
SilentSpike
1b1329b350 Increase spectator unit tree refresh rate
Reduce the time between automated refreshing of the unit tree. Also makes an initial call to the tree populating code upon first opening to remove the initial delay.
2016-05-11 16:01:07 +01:00
SilentSpike
9364ae60df Fix spectator unit tree refreshing
- Account for decrement in node index when culling the tree of sides/groups/units
- Fix non-zero-based index `to` value when navigating the units in the tree
2016-05-11 13:30:17 +01:00
J3aLeiNe
078c1d585f Add Kerama Islands by "Les Vétérans"
add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)
2016-05-11 00:01:35 +02:00
BaerMitUmlaut
38bb4f6c29 Adjusted weight of bodybag 2016-05-10 23:40:03 +02:00
ir0n1e
6c76d5b470 Changed mass to config mass - cause of #3779 2016-05-10 23:02:52 +02:00
commy2
f738b17db7 show virtual load in inventory menu 2016-05-10 22:32:40 +02:00
commy2
53c9a96c77 fix getWeaponState, fix #3777 2016-05-10 22:14:01 +02:00
J3aLeiNe
c619bcb5a3 Fix "jacobi" latitude and elevationOffset 2016-05-10 19:39:01 +02:00
PabstMirror
518a873efd Add module readme 2016-05-10 10:14:15 -05:00
PabstMirror
980da16826 FastRope Sounds - Fix Config, Merge PFEH, Add CC Attribution 2016-05-10 10:09:52 -05:00
J3aLeiNe
29e7dbf757 fnc_getMGRSdata.sqf update3 2016-05-10 12:39:56 +02:00
commy2
be99d4b3d7 Merge pull request #3772 from acemod/fixmissingmags
add missing magazines, fix #3685
2016-05-10 11:57:32 +02:00
commy2
505fa0d773 add missing magazines, fix #3685 2016-05-10 11:50:59 +02:00
commy2
f3fcc954e6 Merge pull request #3766 from acemod/removeDifficulties
Remove difficulties component
2016-05-10 11:25:35 +02:00
Tim Beswick
19df821ff5 Moved IR Strobe to left shoulder when attached. 2016-05-09 11:51:28 +01:00
BaerMitUmlaut
3f96e11cbb Made icons grey 2016-05-08 18:52:33 +02:00
Glowbal
74fd4b4b52 Add run at settings initialized auto add objects 2016-05-08 13:47:35 +02:00
Glowbal
a526d33aba Fix inconsistent name for module setting 2016-05-08 13:44:51 +02:00
Glowbal
b08af3fea6 Add read auto add objects setting from module 2016-05-08 13:42:45 +02:00
Glowbal
220b8b6352 Merge pull request #3767 from alganthe/zeus_fix
Add new zeus addObjects setting to settings module (#2451)
2016-05-08 13:41:13 +02:00
jonpas
a0bd521a40 Remove difficulties component 2016-05-07 23:48:31 +02:00
Glowbal
7d063d0995 Add downloads count shield 2016-05-07 23:26:44 +02:00
PabstMirror
2a5ec42148 Repair - Improve wheel detection for RHS (#3760)
* Repair - Improve backup wheel detection

Fix #3759

* Cleanup
2016-05-07 16:04:27 -05:00
Glowbal
dbe70a7094 Merge pull request #3761 from acemod/cleanupExplosiveSync
Fix explosive sync on dedicated server
2016-05-07 22:46:35 +02:00
Glowbal
07e9a3c5f8 Merge pull request #3764 from acemod/mineDetectorStuff
Stringtables, Add Detector Pos Deubg
2016-05-07 22:40:46 +02:00
Glowbal
ed9d05d6dd Merge pull request #3753 from acemod/blockEngine-statusEffect
Add blockEngine status effect
2016-05-07 22:40:05 +02:00
J3aLeiNe
d79cbe0844 Getmgrsdata update2 (#3736)
* correct mildot reticle LRPS/AMS/KHS

correct mildot reticle LRPS/AMS/KHS

* replace 1 tab with 1 space

replace 1 tab with 1 space

* fix tab

* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes

ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS :  variable magnification / SOS : 2 magnifications

* fnc_getMGRSdata.sqf update2

fnc_getMGRSdata.sqf update2

* fnc_getMGRSdata.sqf update2

add new maps, in alphabetic order now
2016-05-07 22:37:58 +02:00
PabstMirror
9f6661f4db Make 40mm Grenades Frag (#3679)
* Make 40mm Grenades Frag

* Just use existing force cfg instead of adding new

Add RHS compat entries
2016-05-07 15:35:39 -05:00
BaerMitUmlaut
4eb2ecb0b6 Fixed getting stuck on rope whilst fastroping (#3734) 2016-05-07 22:35:18 +02:00
BaerMitUmlaut
82f8eb758c Removed remaining usage of player (#3710) 2016-05-07 22:27:33 +02:00
PabstMirror
1742629045 Add NonSteerable Reserve Parachute (#3689)
* Add NonSteerable Reserve Parachute

Close #3364

* Use params
2016-05-07 22:26:02 +02:00
Rebel
8bd4afed6b Drag and carry icons. (#3676) 2016-05-07 22:23:38 +02:00