Commit Graph

4220 Commits

Author SHA1 Message Date
83304a0622 Merge pull request #1011 from acemod/moveContourLegend
#940 - Map Tweak (contor legend) for brefing
2015-05-05 08:14:34 -03:00
19864d5be6 Fixed a bug in the humidity calculation 2015-05-05 10:37:51 +02:00
4f44bcdf46 Added wind data for Chernarus (Prag) 2015-05-05 10:36:12 +02:00
bd69405cf4 fix czech typo in medical, fix #1010 2015-05-05 08:37:41 +02:00
dafff4e63e #940 - Map Tweak (contor legend) for brefing 2015-05-04 23:50:03 -05:00
f81e53bb33 Added wind data for Takistan (Kabul) 2015-05-04 22:17:26 +02:00
be7391bf47 Added wind data for F.A.T.A 2015-05-04 21:28:12 +02:00
76eaa5ded1 Added wind data for Bornholm 2015-05-04 20:35:39 +02:00
032424b23e Merge pull request #1006 from acemod/skipLOSCheckBodyparts
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
2015-05-04 10:14:59 -07:00
d07b69aca4 Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions. 2015-05-04 13:37:14 -03:00
a5d74f4bfd proper heading numeration 2015-05-04 13:43:33 +02:00
08ada80baa update from gh-pages 2015-05-04 12:36:45 +02:00
cae33edfc7 Merge pull request #996 from acemod/moduleDocumentation
Module documentation
2015-05-04 12:32:42 +02:00
ec4802e700 remove "CMS", fix link
I need to check the links once published.
2015-05-04 11:57:09 +02:00
d78be0fa23 Merge pull request #998 from Bla1337/master
Translation fixes/improvements (RU)
2015-05-04 10:28:35 +02:00
6c6cb9128a Reverted the abbreviation changes
Abbreviation only used when necessary for the text clipping prevention.
2015-05-04 09:54:54 +03:00
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError
Fix treatment script error
2015-05-04 00:25:46 +02:00
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
061b77e375 Fixed completely fucked up temperature day/night cycle 2015-05-03 23:32:53 +02:00
30c27bf689 Added weather data for kunduz map 2015-05-03 23:21:56 +02:00
3fda9e7e7b Merge pull request #997 from ProfessorCZ/master
Czech translation - Update
2015-05-03 17:03:47 +02:00
bf592ce0a9 nightvision edits 2015-05-03 17:35:58 +03:00
4710e61c2a swapped basic and advanced 2015-05-03 14:37:44 +02:00
73d0be88fb nametags edits 2015-05-03 14:57:59 +03:00
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
13bc1e0058 Replaced deprecated airFriction calculation 2015-05-03 12:31:30 +02:00
29fdd63432 Use the constants 2015-05-03 12:07:13 +02:00
3434964f4f Update stringtable.xml 2015-05-03 11:54:18 +02:00
da309e6682 Update stringtable.xml 2015-05-03 11:53:12 +02:00
d07cb0e6ed Got rid of the newline braces 2015-05-03 11:51:30 +02:00
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
e5a81bfe37 Deterministic random numbers for the transonic instability calculation 2015-05-03 11:46:30 +02:00
da912d8cc1 fix typo 2015-05-03 11:35:59 +02:00
dbca6fe587 finished module documentation 2015-05-03 11:33:02 +02:00
4d4604da28 Fixed two typos in the ATragMX gun profile list 2015-05-03 10:47:49 +02:00
3acde5be08 Merge pull request #992 from acemod/ballisticsTranslationFix
Fixed some inconsistencies in the stringtable
2015-05-03 10:22:11 +02:00
d653aa262a Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ballisticsTranslationFix
Conflicts:
	addons/ballistics/stringtable.xml
2015-05-03 10:21:57 +02:00
0faf110371 second batch of documentation 2015-05-03 08:25:29 +02:00
f678fb8fbf Merge branch 'spanish-merge' 2015-05-03 02:40:56 +02:00
7633f406ae Merge branch 'patch-2' of https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
	addons/laser/stringtable.xml
2015-05-03 02:40:44 +02:00
d0975b4c0f Laserpointer Stringtable - fix swapped eng/czk 2015-05-02 18:55:23 -05:00
697656da92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-03 01:08:39 +02:00
a1d2bd62a4 Merge branch 'patch-1' of https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
	addons/interaction/stringtable.xml
2015-05-03 01:08:22 +02:00
27c66ba631 Merge pull request #993 from acemod/clipboardExtension
ACE clipboard extension to bypass clipboard limit of arma. Close #991
2015-05-02 15:29:18 -07:00
717d7c874f Data chunking. Feature complete. 2015-05-02 15:28:40 -07:00
e918e1d661 Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
2015-05-02 23:43:33 +02:00
d0c7fce7f3 Merge https://github.com/adam3adam/ACE3 into czech-merge
Conflicts:
	addons/interaction/stringtable.xml
	addons/medical/stringtable.xml
	addons/mk6mortar/stringtable.xml
2015-05-02 23:29:45 +02:00
8d92d9cc7d Add ace_clipboard to ACE_Extensions 2015-05-02 18:25:35 -03:00
bb429e7704 i hate @esteldunedain 2015-05-02 14:20:37 -07:00