Commit Graph

11352 Commits

Author SHA1 Message Date
bux
9728345603 Merge pull request #4789 from acemod/https
Use https for ace3mod
2016-12-27 09:38:14 +01:00
bux
2da04846c8 add web app manifest 2016-12-27 09:36:18 +01:00
bux
d65ffb82f7 use https in PR tempalte 2016-12-27 09:14:10 +01:00
bux578
7ecccde340 use https for ace3mod 2016-12-27 09:11:58 +01:00
ace3mod
dff9e11569 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-12-22 20:30:05 +01:00
PabstMirror
c22fce273f Overpressure changes (#4770)
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
2016-12-22 13:29:05 -06:00
Dystopian
78b655bc1f Simplify config crawling 2016-12-22 01:41:16 +03:00
PabstMirror
04d4353b5d Fix reversed RHS compats - Close #4759 (#4760) 2016-12-20 15:37:51 -06:00
bux578
886e23791f Merge pull request #4774 from classicarma/fix-jpn-translate-v383
Fix jpn translate v383
2016-12-17 15:59:50 +01:00
classic
6a93f58b52 added missing localization in jpn translation
added missing localization in jpn translation
2016-12-17 20:50:19 +09:00
classic
552e9ecd87 fix jpn translation for ballistics
fix html tag in the japanese translation.
2016-12-17 20:39:57 +09:00
PabstMirror
988c5b0a25 Minor wind deflection optimization (#4762) 2016-12-16 08:08:10 +01:00
bux578
d8fec7fbe3 improve german translation for entrenchment tool (#4769) 2016-12-15 13:42:13 -06:00
PabstMirror
56c4611919 Fix ace_particles smoke on arty shells (#4768)
Close #4766
2016-12-15 18:28:39 +01:00
bux578
f544d82472 add optionals meta.cpp files (#4763) 2016-12-15 10:55:44 -06:00
PabstMirror
fd09ec5958 Rebuild Dlls for x64 dev branch (#4765) 2016-12-15 10:51:47 -06:00
classic
0842481c2f fix for jpn translate in medical_menu
Delete unnecessary the HTML tags in line 134
2016-12-15 20:58:21 +09:00
Ozan Eğitmen
ef4d289836 Add Zeus Module for FRIES (#4597)
* Initial commit

* Revert unrelated changes

* Add newline

* Fix undefined var, localize text

* Shorten strings, add missing parameters

* Fix logical error

* Fix capitalization, Update string, Only add EH on server

* Add missing uses of the private command

* Remove excess formatting

* Add module category
2016-12-14 23:55:06 -06:00
Dedmen Miller
c009000bd9 Use new private syntax for winddeflection PFH (#4761) 2016-12-14 23:29:07 -06:00
PabstMirror
5379503772 Fix deadman range, fix clacker transfer, use setShotParents (#4689) 2016-12-14 14:06:32 -06:00
Dystopian
4f20d1f7c6 add rearm to Vehicle Ammo boxes (#4750) 2016-12-14 13:18:04 -06:00
Dystopian
cc3b669fcd Fix missing refuel menu on static fuel stations (#4533)
* fix static fuel stations

* Directly compile menus and remove XEH from buildings
2016-12-14 12:48:00 -06:00
Glowbal
2151fcad8f #4692 Update dev homepage for v3.8.3
[ci skip]
2016-12-13 23:16:41 +01:00
Glowbal
86fd9347f8 #4692 update homepage for v3.8.3
[ci skip]
2016-12-13 23:16:12 +01:00
Glowbal
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c Prep 3.8.3 2016-12-12 19:50:16 +01:00
jonpas
1ecd674ac6 Exclude uniforms with inherited modelSides (#4720) 2016-12-12 19:36:53 +01:00
PabstMirror
06caea825b AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-12 19:33:34 +01:00
commy2
757ab78191 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-12 19:33:05 +01:00
PabstMirror
11b464b585 Fix blood drop selection if blood loss is high
close #4739
2016-12-12 19:32:23 +01:00
PabstMirror
de34d57d5b Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
PabstMirror
14c7e9af17 AF - Remove setVar when removing eh 2016-12-12 19:30:58 +01:00
magicsh0tz
d1287a471d Switched to CBA_fnc_waitAndExecute (#4709)
* Switched to CBA_fnc_waitAndExecute

* Switched to CBA_fnc_waitAndExecute
2016-12-12 19:30:21 +01:00
Glowbal
b72541df23 Jpn translation v382 (#4710)
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
2016-12-12 19:29:58 +01:00
ulteq
8afc4083d0 Advanced Ballistics - Improved spin drift calculation (#4755) 2016-12-09 13:22:53 -06:00
Glowbal
0b854a6077 Increase days inactive issues reminders 2016-12-04 14:30:00 +01:00
PabstMirror
8d1f988f5d AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-02 12:44:39 -06:00
commy2
d75eeac1e4 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-02 10:09:48 -06:00
BaerMitUmlaut
e082597e3c Merge pull request #4740 from acemod/fixBloodErr
Fix blood drop selection if blood loss is high
2016-12-02 06:13:08 +01:00
PabstMirror
4eba77f328 Fix blood drop selection if blood loss is high
close #4739
2016-12-01 20:36:10 -06:00
ulteq
3e0f85b4f1 RangeCard - Take bore height into account (#4715) 2016-12-01 21:20:51 +01:00
PabstMirror
3566e6e7f5 Update SMG_02 base class for 1.66 (#4718) 2016-12-01 12:05:28 -06:00
PabstMirror
321bb0bc57 Add frag definitions for remaining ammo (#4736)
Remove rpt warning
Close #342
2016-12-01 11:01:55 -06:00
PabstMirror
962903f201 Unify javelin guidance for RHS ammo (#4737) 2016-12-01 11:01:24 -06:00
ulteq
448dcddc55 ATragMX - cleanup and some fixes (#4714)
* ATragMX - Improved the default gun profiles
* Recalculated all muzzle velocities (based on 15 degrees Celsius)
* Recalculated all scope base angle (based on the new muzzle velocities)

* ATragMX - Removed lots of duplicate code
* Introduced dynamic simulation interval (based on muzzle velocity)

* ATragMX - Fixed simulation interval for the truing drop feature
2016-12-01 10:23:03 +01:00
ulteq
50e144672f Ballistics - Cleanup (#4721)
* Ballistics - Removed 'caliber', 'hit' and 'typicalSpeed' entries
* from all vanilla ammo types

* Removed all unused ammo types

* Ballistics - Removed more unnecessary config entries
2016-12-01 10:21:59 +01:00
BaerMitUmlaut
c8ddc601ef Merge pull request #4738 from KaiSforza/cyrus
Realisticweights: Updated cyrus weight
2016-12-01 08:50:27 +01:00
William Giokas
b9fbd2723a Realisticweights: Updated cyrus weight
Cyrus was set to weigh 300 units (~30lb?). The NATO equivalent, the Noreen
Bad News (or MAR-10) weighed 130, or 13lbs, equivalent to it's real life
counterpart. This just changes the weight to 140, similar to that of the
SVDK, a possible real-life counterpart for this rifle.
2016-12-01 01:27:02 -06:00
jonpas
34a38cf9b2 Merge pull request #4731 from acemod/pboProjectNote
Add PboProject .hpp exclusion note
2016-11-29 20:10:32 +01:00
jonpas
3d1820e3fd Add PboProject .hpp exclusion note 2016-11-29 20:06:44 +01:00