Commit Graph

200 Commits

Author SHA1 Message Date
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
Ivan Navarro Cabello
d15bae105d Updated spanish translation
Updated spanish translation
2015-06-08 12:43:07 +02:00
gienkov
c1a7374404 Merge remote-tracking branch 'upstream/master' into pl-translation-1
Conflicts:
	addons/interact_menu/stringtable.xml
2015-06-05 09:40:50 +02:00
SilentSpike
2b79838555 Use existing disabled string 2015-06-04 19:40:11 +01:00
SilentSpike
94a6eefa32 using new string macros 2015-06-04 19:33:19 +01:00
gienkov
46dbd3113c Fix 2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b PL translation for new things 2015-06-04 01:34:58 +02:00
SilentSpike
e3c09a7099 Added icon to unconscious module 2015-06-01 20:56:58 +01:00
SilentSpike
bfd1f8a102 Localise module names 2015-06-01 20:56:57 +01:00
SilentSpike
a30f6be713 Better module naming convention 2015-06-01 20:56:56 +01:00
SilentSpike
8fe1a65207 Cleaned up event handler 2015-06-01 20:56:54 +01:00
SilentSpike
bfce854be3 Localise module messages 2015-06-01 20:50:19 +01:00
SilentSpike
4c1641b64a Generalized contextual modules system 2015-06-01 20:44:54 +01:00
SilentSpike
7d71d85ffc Death to tabs 2015-06-01 20:44:53 +01:00
SilentSpike
e27ac53713 Implemented contextual modules 2015-06-01 20:44:51 +01:00
SilentSpike
b72512e3f1 Zeus modules require larger icons 2015-06-01 20:44:50 +01:00
SilentSpike
97a1ff9bd6 Include no longer needed 2015-06-01 20:44:48 +01:00
SilentSpike
cd6474c748 Adding module icons 2015-06-01 20:44:47 +01:00
SilentSpike
9619b7d167 Improved naming and removed pointless category 2015-06-01 20:43:21 +01:00
SilentSpike
44ca13fe3a Implemented capture module 2015-06-01 20:36:06 +01:00
SilentSpike
6251248a09 Fixed conditions 2015-06-01 20:36:05 +01:00
SilentSpike
49ef30ca5b Corrected macro 2015-06-01 20:36:05 +01:00
SilentSpike
aad56866ea Forgot my privates 2015-06-01 20:36:04 +01:00
SilentSpike
90033aa591 Updated function headers 2015-06-01 20:36:03 +01:00
SilentSpike
5f1725cf1f Missing setUnconscious parameter 2015-06-01 20:36:02 +01:00
SilentSpike
0dcfd9f941 Use zeus category 2015-06-01 20:36:02 +01:00
SilentSpike
a4512e4740 Implemented surrender module
Improved knockout module
2015-06-01 20:36:01 +01:00
SilentSpike
3702d0b671 Implemented knockout module 2015-06-01 20:36:00 +01:00
Nicolás Badano
9ed851a966 Merge pull request #1265 from gienkov/module-translations-2
Stringtable Zeus and View Distance
2015-06-01 14:44:04 -03:00
PabstMirror
84d940e69d Fix circular dependency - ModuleDescription 2015-05-30 00:31:07 -05:00
gienkov
00c5abecc2 Merge remote-tracking branch 'origin' into module-translations-2
Conflicts:
	addons/viewdistance/ACE_Settings.hpp
	addons/viewdistance/functions/fnc_changeViewDistance.sqf
2015-05-23 17:55:06 +02:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07:00
gienkov
0993c0f0b0 Fix tabs and errors 2015-05-17 23:28:00 +02:00
gienkov
4bebedf73e Stringtable Zeus and View Distance
* Stringtabled ACE Zeus module
* Stringtabled ACE View Distance
* Lowered default view distance to 1500 because default value (10000)
makes enormous FPS drop at start for low end machines
2015-05-17 00:53:55 +02:00
SilentSpike
38abe1dd02 Using inline code instead of holdover function 2015-05-15 21:09:55 +01:00
SilentSpike
9d0af2138c Removed old spawn 2015-05-15 21:03:19 +01:00
SilentSpike
84d06bac34 Another fix for moduleCurator 2015-05-15 20:54:17 +01:00
SilentSpike
60ade8deaa Providing correct parameters 2015-05-15 00:09:03 +01:00
SilentSpike
c458deeae2 End of file newline 2015-05-15 00:02:12 +01:00
SilentSpike
0ca8a373d1 BIS_fnc_ActivateAddons must run during mission init 2015-05-14 23:50:58 +01:00
SilentSpike
2620f5ebd9 Made module also default to disabled 2015-05-12 19:55:38 +01:00
SilentSpike
228786f3ad Putting the bird in its cage 2015-05-12 12:26:24 +01:00
SilentSpike
f6cdad62ca Added parenthesis 2015-05-11 19:04:04 +01:00
SilentSpike
7cf52d13ca Disable zeus settings by default
Fixed newline characters
2015-05-11 18:15:45 +01:00
SilentSpike
b09ebc9c79 QGVAR was meant to be GVAR
Improved module text
Forgot about script_component
2015-05-11 17:08:25 +01:00
SilentSpike
e16ea007e4 Add ACE settings 2015-05-11 16:30:46 +01:00
SilentSpike
755581be40 Changed BI functions to check for settings 2015-05-11 16:23:46 +01:00
SilentSpike
3118666f80 Added settings module to config
Started functionality
2015-05-11 16:02:24 +01:00
SilentSpike
c1c10f43b2 Fixed typo 2015-05-10 17:41:43 +01:00
SilentSpike
a40277f6f1 Module configs and function headers 2015-05-10 17:32:01 +01:00
SilentSpike
5166e73cc0 Added commented out code and function prep 2015-05-10 17:26:24 +01:00
SilentSpike
9dd163ac3d Use moduleProjectile with ballistics support 2015-05-10 17:21:18 +01:00
SilentSpike
eaa0f16e30 Transferring rest of function files 2015-05-10 17:17:17 +01:00
SilentSpike
212b8528fa Bird locality code no longer needed 2015-05-09 21:30:52 +01:00
SilentSpike
3544ee57f8 Added removed script within comments 2015-05-09 20:35:07 +01:00
SilentSpike
079b8489ce Missing spaces 😉 2015-05-09 20:30:49 +01:00
SilentSpike
f685ec2257 added zeus changes module 2015-05-09 20:24:39 +01:00