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
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
jonpas
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
PabstMirror
6f412c312a
Delay calling addCuratorEditableObjects for a frame
...
Fixes createVehicle not always being added on dedicated server.
2016-03-30 10:26:33 -05:00
Thomas Kooi
daceaa9dd8
Merge branch 'master' into settingsNameDescp
2016-03-18 14:48:11 +01:00
Thomas Kooi
60af0d3162
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
...
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
PabstMirror
b5e95f3945
Add some names/descriptions to settings configs
2016-03-08 01:17:40 -06:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
VKing
8bb7b072d4
Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
...
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104
Tweaked & added translations
...
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
jonpas
10abe5cd57
Merge branch 'master' into German-translations
2016-02-27 01:36:07 +01:00
System98
e587744b3e
Fix text errors
...
- Fix errors in "map_gestures, medical, overheating, slideshow and zeus"
addons
2016-02-26 11:29:55 +01:00
PabstMirror
424c6fe878
Show Cargo Example
2016-02-26 01:37:00 -06:00
PabstMirror
7fc1c87bc4
Global Ai Set Skill Example
2016-02-26 00:57:18 -06:00
System98
48d312cb8e
Add german translations
...
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
2016-02-25 18:10:26 +01:00
esteldunedain
3fa3512509
Remaining spanish translations
2016-02-25 12:25:42 -03:00
commy2
46a239f9f6
precompile on game start
2016-02-22 15:20:36 +01:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
ChairborneIT
0021bc08df
Added translation for most Italian stringtable entries
2016-02-20 21:39:05 +01:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
esteldunedain
b6581cf5ef
Fix #3264
2016-02-04 21:00:40 -03:00
Glowbal
f1ce133d32
Merge branch 'release'
...
Conflicts:
addons/refuel/functions/fnc_connectNozzle.sqf
2016-02-04 20:34:32 +01:00
PabstMirror
46d6e92bca
Add quick debug defines to all script_components
2016-01-28 23:26:02 -06:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -06:00
licht-im-Norden87
291f4df072
Update German Stringtables
...
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
kommas...........................................................................................................................................................
Rallypoint
Update stringtable.xml
slideshow, not finished yet
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
What does Curator mean in this context?
l. 294, l 302
cargo
Update stringtable.xml
Update stringtable.xml
I left a few things out. I'd like if someone gives me advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...
Update stringtable.xml
Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.
Update stringtable.xml
Update stringtable.xml
Update stringtable.xml
Fix Mistakes from merge
Fix Empty Entries
Fix Mistake
Fix
2015-12-04 22:06:44 -06:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
e422388484
fix waitUntil capitalization
2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
a8228f60c2
fix configFile capitalization
2015-11-30 17:23:02 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
0b84bb514b
fix Cfg capitalization
2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ff4406e411
manual merge, more selectRandom command useage
2015-11-29 16:48:23 +01:00
commy2
e5c4d35969
1.55 use new selectRandom command
2015-11-29 16:33:25 +01:00
gienkov
7eecff4296
Merge remote-tracking branch 'origin' into pl-translation
...
Conflicts:
addons/captives/stringtable.xml
addons/map_gestures/stringtable.xml
addons/zeus/stringtable.xml
2015-11-27 21:19:25 +01:00
PabstMirror
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
gienkov
0b6fcacaf0
pl translation
2015-11-06 00:56:15 +01:00
kaban
e2763dde27
Russian Translations - Update
2015-11-05 03:28:53 +03:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Jonathan Pereira
ce5364d7af
Added PT-BR translations
...
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
alganthe
38fe56472e
ace setting string added for ace_zeus_autoAddObjects
2015-09-27 15:35:32 +02:00
jonpas
b345db4ae9
Added Zeus modules for adding Spare Tracks and Wheels
2015-09-27 00:29:19 +02:00
KoffeinFlummi
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
kaban
341e122e4c
Russian Translations - Update
2015-09-17 11:43:14 +03:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
alganthe
02faf0a104
fixed zeus addobjects
...
The module part in CfgVehicles.hpp was missing.
Signed-off-by: alganthe <alganthe@live.fr>
2015-09-16 06:20:05 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
[OMCB]kaban
298b475433
Fix due to review
2015-09-05 05:15:29 +03:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd
Czech Translations - Update
2015-09-03 01:20:24 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
gienkov
96c3b62cb9
zeus translation
2015-08-22 00:19:51 +02:00
SilentSpike
5112bd9bdf
Merge pull request #2163 from acemod/add-objects-to-curator
...
Add objects to all curators
2015-08-21 13:53:45 +01:00
jonpas
de033f0ff2
README.md files added to all modules
2015-08-19 04:18:33 +02:00
SilentSpike
05bf239d8e
Specify zeus setMedic module conditions further
2015-08-15 21:44:40 +01:00
SilentSpike
c01052e5bf
Update ace_zeus function headers
2015-08-15 21:11:49 +01:00
Glowbal
7fa30009d3
Merge branch 'add-objects-to-curator' of github.com:acemod/ACE3 into add-objects-to-curator
2015-08-15 20:39:54 +02:00
Glowbal
1417429782
Switched to serverInit instead of init as per suggestion from @SilentSpike
2015-08-15 20:39:22 +02:00
Glowbal
c7f47c0b34
Replaced check for captive module by check for ACE_medical
2015-08-15 20:31:41 +02:00
PabstMirror
d023139e8d
Stringtable fix
2015-08-15 12:04:57 -05:00
Glowbal
ed66255b19
Add objects to all curators
2015-08-15 18:39:43 +02:00
Glowbal
0e57d3d97c
Added assign medic, medicalfacility and medical vehicle curator modules
2015-08-15 18:25:48 +02:00
Michael Braun
1b488a17b5
Fixed typo that slipped into the code
2015-08-05 08:36:01 +02:00
Michael Braun
1b7f7534da
Small correction
2015-08-05 00:16:23 +02:00
Michael Braun
13b7e7ae72
Updated parameterization in Zeus module.
2015-08-05 00:10:54 +02:00
SilentSpike
e147138274
Update setUnconscious module with to be indefinite
...
The zeus toggle unconscious module was using the default value for minimum unconscious time when it should have been indefinite (to act as a toggle)
2015-07-31 17:32:13 +01:00
Harakhti
b2aa5eee45
Row 3
...
BINGO FUEL
2015-07-30 16:28:50 +02:00
Harakhti
2b23958fd1
Row 2
...
It gets tedious after a while, especially if your language lacks
technical terms. That or my B2 language exam isn't good enough.
2015-07-30 16:06:32 +02:00
SilentSpike
67e5e31394
Change zeus modules to run globally
...
Zeus modules were only running on the *server* rather than the local machine. This resulted in the variable used to cache the object zeus has its cursor over not existing and therefore the modules didn't work at all.
2015-07-29 12:25:04 +01:00
Glowbal
41196c15aa
Merge pull request #1686 from acemod/fixFrag
...
Fix frag
2015-07-26 23:42:16 +02:00
KoffeinFlummi
9805a8270a
Merge branch 'master' into german-merge
2015-07-25 19:35:03 +02:00
PabstMirror
e29fb477f9
Merge branch 'master' into fixFrag
2015-07-25 02:38:10 -05:00
SilentSpike
186d4d0583
Fix for #1665
2015-07-20 21:14:30 +01:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
SilentSpike
27a4ecd747
Expanded readme
2015-06-22 00:43:39 +01:00
SilentSpike
378b39db77
Merge remote-tracking branch 'upstream/master'
2015-06-22 00:37:28 +01:00
SilentSpike
398f1c768f
Fix the module on dedicated servers
2015-06-22 00:17:29 +01:00
SilentSpike
e3e415c727
Added readme
2015-06-21 23:46:23 +01:00
PabstMirror
6c7ba7b5ae
Zeus module on dedicated server
2015-06-18 22:43:49 -05:00
PabstMirror
375c81d9b0
Connect Zeus module to Frag
2015-06-18 22:13:06 -05:00
Macusercom
ed4fbb5d33
More corrections
2015-06-16 23:19:47 +02:00
Macusercom
09f7473d7b
Added German translations
2015-06-16 03:06:47 +02:00
ProfessorCZ
acc5f4d29f
CZ - Translation
2015-06-12 15:05:04 +02:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02:00
Nicolás Badano
1def1ee7e4
Merge pull request #1546 from SilentSpike/zeusUpdate
...
Update ace_zeus with 1.46 changes
2015-06-08 14:44:12 -03:00
SilentSpike
f9d1a39adf
Updated edited BI functions with 1.46 changes
2015-06-08 18:18:40 +01:00
