Commit Graph

9135 Commits

Author SHA1 Message Date
SilentSpike
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
SilentSpike
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
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
Nicolás Badano
7646068a8b Merge pull request #3427 from SuN9491/master
Spanish Translation (3.5.0)
2016-02-25 17:10:55 -03:00
PabstMirror
6a0dc2d48c Merge pull request #3426 from acemod/fixMortarDisplay
Fix Mortar Display
2016-02-25 14:02:49 -06:00
PabstMirror
f59e8920f9 Fix Mortar Display 2016-02-25 13:59:00 -06:00
SuN9491
9efbdb2e71 Spanish Translation (3.5.0)
Remaining spanish translations for ACE 3.5.0
2016-02-25 20:50:29 +01:00
bux578
21ba45d0c9 Merge pull request #3421 from gienkov/pltranslation350
Polish translation 3.5.0 (FIXED)
2016-02-25 18:01:01 +01:00
gienkov
8ae1c68d5e remove tabs 2016-02-25 17:20:45 +01:00
gienkov
d4209b2b42 mk6 tagging and overheating translation, finish 2016-02-25 17:16:36 +01:00
Nicolás Badano
333c8f57bc Merge pull request #3419 from acemod/addMissingMedicalSettingCategory
Add missing medical category to delayUnconCaptive
2016-02-25 13:16:23 -03:00
jonpas
6ad107ecc0 Add medical category to delayUnconCaptive 2016-02-25 17:03:38 +01:00
gienkov
04f714e53c Merge remote-tracking branch 'origin/master' into pltranslation350 2016-02-25 16:41:09 +01:00
gienkov
25561ab2c5 hearing and medical, unwind medical pl shorts 2016-02-25 16:31:47 +01:00
Nicolás Badano
69a3c79756 Merge pull request #3418 from acemod/spanishTranslation3.5.0
Remaining Spanish translations
2016-02-25 12:28:30 -03:00
esteldunedain
3fa3512509 Remaining spanish translations 2016-02-25 12:25:42 -03:00
PabstMirror
3b03f84116 Disable debug 2016-02-25 09:12:24 -06:00
jonpas
8375694368 Merge pull request #3403 from acemod/fixCargoEventsParams
Reimplement old parameter syntax for (Un)LoadCargo events
2016-02-25 16:01:57 +01:00
esteldunedain
2fc27c553f Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spanishTranslation3.5.0 2016-02-25 11:47:10 -03:00
esteldunedain
64a62d65fc More spanish translations 2016-02-25 11:46:56 -03:00
bux578
ed05d2f1e7 Merge pull request #3414 from acemod/spanishTranslation3.5.0
Spanish translation3.5.0
2016-02-25 15:45:38 +01:00
jonpas
b2b781957f Reimplement old parameter syntax for (Un)LoadCargo events 2016-02-25 15:35:47 +01:00
esteldunedain
71707bc81a Some spanish translations for 3.5.0 2016-02-25 10:54:19 -03:00
jonpas
36d5c40b06 Merge pull request #3411 from GitHawk/refuel_api
Refuel change documentation header for API fnc
2016-02-25 14:52:25 +01:00
Nicolás Badano
23d35cf9f7 Merge pull request #3412 from GitHawk/rearm_api
Rearm added API
2016-02-25 10:42:28 -03:00
esteldunedain
e8b71bb2d6 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spanishTranslation3.5.0 2016-02-25 09:58:42 -03:00
Nicolás Badano
da46a1c0cd Merge pull request #3408 from acemod/moduleDescriptions
Cleanup some module descriptions
2016-02-25 09:56:31 -03:00
Nicolás Badano
d02a590886 Merge pull request #3406 from acemod/diePurista
Replace Purista with Roboto - everywhere
2016-02-25 09:56:16 -03:00
Nicolás Badano
91e671085e Merge pull request #3371 from acemod/moreSevereJamming
More severe jamming
2016-02-25 09:56:08 -03:00
Nicolás Badano
d037512c81 Merge pull request #3405 from acemod/3k404
remove unused non API functions
2016-02-25 09:55:22 -03:00
Nicolás Badano
ae2ce0eebc Merge pull request #3124 from acemod/delayUnconCaptiv
add delay to Unconsciousness Captivity
2016-02-25 09:54:27 -03:00
esteldunedain
4f6fa74690 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2016-02-25 09:51:56 -03:00
esteldunedain
56d202fc13 Revert "Comment out 3den Attributes until BIS properly solves http://feedback.arma3.com/view.php?id=28031"
This reverts commit aea02af618.
2016-02-25 09:51:42 -03:00
bux578
6070d29f59 Merge pull request #3386 from licht-im-Norden87/patch-53
German translation Update: MK6 Mortar
2016-02-25 13:38:42 +01:00
GitHawk
6deecb0559 Add missing bracket 2016-02-25 10:25:57 +01:00
GitHawk
2f183548b6 Added API 2016-02-25 10:18:31 +01:00
GitHawk
5af31f6bb3 Remove brackets 2016-02-25 10:11:28 +01:00
GitHawk
53457cfe61 Change documentation header for API fnc 2016-02-25 10:08:20 +01:00
jonpas
1402985133 Fix typos 2016-02-24 19:34:03 +01:00
jonpas
a3d769c410 Cleanup some module descriptions, close #2561 2016-02-24 19:22:16 +01:00
jonpas
804456c722 Sort requiredAddons alphabetically 2016-02-24 18:35:52 +01:00
PabstMirror
8cb1546569 Add threeden to required addons and vers to 1.56 2016-02-24 10:52:34 -06:00
jonpas
8f775dfba4 Rename FontCSE macro to FONT_ACE 2016-02-24 15:08:54 +01:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
commy2
02b2a21300 remove unused non API functions 2016-02-24 10:10:31 +01:00
commy2
8233661d55 remove unused non API functions 2016-02-24 09:39:39 +01:00
PabstMirror
7cf912222b Merge pull request #3393 from acemod/3denReplaceDropDown
Fix 3den attributes
2016-02-23 17:09:03 -06:00
PabstMirror
a437326032 Merge pull request #3400 from acemod/fixLampUnload
Fix lamp unloading
2016-02-23 17:07:31 -06:00
Nicolás Badano
b55648ccb4 Merge pull request #3402 from acemod/fixCutG
Fix #3334 replace Purista with Roboto in cargo menu
2016-02-23 18:48:06 -03:00