Commit Graph

4312 Commits

Author SHA1 Message Date
bux578
08ada80baa update from gh-pages 2015-05-04 12:36:45 +02:00
bux578
cae33edfc7 Merge pull request #996 from acemod/moduleDocumentation
Module documentation
2015-05-04 12:32:42 +02:00
bux578
ec4802e700 remove "CMS", fix link
I need to check the links once published.
2015-05-04 11:57:09 +02:00
ulteq
d78be0fa23 Merge pull request #998 from Bla1337/master
Translation fixes/improvements (RU)
2015-05-04 10:28:35 +02:00
Bla1337
6c6cb9128a Reverted the abbreviation changes
Abbreviation only used when necessary for the text clipping prevention.
2015-05-04 09:54:54 +03:00
Glowbal
f6e815fbaf Merge pull request #1003 from acemod/fixMedicalLitterError
Fix treatment script error
2015-05-04 00:25:46 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
ulteq
061b77e375 Fixed completely fucked up temperature day/night cycle 2015-05-03 23:32:53 +02:00
ulteq
30c27bf689 Added weather data for kunduz map 2015-05-03 23:21:56 +02:00
ulteq
3fda9e7e7b Merge pull request #997 from ProfessorCZ/master
Czech translation - Update
2015-05-03 17:03:47 +02:00
Bla1337
bf592ce0a9 nightvision edits 2015-05-03 17:35:58 +03:00
ViperMaul
1f5e47b7c1 PyFormat.Info love 2015-05-03 07:21:27 -07:00
bux578
4710e61c2a swapped basic and advanced 2015-05-03 14:37:44 +02:00
Bla1337
73d0be88fb nametags edits 2015-05-03 14:57:59 +03:00
Bla1337
a7d66b59cf transaltions 2015-05-03 14:01:35 +03:00
ulteq
13bc1e0058 Replaced deprecated airFriction calculation 2015-05-03 12:31:30 +02:00
ulteq
29fdd63432 Use the constants 2015-05-03 12:07:13 +02:00
Lukas
3434964f4f Update stringtable.xml 2015-05-03 11:54:18 +02:00
Lukas
da309e6682 Update stringtable.xml 2015-05-03 11:53:12 +02:00
ulteq
d07cb0e6ed Got rid of the newline braces 2015-05-03 11:51:30 +02:00
ProfessorCZ
a0e443cfc6 Czech translation - Update 2015-05-03 11:48:56 +02:00
ulteq
e5a81bfe37 Deterministic random numbers for the transonic instability calculation 2015-05-03 11:46:30 +02:00
bux578
da912d8cc1 fix typo 2015-05-03 11:35:59 +02:00
bux578
dbca6fe587 finished module documentation 2015-05-03 11:33:02 +02:00
ulteq
4d4604da28 Fixed two typos in the ATragMX gun profile list 2015-05-03 10:47:49 +02:00
ulteq
3acde5be08 Merge pull request #992 from acemod/ballisticsTranslationFix
Fixed some inconsistencies in the stringtable
2015-05-03 10:22:11 +02:00
ulteq
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
bux578
0faf110371 second batch of documentation 2015-05-03 08:25:29 +02:00
KoffeinFlummi
f678fb8fbf Merge branch 'spanish-merge' 2015-05-03 02:40:56 +02:00
KoffeinFlummi
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
PabstMirror
d0975b4c0f Laserpointer Stringtable - fix swapped eng/czk 2015-05-02 18:55:23 -05:00
KoffeinFlummi
697656da92 Merge branch 'master' of https://github.com/acemod/ACE3 2015-05-03 01:08:39 +02:00
KoffeinFlummi
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
jaynus
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
jaynus
717d7c874f Data chunking. Feature complete. 2015-05-02 15:28:40 -07:00
KoffeinFlummi
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
KoffeinFlummi
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
esteldunedain
8d92d9cc7d Add ace_clipboard to ACE_Extensions 2015-05-02 18:25:35 -03:00
jaynus
bb429e7704 i hate @esteldunedain 2015-05-02 14:20:37 -07:00
jaynus
c192d7eadc Return version. 2015-05-02 14:18:42 -07:00
KoffeinFlummi
298e1d88bd Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser/stringtable.xml
	addons/medical/stringtable.xml
	addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02:00
commy2
f44aaee7c7 also in cursor mode 2015-05-02 23:02:40 +02:00
commy2
0fd783082d don't close menu when no action is selected 2015-05-02 22:53:23 +02:00
esteldunedain
233ca37219 Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log 2015-05-02 17:52:37 -03:00
jaynus
433bb21ccc ACE clipboard extension to bypass clipboard limit of arma. Close #991 2015-05-02 13:13:24 -07:00
ulteq
e6187adfc7 Removed a trailing space 2015-05-02 22:09:38 +02:00
ulteq
b5ec13b992 Fixed some inconsistencies in the stringtable 2015-05-02 22:07:25 +02:00
bux578
87cd37ea2a first batch of module documentations 2015-05-02 22:06:47 +02:00
Felix Wiegand
7678919e8d Merge pull request #982 from ToasterBR/master
Translation to Portuguese
2015-05-02 21:40:14 +02:00