Commit Graph

9791 Commits

Author SHA1 Message Date
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
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
J3aLeiNe
fd8167b7e7 AB - correct mildot reticle LRPS/AMS/KHS (#3664)
* 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
2016-05-07 22:20:50 +02:00
commy2
4a8e727ba5 end spectator by global mission end event from server (#3659)
* end spectator by global mission end event from server

* add ;
2016-05-07 22:17:21 +02:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
Glowbal
f34d890e7a Merge pull request #3612 from SzwedzikPL/trenchestweaks
Add remove trench and continue digging trench actions
2016-05-07 22:12:15 +02:00
Glowbal
75f2ccf33c Merge pull request #3552 from novichiv/master
Fixed strncpy in parse_imagepath
2016-05-07 22:02:12 +02:00
Glowbal
1ad348d415 Merge pull request #3517 from gruppe-adler/master
Added fastroping sounds
2016-05-07 22:01:21 +02:00
Glowbal
5ff91484ed Merge pull request #3438 from acemod/spareBarrelSimulation
AAR actions + track temperatures of spare barrels
2016-05-07 21:48:03 +02:00
PabstMirror
dd049a9699 Merge pull request #3762 from acemod/toggleWindDisplay
Add key to toggle wind info display
2016-05-07 10:58:43 -05:00
PabstMirror
71b86a7525 Merge pull request #3746 from acemod/fixTacLaderModelCfg
Tactical Ladder - Update model cfg
2016-05-07 10:58:29 -05:00
PabstMirror
9b46e77f66 Add key to toggle wind info display 2016-05-06 12:47:59 -05:00
PabstMirror
28c65c4bed Fix explosive sync on dedi 2016-05-05 14:36:56 -05:00
Nicolás Badano
153c6583b5 Merge pull request #3758 from acemod/overheatingSetting2
Overheating - Add Master Enabled Setting (barrelPR)
2016-05-04 20:07:45 -03:00
jonpas
59e412032e Merge pull request #3756 from acemod/uiShowHud
UI - Don't overwrite other showHud indexes
2016-05-04 21:50:42 +00:00
PabstMirror
cf92ba9c46 Overheating - Add Master Enabled Setting (barrelPR) 2016-05-04 14:59:04 -05:00
PabstMirror
bc584b4c95 Merge remote-tracking branch 'refs/remotes/origin/master' into spareBarrelSimulation 2016-05-04 13:00:34 -05:00
commy2
01cf551aba Merge pull request #3730 from acemod/cleanupReloadLaunchers
Cleanup reload launchers
2016-05-04 16:18:37 +02:00
Glowbal
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace
Cleaned up excessive whitespace
2016-05-04 11:46:56 +02:00
Glowbal
59d101ea75 Merge pull request #3754 from acemod/removeLegacy
Removed old occurances of AGM and CSE
2016-05-04 11:46:11 +02:00
PabstMirror
398b76f30b Get reload time from QGVAR(buddyReloadTime) 2016-05-03 23:13:43 -05:00
PabstMirror
98a74aca6e UI - Don't overwrite other showHud indexes 2016-05-03 22:49:05 -05:00
commy2
07977b9a9a Merge pull request #3752 from Cuel/remove-dead-bodies-fix
Fix "remove dead bodies on disconnect" when enabled and forced
2016-05-03 22:38:28 +02:00
BaerMitUmlaut
012ce9fb16 Removed old occurances of AGM and CSE 2016-05-03 21:38:36 +02:00
BaerMitUmlaut
b6324e61e9 Improved params formatting 2016-05-03 21:24:10 +02:00
BaerMitUmlaut
304f1a22b4 Use blockeEngine status effect in refuel 2016-05-03 21:08:22 +02:00
BaerMitUmlaut
e125911c3b Added blockEngine status effect 2016-05-03 20:52:43 +02:00
Cuel
66c2bf0506 Fix dead bodies removal, when forced = 1
- Removed unused(?) GVAR(Module)
- Removed "white space alignment" in module.sqf
2016-05-03 20:10:28 +02:00
Cuel
545ecc0f8e Merge remote-tracking branch 'refs/remotes/acemod/master' into remove-dead-bodies-fix 2016-05-03 20:10:20 +02:00
commy2
55aa4d08f8 Merge pull request #3750 from acemod/addLoadToUnitContainer
add framework to add virtual mass to containers
2016-05-03 18:39:10 +02:00
commy2
736807f994 fix typo, make variable global 2016-05-03 18:16:39 +02:00
commy2
8585ea5688 add framework to add virtual mass to containers 2016-05-03 18:12:47 +02:00
Glowbal
0c55d0ca06 Change start line number count sqf validation at 1 2016-05-03 15:15:55 +02:00
Glowbal
75cbe7df4f Change start line count of config validation at 1 2016-05-03 15:15:10 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
PabstMirror
33b624c896 Tactical Ladder - Update model cfg
#3745
2016-05-02 12:10:44 -05:00
bux578
13c089b181 Merge pull request #3740 from ProfessorCZ/master
Czech translation - Update
2016-05-02 08:47:05 +02:00
PabstMirror
7cc2da2bb1 Fix self swap action 2016-04-29 23:38:01 -05:00