Commit Graph

413 Commits

Author SHA1 Message Date
d90d5a7ac1 Rewrite global AI skill zeus module
Remove the use of ace settings and makes the module more zeus specific. It might be worth adding a similar module or mission settings to ace_ai for mission editing.
2016-05-16 15:16:53 +01:00
5b460205a9 Add teleport player zeus module 2016-05-15 21:02:40 +01:00
4d028be876 Cleanup zeus display modules
Replaces display size and position defines with macros for readability and compactness.

Changes naming convention of functions and displays to distinguish categories and make more readable.

Converts the global set skill module to use display events rather than waiting in a loop for the module to be set and confirmed.
2016-05-15 18:08:54 +01:00
77de1ec6eb Update vanilla zeus functions
Merges the changes introduced by arma updates to vanilla functions with our overwrites.

I also reverted some of the command capitalization since it makes the process of going through differences quicker in future.
2016-05-15 12:48:32 +01:00
74fd4b4b52 Add run at settings initialized auto add objects 2016-05-08 13:47:35 +02:00
a526d33aba Fix inconsistent name for module setting 2016-05-08 13:44:51 +02:00
b08af3fea6 Add read auto add objects setting from module 2016-05-08 13:42:45 +02:00
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
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
6f412c312a Delay calling addCuratorEditableObjects for a frame
Fixes createVehicle not always being added on dedicated server.
2016-03-30 10:26:33 -05:00
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
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
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
e587744b3e Fix text errors
- Fix errors in "map_gestures, medical, overheating, slideshow and zeus"
addons
2016-02-26 11:29:55 +01:00
424c6fe878 Show Cargo Example 2016-02-26 01:37:00 -06:00
7fc1c87bc4 Global Ai Set Skill Example 2016-02-26 00:57:18 -06:00
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
3fa3512509 Remaining spanish translations 2016-02-25 12:25:42 -03:00
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
8b932fd5a0 Fix some undefined functions / strings 2016-02-20 16:58:45 -06:00
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
b6581cf5ef Fix #3264 2016-02-04 21:00:40 -03:00
f1ce133d32 Merge branch 'release'
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
2016-02-04 20:34:32 +01:00
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
39edd205f0 Merge pull request #2942 from acemod/CzechTables
Czech Translations - Update
2015-12-07 09:32:00 -06:00
cf41ac5fba Czech Translations - Update 2015-12-04 22:28:10 -06:00
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
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
e422388484 fix waitUntil capitalization 2015-11-30 17:28:01 +01:00
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +01:00
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +01:00
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
0b84bb514b fix Cfg capitalization 2015-11-30 17:09:26 +01:00
dcf0a68b80 Revert "fix Cfg capitalization"
This reverts commit 43bda9c462.
2015-11-30 17:00:32 +01:00
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01:00
ff4406e411 manual merge, more selectRandom command useage 2015-11-29 16:48:23 +01:00
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
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
c4117e1283 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
0b6fcacaf0 pl translation 2015-11-06 00:56:15 +01:00