Commit Graph

388 Commits

Author SHA1 Message Date
95573ee711 Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
2016-06-01 23:45:51 +02:00
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
4f515ec4e1 QGVAR captives, interaction 2016-05-25 20:23:53 +02:00
c4999c13e4 QGVAR and Fix sandbag, tagging, tripod, viewdistance, weather, zeus 2016-05-25 02:19:50 +02:00
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
a7c1d0e5bf Remove erroneous tabs 2016-05-21 17:45:50 +01:00
3e16142ff6 Merge branch 'master' into zeusModuleUiExample 2016-05-21 17:37:49 +01:00
b3192adbb7 Add support for a zeus module position attribute
Allows zeus to select a position for the module task to be carried out at - as a bonus it works alongside the radius attribute and will draw a circle preview if a radius is present.

Unfortunately control types 100 & 101 don't play nicely with controls groups and so I've commented out the position attribute from the displays that would currently use it. Otherwise it is all seemingly working fine, just that the position of the control is all wrong and it doesn't stay within the bounds of the controls group.

I opened an issue tracker ticket for the problem here: https://feedback.bistudio.com/T116708
2016-05-21 17:29:53 +01:00
adaa10aea5 Adjust center of zeus AI task modules
The tasks should center on the logic rather than the group leader.

The search nearby module is also deleted after it's processed.
2016-05-19 22:32:05 +01:00
3a1dba4486 Add zeus defend, patrol and search modules
Using a shared `radius` attribute for all of these displays so a generalized method of initializing and retrieving the value associated that was implemented.
2016-05-19 01:24:08 +01:00
e05f2ca637 Add search nearby building zeus module 2016-05-19 01:24:07 +01:00
600b71817f Update zeus module logic deletion behaviour
The teleport players module is reusable, while the global AI skill and group side modules should be deleted appropriately once the display is closed.
2016-05-18 16:30:14 +01:00
8a70cfbcd8 Clean new zeus module config and functions
Adds function headers, stringtables and renames some display control classes.
2016-05-18 16:16:35 +01:00
da70854568 manual merge 2016-05-18 11:48:27 +02:00
81d854c56a Add group side zeus module
The module is placed on a unit in order to switch the side of that unit's group. A "simple" dialog is used to select the new side.

The dialog code is a little ugly to say the least.
2016-05-17 23:44:17 +01:00
4cbded1811 Fix zeus cargo display for empty vehicles
The cargo wasn't displaying for empty vehicles because they use a different display.
2016-05-17 23:44:16 +01:00
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